mirror of https://github.com/tootsuite/mastodon
Do not error out on unsalvageable errors in FetchRepliesService (#10175)
* Do not error out on unsalvageable errors in FetchRepliesService Fixes #10152 * Fix FetchRepliesWorker erroring out on deleted statusespull/10179/head
parent
d785497ba5
commit
df5924a1db
|
@ -63,13 +63,19 @@ module JsonLdHelper
|
||||||
json.present? && json['id'] == uri ? json : nil
|
json.present? && json['id'] == uri ? json : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetch_resource_without_id_validation(uri, on_behalf_of = nil)
|
def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false)
|
||||||
build_request(uri, on_behalf_of).perform do |response|
|
build_request(uri, on_behalf_of).perform do |response|
|
||||||
|
unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
|
||||||
|
raise Mastodon::UnexpectedResponseError, response
|
||||||
|
end
|
||||||
return body_to_json(response.body_with_limit) if response.code == 200
|
return body_to_json(response.body_with_limit) if response.code == 200
|
||||||
end
|
end
|
||||||
# If request failed, retry without doing it on behalf of a user
|
# If request failed, retry without doing it on behalf of a user
|
||||||
return if on_behalf_of.nil?
|
return if on_behalf_of.nil?
|
||||||
build_request(uri).perform do |response|
|
build_request(uri).perform do |response|
|
||||||
|
unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
|
||||||
|
raise Mastodon::UnexpectedResponseError, response
|
||||||
|
end
|
||||||
response.code == 200 ? body_to_json(response.body_with_limit) : nil
|
response.code == 200 ? body_to_json(response.body_with_limit) : nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -92,6 +98,14 @@ module JsonLdHelper
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def response_successful?(response)
|
||||||
|
(200...300).cover?(response.code)
|
||||||
|
end
|
||||||
|
|
||||||
|
def response_error_unsalvageable?(response)
|
||||||
|
(400...500).cover?(response.code) && response.code != 429
|
||||||
|
end
|
||||||
|
|
||||||
def build_request(uri, on_behalf_of = nil)
|
def build_request(uri, on_behalf_of = nil)
|
||||||
request = Request.new(:get, uri)
|
request = Request.new(:get, uri)
|
||||||
request.on_behalf_of(on_behalf_of) if on_behalf_of
|
request.on_behalf_of(on_behalf_of) if on_behalf_of
|
||||||
|
|
|
@ -36,9 +36,7 @@ class ActivityPub::FetchRepliesService < BaseService
|
||||||
return collection_or_uri if collection_or_uri.is_a?(Hash)
|
return collection_or_uri if collection_or_uri.is_a?(Hash)
|
||||||
return unless @allow_synchronous_requests
|
return unless @allow_synchronous_requests
|
||||||
return if invalid_origin?(collection_or_uri)
|
return if invalid_origin?(collection_or_uri)
|
||||||
collection = fetch_resource_without_id_validation(collection_or_uri)
|
fetch_resource_without_id_validation(collection_or_uri, nil, true)
|
||||||
raise Mastodon::UnexpectedResponseError if collection.nil?
|
|
||||||
collection
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def filtered_replies
|
def filtered_replies
|
||||||
|
|
|
@ -8,5 +8,7 @@ class ActivityPub::FetchRepliesWorker
|
||||||
|
|
||||||
def perform(parent_status_id, replies_uri)
|
def perform(parent_status_id, replies_uri)
|
||||||
ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri)
|
ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri)
|
||||||
|
rescue ActiveRecord::RecordNotFound
|
||||||
|
true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue