about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-05 15:21:14 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-03-05 15:21:14 +0100
commitdf5924a1db08f362fcc8cf873ffaed72a2ce9f19 (patch)
treed6da741af5fc867fe1a7eb656962eb039beff0b7 /app/services
parentd785497ba5ed44e794dd67660b8779380f81ef42 (diff)
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 statuses
Diffstat (limited to 'app/services')
-rw-r--r--app/services/activitypub/fetch_replies_service.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index 95c486a43..569d0d7c1 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -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