|
|
@ -27,7 +27,7 @@ class AccountSearchService < BaseService
|
|
|
|
|
|
|
|
|
|
|
|
return @exact_match if defined?(@exact_match)
|
|
|
|
return @exact_match if defined?(@exact_match)
|
|
|
|
|
|
|
|
|
|
|
|
@exact_match = begin
|
|
|
|
match = begin
|
|
|
|
if options[:resolve]
|
|
|
|
if options[:resolve]
|
|
|
|
ResolveAccountService.new.call(query)
|
|
|
|
ResolveAccountService.new.call(query)
|
|
|
|
elsif domain_is_local?
|
|
|
|
elsif domain_is_local?
|
|
|
@ -36,6 +36,10 @@ class AccountSearchService < BaseService
|
|
|
|
Account.find_remote(query_username, query_domain)
|
|
|
|
Account.find_remote(query_username, query_domain)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
match = nil if !match.nil? && !account.nil? && options[:following] && !account.following?(match)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@exact_match = match
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def search_results
|
|
|
|
def search_results
|
|
|
|