]> cat aescling's git repositories - mastodon.git/commitdiff
Fix returning results when searching for URL with non-zero offset (#13377)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 2 Apr 2020 01:39:37 +0000 (03:39 +0200)
committerGitHub <noreply@github.com>
Thu, 2 Apr 2020 01:39:37 +0000 (03:39 +0200)
Fix #13083

app/services/search_service.rb

index 090fd409b6e9b4561b8efa1154032bd588ec72bd..830de4de326117e449683fdfb41964b3200c3d1d 100644 (file)
@@ -10,10 +10,10 @@ class SearchService < BaseService
     @resolve = options[:resolve] || false
 
     default_results.tap do |results|
-      next if @query.blank?
+      next if @query.blank? || @limit.zero?
 
       if url_query?
-        results.merge!(url_resource_results) unless url_resource.nil? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
+        results.merge!(url_resource_results) unless url_resource.nil? || @offset.positive? || (@options[:type].present? && url_resource_symbol != @options[:type].to_sym)
       elsif @query.present?
         results[:accounts] = perform_accounts_search! if account_searchable?
         results[:statuses] = perform_statuses_search! if full_text_searchable?