Hide blocking accounts from blocked users (#10442)
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6d. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de88. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6d * Refactor by adding `without_blocking` scope
Showing
- app/controllers/api/v1/accounts/follower_accounts_controller.rb 1 addition, 1 deletion...ntrollers/api/v1/accounts/follower_accounts_controller.rb
- app/controllers/api/v1/accounts/following_accounts_controller.rb 1 addition, 1 deletion...trollers/api/v1/accounts/following_accounts_controller.rb
- app/controllers/api/v1/accounts/statuses_controller.rb 10 additions, 0 deletionsapp/controllers/api/v1/accounts/statuses_controller.rb
- app/controllers/api/v1/accounts_controller.rb 5 additions, 0 deletionsapp/controllers/api/v1/accounts_controller.rb
- app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb 1 addition, 0 deletions...lers/api/v1/statuses/favourited_by_accounts_controller.rb
- app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb 1 addition, 1 deletion...llers/api/v1/statuses/reblogged_by_accounts_controller.rb
- app/javascript/mastodon/features/account/components/header.js 1 addition, 1 deletion...javascript/mastodon/features/account/components/header.js
- app/javascript/mastodon/features/account_timeline/index.js 6 additions, 16 deletionsapp/javascript/mastodon/features/account_timeline/index.js
- app/javascript/mastodon/features/followers/index.js 3 additions, 5 deletionsapp/javascript/mastodon/features/followers/index.js
- app/javascript/mastodon/features/following/index.js 3 additions, 5 deletionsapp/javascript/mastodon/features/following/index.js
- app/javascript/styles/mastodon/stream_entries.scss 3 additions, 3 deletionsapp/javascript/styles/mastodon/stream_entries.scss
- app/models/account.rb 1 addition, 0 deletionsapp/models/account.rb
- app/presenters/account_relationships_presenter.rb 1 addition, 5 deletionsapp/presenters/account_relationships_presenter.rb
- app/serializers/rest/relationship_serializer.rb 1 addition, 5 deletionsapp/serializers/rest/relationship_serializer.rb
- app/services/account_search_service.rb 9 additions, 1 deletionapp/services/account_search_service.rb
- app/services/search_service.rb 2 additions, 0 deletionsapp/services/search_service.rb
- spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb 27 additions, 2 deletions...lers/api/v1/accounts/follower_accounts_controller_spec.rb
- spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb 27 additions, 2 deletions...ers/api/v1/accounts/following_accounts_controller_spec.rb
- spec/services/account_search_service_spec.rb 17 additions, 0 deletionsspec/services/account_search_service_spec.rb
- spec/services/search_service_spec.rb 16 additions, 14 deletionsspec/services/search_service_spec.rb
Loading
Please register or sign in to comment