diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-01 21:36:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 21:36:36 +0200 |
| commit | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (patch) | |
| tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/services/account_search_service.rb | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
| parent | 12dae9d58316bec32adaac016998ab1cf69d2b45 (diff) | |
Merge pull request #978 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/account_search_service.rb')
| -rw-r--r-- | app/services/account_search_service.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index 7bdffbbd2..c47b1c094 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -10,7 +10,15 @@ class AccountSearchService < BaseService @options = options @account = account - search_service_results + results = search_service_results + + unless account.nil? + account_ids = results.map(&:id) + blocked_by_map = Account.blocked_by_map(account_ids, account.id) + results.reject! { |item| blocked_by_map[item.id] } + end + + results end private |