diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
commit | 12dae9d58316bec32adaac016998ab1cf69d2b45 (patch) | |
tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /app/services/search_service.rb | |
parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
parent | 120544067fcca4bf6e71ba1ffb276c451c17c656 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
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? |