Merge remote-tracking branch 'parent/main' into upstream-20240115

2024-01-15 11:08:37 +09:00 · 2024-01-15 11:08:37 +09:00 · 673e09d645
commit 673e09d645
parent ac65d05df5 cc3ff66246
338 changed files with 1095 additions and 540 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -320,6 +320,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
        RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id)
      rescue Seahorse::Client::NetworkingError => e
        Rails.logger.warn "Error storing media attachment: #{e}"
+        RedownloadMediaWorker.perform_async(media_attachment.id)
      end
    end