From d7a17b5e8b53cd9cebe500460d2ff19d5268ef96 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 6 Dec 2017 19:44:23 +0900
Subject: [PATCH] Search only from followees (#5897)
---
app/services/account_search_service.rb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index ce25c3620f..a289ceac4f 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
--
GitLab