]> cat aescling's git repositories - mastodon.git/commitdiff
Fix error when using search API with no query (#12541)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 4 Dec 2019 03:34:08 +0000 (04:34 +0100)
committerGitHub <noreply@github.com>
Wed, 4 Dec 2019 03:34:08 +0000 (04:34 +0100)
Fix #12462

app/services/search_service.rb

index 3a498dcf4757afb1bbf296ec0a49c8623fbfba96..090fd409b6e9b4561b8efa1154032bd588ec72bd 100644 (file)
@@ -2,7 +2,7 @@
 
 class SearchService < BaseService
   def call(query, account, limit, options = {})
-    @query   = query.strip
+    @query   = query&.strip
     @account = account
     @options = options
     @limit   = limit.to_i
@@ -10,6 +10,8 @@ class SearchService < BaseService
     @resolve = options[:resolve] || false
 
     default_results.tap do |results|
+      next if @query.blank?
+
       if url_query?
         results.merge!(url_resource_results) unless url_resource.nil? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
       elsif @query.present?