techhub/mastodon
2
0
Fork 0
Code Activity

Fix synchronous recursive fetching of deeply-nested quoted posts (#35600)

Browse Source
This commit is contained in:
Claire
2025-07-30 16:39:30 +02:00
committed by GitHub
parent 31ba52a57b
commit efc0d237af
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/activitypub/fetch_remote_status_service.rb
View File

@@ -8,9 +8,10 @@ class ActivityPub::FetchRemoteStatusService < BaseService
DISCOVERIES_PER_REQUEST = 1000
# Should be called when uri has already been checked for locality
def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil, depth: nil)
return if domain_not_allowed?(uri)
@depth = depth || 0
@request_id = request_id || "#{Time.now.utc.to_i}-status-#{uri}"
@json = if prefetched_body.nil?
fetch_status(uri, true, on_behalf_of)
@@ -52,7 +53,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
return nil if discoveries > DISCOVERIES_PER_REQUEST
end
ActivityPub::Activity.factory(activity_json, actor, request_id: @request_id).perform
ActivityPub::Activity.factory(activity_json, actor, request_id: @request_id, depth: @depth).perform
end
private