nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix following restriction not working when exact match in account search (#14394)

This commit is contained in:
Takeshi Umeda 2020-07-27 06:58:36 +09:00 committed by GitHub
parent d1a6f8d5a8
commit 156af70e4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/services/account_search_service.rb
View File

@ -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