diff options
author | ThibG <thib@sitedethib.com> | 2019-04-08 18:17:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-08 18:17:22 +0200 |
commit | fc2f7ee8710b498c4533e229aff6391396aa7213 (patch) | |
tree | 9576b254773166a419b932c50e8f4d354bea73c3 /app/controllers/api/v1/accounts/following_accounts_controller.rb | |
parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
parent | 63837a4b781ad27a4af895b0c983d4aff57d80e3 (diff) |
Merge pull request #983 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/accounts/following_accounts_controller.rb')
-rw-r--r-- | app/controllers/api/v1/accounts/following_accounts_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb index 0369cb25e..44e89804b 100644 --- a/app/controllers/api/v1/accounts/following_accounts_controller.rb +++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb @@ -19,13 +19,17 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController end def load_accounts - return [] if @account.user_hides_network? && current_account.id != @account.id + return [] if hide_results? default_accounts.merge(paginated_follows).to_a end + def hide_results? + (@account.user_hides_network? && current_account.id != @account.id) || (current_account && @account.blocking?(current_account)) + end + def default_accounts - Account.without_blocking(current_account).includes(:passive_relationships, :account_stat).references(:passive_relationships) + Account.includes(:passive_relationships, :account_stat).references(:passive_relationships) end def paginated_follows |