From 27ea7c13a554d41c4bd83a2712b711d2ef55629c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 14 May 2020 23:37:37 +0200
Subject: [PATCH] Fix hashtag search performing account search as well (#13758)
---
app/services/search_service.rb | 2 +-
spec/services/search_service_spec.rb | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 830de4de3..19500a8d4 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -94,7 +94,7 @@ class SearchService < BaseService
end
def account_searchable?
- account_search? && !(@query.include?('@') && @query.include?(' '))
+ account_search? && !(@query.start_with?('#') || (@query.include?('@') && @query.include?(' ')))
end
def hashtag_searchable?
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 739bb9cf5..5b52662ba 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -91,6 +91,14 @@ describe SearchService, type: :service do
expect(Tag).not_to have_received(:search_for)
expect(results).to eq empty_results
end
+ it 'does not include account when starts with # character' do
+ query = '#tag'
+ allow(AccountSearchService).to receive(:new)
+
+ results = subject.call(query, nil, 10)
+ expect(AccountSearchService).to_not have_received(:new)
+ expect(results).to eq empty_results
+ end
end
end
end