Compare commits

...

1 commit

Author SHA1 Message Date
Eugen Rochko
34a62ff423 Fix account search showing results from domains hidden by user
Fix #8586
2020-08-31 17:22:04 +02:00

View file

@ -48,7 +48,17 @@ class AccountSearchService < BaseService
@search_results ||= begin @search_results ||= begin
results = from_elasticsearch if Chewy.enabled? results = from_elasticsearch if Chewy.enabled?
results ||= from_database results ||= from_database
results results.reject { |result| excluded_domains.include?(result.domain) }
end
end
def excluded_domains
@excluded_domains ||= begin
if account
Set.new(account.excluded_from_timeline_domains)
else
Set.new
end
end end
end end