Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Further refactor reply fetching code (#34151)

Browse source
This commit is contained in:
Claire 2025-03-12 15:52:10 +01:00 • committed by GitHub
parent f71a855e2d
commit a704e1991c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/workers/activitypub/fetch_all_replies_worker.rb
View file

@ -15,14 +15,14 @@ class ActivityPub::FetchAllRepliesWorker
MAX_REPLIES = (ENV['FETCH_REPLIES_MAX_GLOBAL'] || 1000).to_i MAX_REPLIES = (ENV['FETCH_REPLIES_MAX_GLOBAL'] || 1000).to_i
MAX_PAGES = (ENV['FETCH_REPLIES_MAX_PAGES'] || 500).to_i MAX_PAGES = (ENV['FETCH_REPLIES_MAX_PAGES'] || 500).to_i
def perform(parent_status_id, options = {}) def perform(root_status_id, options = {})
@parent_status = Status.find(parent_status_id) @root_status = Status.remote.find_by(id: root_status_id)
return unless @parent_status.should_fetch_replies? return unless @root_status&.should_fetch_replies?
@parent_status.touch(:fetched_replies_at) @root_status.touch(:fetched_replies_at)
Rails.logger.debug { "FetchAllRepliesWorker - #{@parent_status.uri}: Fetching all replies for status: #{@parent_status}" } Rails.logger.debug { "FetchAllRepliesWorker - #{@root_status.uri}: Fetching all replies for status: #{@root_status}" }
uris_to_fetch, n_pages = get_replies(@parent_status.uri, MAX_PAGES, options) uris_to_fetch, n_pages = get_replies(@root_status.uri, MAX_PAGES, options)
return if uris_to_fetch.nil? return if uris_to_fetch.nil?
fetched_uris = uris_to_fetch.clone.to_set fetched_uris = uris_to_fetch.clone.to_set
@ -41,7 +41,9 @@ class ActivityPub::FetchAllRepliesWorker
n_pages += new_n_pages n_pages += new_n_pages
end end
Rails.logger.debug { "FetchAllRepliesWorker - #{parent_status_id}: fetched #{fetched_uris.length} replies" } Rails.logger.debug { "FetchAllRepliesWorker - #{@root_status.uri}: fetched #{fetched_uris.length} replies" }
# Workers shouldn't be returning anything, but this is used in tests
fetched_uris fetched_uris
end end
@ -55,23 +57,12 @@ class ActivityPub::FetchAllRepliesWorker
end end
def get_replies_uri(parent_status_uri) def get_replies_uri(parent_status_uri)
begin fetch_resource(parent_status_uri, true)&.fetch('replies', nil)
json_status = fetch_resource(parent_status_uri, true)
if json_status.nil?
Rails.logger.debug { "FetchAllRepliesWorker - #{@parent_status.uri}: Could not get replies URI for #{parent_status_uri}, returned nil" }
nil
elsif !json_status.key?('replies')
Rails.logger.debug { "FetchAllRepliesWorker - #{@parent_status.uri}: No replies collection found in ActivityPub object: #{json_status}" }
nil
else
json_status['replies']
end
rescue => e rescue => e
Rails.logger.error { "FetchAllRepliesWorker - #{@parent_status.uri}: Caught exception while resolving replies URI #{parent_status_uri}: #{e} - #{e.message}" } Rails.logger.info { "FetchAllRepliesWorker - #{@root_status.uri}: Caught exception while resolving replies URI #{parent_status_uri}: #{e} - #{e.message}" }
# Raise if we can't get the collection for top-level status to trigger retry # Raise if we can't get the collection for top-level status to trigger retry
raise e if parent_status_uri == @parent_status.uri raise e if parent_status_uri == @root_status.uri
nil nil
end end
end end
end