diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-30 23:29:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 23:29:55 +0200 |
| commit | 65db9df011a3e13efa79f4e56343aa69bdad7716 (patch) | |
| tree | 1941b85de1f0d1b6f56b73345cddf664a71faf20 /app/services/update_account_service.rb | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
| parent | 3b855b5c82362783969f748ad78bcaf85f938c9f (diff) | |
Merge pull request #1224 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/update_account_service.rb')
| -rw-r--r-- | app/services/update_account_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb index 01756a73d..ebf24be37 100644 --- a/app/services/update_account_service.rb +++ b/app/services/update_account_service.rb @@ -20,7 +20,9 @@ class UpdateAccountService < BaseService private def authorize_all_follow_requests(account) - AuthorizeFollowWorker.push_bulk(FollowRequest.where(target_account: account).select(:account_id, :target_account_id)) do |req| + follow_requests = FollowRequest.where(target_account: account) + follow_requests = follow_requests.select { |req| !req.account.silenced? } + AuthorizeFollowWorker.push_bulk(follow_requests) do |req| [req.account_id, req.target_account_id] end end |