forked from cybrespace/mastodon
Fix some timeouts when searching URLs by limiting some database queries (#13253)
Only look up private toots from database if the request failed because of 401, 403 or 404 errors, as those may indicate a private toot, rather than something that isn't a toot or cannot be processed.
This commit is contained in:
parent
bea0bb39d6
commit
cb12a2cdd3
|
@ -5,6 +5,8 @@ class FetchResourceService < BaseService
|
||||||
|
|
||||||
ACCEPT_HEADER = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", text/html;q=0.1'
|
ACCEPT_HEADER = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", text/html;q=0.1'
|
||||||
|
|
||||||
|
attr_reader :response_code
|
||||||
|
|
||||||
def call(url)
|
def call(url)
|
||||||
return if url.blank?
|
return if url.blank?
|
||||||
|
|
||||||
|
@ -27,6 +29,7 @@ class FetchResourceService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def process_response(response, terminal = false)
|
def process_response(response, terminal = false)
|
||||||
|
@response_code = response.code
|
||||||
return nil if response.code != 200
|
return nil if response.code != 200
|
||||||
|
|
||||||
if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
|
if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
|
||||||
|
|
|
@ -12,7 +12,7 @@ class ResolveURLService < BaseService
|
||||||
process_local_url
|
process_local_url
|
||||||
elsif !fetched_resource.nil?
|
elsif !fetched_resource.nil?
|
||||||
process_url
|
process_url
|
||||||
elsif @on_behalf_of.present?
|
else
|
||||||
process_url_from_db
|
process_url_from_db
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -30,6 +30,8 @@ class ResolveURLService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def process_url_from_db
|
def process_url_from_db
|
||||||
|
return unless @on_behalf_of.present? && [401, 403, 404].include?(fetch_resource_service.response_code)
|
||||||
|
|
||||||
# It may happen that the resource is a private toot, and thus not fetchable,
|
# It may happen that the resource is a private toot, and thus not fetchable,
|
||||||
# but we can return the toot if we already know about it.
|
# but we can return the toot if we already know about it.
|
||||||
status = Status.find_by(uri: @url) || Status.find_by(url: @url)
|
status = Status.find_by(uri: @url) || Status.find_by(url: @url)
|
||||||
|
@ -40,7 +42,11 @@ class ResolveURLService < BaseService
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetched_resource
|
def fetched_resource
|
||||||
@fetched_resource ||= FetchResourceService.new.call(@url)
|
@fetched_resource ||= fetch_resource_service.call(@url)
|
||||||
|
end
|
||||||
|
|
||||||
|
def fetch_resource_service
|
||||||
|
@_fetch_resource_service ||= FetchResourceService.new
|
||||||
end
|
end
|
||||||
|
|
||||||
def resource_url
|
def resource_url
|
||||||
|
|
Loading…
Reference in New Issue