diff options
author | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
commit | ff736905fa534f7189e57c1d0c14fbac45f239a1 (patch) | |
tree | 4502f6d993ba60bd4ab68f41a53a642901d244fd /app/services/search_service.rb | |
parent | 4d77314005483e53e320a82c87805c6bcca1c463 (diff) | |
parent | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/services/search_service.rb')
-rw-r--r-- | app/services/search_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/search_service.rb b/app/services/search_service.rb index e0da61dac..a8442654c 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -12,6 +12,8 @@ class SearchService < BaseService default_results.tap do |results| if url_query? results.merge!(url_resource_results) unless url_resource.nil? + results[:accounts].reject! { |item| item.blocking?(@account) } + results[:statuses].reject! { |status| StatusFilter.new(status, @account).filtered? } elsif @query.present? results[:accounts] = perform_accounts_search! if account_searchable? results[:statuses] = perform_statuses_search! if full_text_searchable? |