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

2020-05-14 23:37:37 +02:00
parent 71fce71c94
commit 27ea7c13a5
2 changed files with 9 additions and 1 deletions
--- 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?