about summary refs log tree commit diff
path: root/app/services/search_service.rb
diff options
context:
space:
mode:
authorStarfall <admin@plural.cafe>2020-05-18 17:26:39 -0500
committerStarfall <admin@plural.cafe>2020-05-18 17:26:39 -0500
commit4d8b8d44466dd6312d4914c5a14667ac7eaffbb8 (patch)
treeb2d285555b362acd2ab9893e506062816c957525 /app/services/search_service.rb
parent3de0fecfa24ac57adfdd068c0f565f5c53f621d3 (diff)
parentce87469d0a085b238646387fb01d78c206b83124 (diff)
Merge github.com:tootsuite/mastodon
Diffstat (limited to 'app/services/search_service.rb')
-rw-r--r--app/services/search_service.rb2
1 files changed, 1 insertions, 1 deletions
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?