diff options
Diffstat (limited to 'app/services/search_service.rb')
| -rw-r--r-- | app/services/search_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/search_service.rb b/app/services/search_service.rb index fe601bbf4..a5ba5dd11 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -11,7 +11,7 @@ class SearchService < BaseService default_results.tap do |results| if url_query? - results.merge!(url_resource_results) unless url_resource.nil? + results.merge!(url_resource_results) unless url_resource.nil? || (@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? @@ -69,7 +69,7 @@ class SearchService < BaseService end def url_query? - @resolve && @options[:type].blank? && @query =~ /\Ahttps?:\/\// + @resolve && @query =~ /\Ahttps?:\/\// end def url_resource_results |