]> cat aescling's git repositories - mastodon.git/commit
Hide blocking accounts from blocked users (#10442)
authorThibG <thib@sitedethib.com>
Mon, 1 Apr 2019 18:06:13 +0000 (20:06 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 1 Apr 2019 18:06:13 +0000 (20:06 +0200)
commit62bafa20a112ccdddaedb25723fc819dbbcd8e9a
treebfad870e5366780dc13cc65280268695eb807858
parent67eb47e25f1e7704dd9ecd32695ff3b53c807375
Hide blocking accounts from blocked users (#10442)

* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc.

* Revert "Add `blocked_by` relationship to the REST API (#10373)"

This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f.

* 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 bd02ec6daa974dcd3231e73826a56e08dbeedadc

* Refactor by adding `without_blocking` scope
20 files changed:
app/controllers/api/v1/accounts/follower_accounts_controller.rb
app/controllers/api/v1/accounts/following_accounts_controller.rb
app/controllers/api/v1/accounts/statuses_controller.rb
app/controllers/api/v1/accounts_controller.rb
app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
app/javascript/mastodon/features/account/components/header.js
app/javascript/mastodon/features/account_timeline/index.js
app/javascript/mastodon/features/followers/index.js
app/javascript/mastodon/features/following/index.js
app/javascript/styles/mastodon/stream_entries.scss
app/models/account.rb
app/presenters/account_relationships_presenter.rb
app/serializers/rest/relationship_serializer.rb
app/services/account_search_service.rb
app/services/search_service.rb
spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
spec/services/account_search_service_spec.rb
spec/services/search_service_spec.rb