diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/search_service.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 6f740e149..19fc16973 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class SearchService < BaseService - def call(query, limit, resolve = false) + def call(query, limit, resolve = false, account = nil) return if query.blank? || query.start_with?('#') username, domain = query.gsub(/\A@/, '').split('@') @@ -9,13 +9,12 @@ class SearchService < BaseService if domain.nil? exact_match = Account.find_local(username) - results = Account.search_for(username) + results = account.nil? ? Account.search_for(username, limit) : Account.advanced_search_for(username, account, limit) else exact_match = Account.find_remote(username, domain) - results = Account.search_for("#{username} #{domain}") + results = account.nil? ? Account.search_for("#{username} #{domain}", limit) : Account.advanced_search_for("#{username} #{domain}", account, limit) end - results = results.limit(limit).to_a results = [exact_match] + results.reject { |a| a.id == exact_match.id } if exact_match if resolve && !exact_match && !domain.nil? |