mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix hashtag search performing account search as well (#13758)

Browse Source
This commit is contained in:
ThibG 2020-05-14 23:37:37 +02:00 committed by GitHub
parent 71fce71c94
commit 27ea7c13a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/search_service.rb
View File

@ -94,7 +94,7 @@ class SearchService < BaseService
end end
def account_searchable? def account_searchable?
account_search? && !(@query.include?('@') && @query.include?(' ')) account_search? && !(@query.start_with?('#') || (@query.include?('@') && @query.include?(' ')))
end end
def hashtag_searchable? def hashtag_searchable?

8
spec/services/search_service_spec.rb
View File

@ -91,6 +91,14 @@ describe SearchService, type: :service do
expect(Tag).not_to have_received(:search_for) expect(Tag).not_to have_received(:search_for)
expect(results).to eq empty_results expect(results).to eq empty_results
end 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 end
end end