tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename FetchRemoteResourceService to ResolveURLService (#6328)

Browse Source 
The service used to be named FetchRemoteResourceService resolves local
URL as well.
This commit is contained in:
Akihiko Odaki
2018-01-22 22:24:22 +09:00
committed by Eugen Rochko
parent 8cc65cde27
commit 17cecd75ca
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/services/search_service.rb
View File

@@ -8,7 +8,7 @@ class SearchService < BaseService
default_results.tap do |results|
if url_query?
results.merge!(remote_resource_results) unless remote_resource.nil?
results.merge!(url_resource_results) unless url_resource.nil?
elsif query.present?
results[:accounts] = AccountSearchService.new.call(query, limit, account, resolve: resolve)
results[:hashtags] = Tag.search_for(query.gsub(/\A#/, ''), limit) unless query.start_with?('@')
@@ -24,15 +24,15 @@ class SearchService < BaseService
query =~ /\Ahttps?:\/\//
end
def remote_resource_results
{ remote_resource_symbol => [remote_resource] }
def url_resource_results
{ url_resource_symbol => [url_resource] }
end
def remote_resource
@_remote_resource ||= FetchRemoteResourceService.new.call(query)
def url_resource
@_url_resource ||= ResolveURLService.new.call(query)
end
def remote_resource_symbol
remote_resource.class.name.downcase.pluralize.to_sym
def url_resource_symbol
url_resource.class.name.downcase.pluralize.to_sym
end
end