From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sun, 26 Jul 2020 21:58:36 +0000 (+0900)
Subject: Fix following restriction not working when exact match in account search (#14394)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=156af70e4d01f8bf65cdede554c37ab8f9817036;p=mastodon.git

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

diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 493813aab..43e596040 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -27,7 +27,7 @@ class AccountSearchService < BaseService
 
     return @exact_match if defined?(@exact_match)
 
-    @exact_match = begin
+    match = begin
       if options[:resolve]
         ResolveAccountService.new.call(query)
       elsif domain_is_local?
@@ -36,6 +36,10 @@ class AccountSearchService < BaseService
         Account.find_remote(query_username, query_domain)
       end
     end
+
+    match = nil if !match.nil? && !account.nil? && options[:following] && !account.following?(match)
+
+    @exact_match = match
   end
 
   def search_results