diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
commit | f5f6d23d554b3a81020feebc65188cc64f644095 (patch) | |
tree | b30197858c2018a32be559f5b4b479571c75dee3 /app/services/account_search_service.rb | |
parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
parent | 3f036ac6b8f9919b3b141012db163476f18fe299 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
Diffstat (limited to 'app/services/account_search_service.rb')
-rw-r--r-- | app/services/account_search_service.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index c47b1c094..7bdffbbd2 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -10,15 +10,7 @@ class AccountSearchService < BaseService @options = options @account = account - 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 + search_service_results end private |