Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Do not error out on unsalvageable errors in FetchRepliesService (#10175)

Browse source 
* Do not error out on unsalvageable errors in FetchRepliesService

Fixes #10152

* Fix FetchRepliesWorker erroring out on deleted statuses
This commit is contained in:
ThibG 2019-03-05 15:21:14 +01:00 • committed by Eugen Rochko
parent d785497ba5
commit df5924a1db
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/activitypub/fetch_replies_service.rb
View file

@ -36,9 +36,7 @@ class ActivityPub::FetchRepliesService < BaseService
return collection_or_uri if collection_or_uri.is_a?(Hash)
return unless @allow_synchronous_requests
return if invalid_origin?(collection_or_uri)
collection = fetch_resource_without_id_validation(collection_or_uri)
raise Mastodon::UnexpectedResponseError if collection.nil?
collection
fetch_resource_without_id_validation(collection_or_uri, nil, true)
end
def filtered_replies