diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-31 00:55:32 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-12-31 00:55:32 +0100 |
| commit | 3b3bdc7293493735a2169d3377a5a5b7d9006497 (patch) | |
| tree | ba178a909b44087e3eb3842f77396d452eda1401 /app/controllers/api/v1/statuses | |
| parent | 2999c955968c8d8a6b4a35d13f9b4e7f6769b014 (diff) | |
Hide blocked users from more places (#12733)
* Hide blocked, muted, and blocked-by users from toot favourite lists * Hide blocked, muted, and blocked-by users from toot reblog lists * Hide blocked, muted, and blocked-by users from followers/following (API) * Fix tests * Hide blocked, muted, and blocked-by users from followers/following on public pages
Diffstat (limited to 'app/controllers/api/v1/statuses')
| -rw-r--r-- | app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb index 657e57831..99eff360e 100644 --- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb @@ -17,7 +17,9 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController private def load_accounts - default_accounts.merge(paginated_favourites).to_a + scope = default_accounts + scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? + scope.merge(paginated_favourites).to_a end def default_accounts diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb index 6851099f6..cc285ad23 100644 --- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb +++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb @@ -17,7 +17,9 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController private def load_accounts - default_accounts.merge(paginated_statuses).to_a + scope = default_accounts + scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? + scope.merge(paginated_statuses).to_a end def default_accounts |