From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 26 Nov 2016 14:32:29 +0000 (+0100)
Subject: Fix #288 - Strip first @ from search query, don't search accounts if it begins with #
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=054138797f6f8a9d58ba14c806e8efeed8083abb;p=mastodon.git

Fix #288 - Strip first @ from search query, don't search accounts if it begins with #
---

diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 598c7d02c..1ae1d5a80 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -2,9 +2,9 @@
 
 class SearchService < BaseService
   def call(query, limit, resolve = false)
-    return if query.blank?
+    return if query.blank? || query.start_with?('#')
 
-    username, domain = query.split('@')
+    username, domain = query.gsub(/\A@/, '').split('@')
 
     results = if domain.nil?
                 Account.search_for(username)