hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix search API not resolving URL when type is given (#11822) 

Fix #11771
signup-info-prompt
Eugen Rochko 2019-09-13 16:01:39 +02:00 committed by GitHub
parent 0762258aec
commit 50edf84898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/search_service.rb
View File

@ -11,7 +11,7 @@ class SearchService < BaseService
default_results.tap do |results| default_results.tap do |results|
if url_query? 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? elsif @query.present?
results[:accounts] = perform_accounts_search! if account_searchable? results[:accounts] = perform_accounts_search! if account_searchable?
results[:statuses] = perform_statuses_search! if full_text_searchable? results[:statuses] = perform_statuses_search! if full_text_searchable?
@ -69,7 +69,7 @@ class SearchService < BaseService
end end
def url_query? def url_query?
@resolve && @options[:type].blank? && @query =~ /\Ahttps?:\/\// @resolve && @query =~ /\Ahttps?:\/\//
end end
def url_resource_results def url_resource_results