From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 6 Dec 2017 10:44:23 +0000 (+0900)
Subject: Search only from followees (#5897)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d7a17b5e8b53cd9cebe500460d2ff19d5268ef96;p=mastodon.git

Search only from followees (#5897)
---

diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index ce25c3620..a289ceac4 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -58,12 +58,16 @@ class AccountSearchService < BaseService
     @_domain_is_local ||= TagManager.instance.local_domain?(query_domain)
   end
 
+  def search_from
+    options[:following] && account ? account.following : Account
+  end
+
   def exact_match
     @_exact_match ||= begin
       if domain_is_local?
-        Account.find_local(query_username)
+        search_from.find_local(query_username)
       else
-        Account.find_remote(query_username, query_domain)
+        search_from.find_remote(query_username, query_domain)
       end
     end
   end