Merge branch 'master' into glitch-soc/merge-upstream

2020-05-20 18:22:42 +02:00
parent b7e178d2e4 50524d1327
commit 27b5143dc4
14 changed files with 124 additions and 26 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?