diff options
author | ThibG <thib@sitedethib.com> | 2020-01-05 13:51:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-05 13:51:50 +0100 |
commit | bcfd6e3bb48f6e0eb88f7f3a650832842ab69166 (patch) | |
tree | 0e2bb7334c7954bee2962ed78565046e3b974725 /app/controllers/following_accounts_controller.rb | |
parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
parent | 83359fef2b04e81b35b047510ddb0c79bcf8ddaa (diff) |
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/following_accounts_controller.rb')
-rw-r--r-- | app/controllers/following_accounts_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb index 8cab67ff5..ff23d97f9 100644 --- a/app/controllers/following_accounts_controller.rb +++ b/app/controllers/following_accounts_controller.rb @@ -19,7 +19,6 @@ class FollowingAccountsController < ApplicationController next if @account.user_hides_network? follows - @relationships = AccountRelationshipsPresenter.new(follows.map(&:target_account_id), current_user.account_id) if user_signed_in? end format.json do @@ -38,7 +37,11 @@ class FollowingAccountsController < ApplicationController private def follows - @follows ||= Follow.where(account: @account).recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account) + return @follows if defined?(@follows) + + scope = Follow.where(account: @account) + scope = scope.where.not(target_account_id: current_account.excluded_from_timeline_account_ids) if user_signed_in? + @follows = scope.recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account) end def page_requested? |