post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

Browse source
This commit is contained in:
KMY 2025-05-27 10:51:58 +09:00
commit 7c65b6f9df
464 changed files with 8217 additions and 8135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,9 +78,9 @@ class ActivityPub::FetchAllRepliesWorker
# @param root_status_uri [String]
def get_root_replies(root_status_uri, options = {})
root_status_body = fetch_resource(root_status_uri, true)
raise RuntimeError("FetchAllRepliesWorker - #{@root_status.uri}: Root status could not be fetched") if root_status_body.nil?
return if root_status_body.nil?
FetchReplyWorker.perform_async(root_status_uri, { **options, prefetched_body: root_status_body })
FetchReplyWorker.perform_async(root_status_uri, { **options.deep_stringify_keys, 'prefetched_body' => root_status_body })
get_replies(root_status_body, MAX_PAGES, options)
end

2
app/workers/activitypub/synchronize_featured_collection_worker.rb
View file

@ -6,7 +6,7 @@ class ActivityPub::SynchronizeFeaturedCollectionWorker
sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.day.to_i
def perform(account_id, options = {})
options = { note: true, hashtag: false }.deep_merge(options.deep_symbolize_keys)
options = { note: true, hashtag: false }.deep_merge(options.symbolize_keys)
ActivityPub::FetchFeaturedCollectionService.new.call(Account.find(account_id), **options)
rescue ActiveRecord::RecordNotFound