Merge branch 'main' into glitch-soc/merge-upstream

2023-02-10 22:49:59 +01:00
parent 4ceadc65b0 61c5dfb929
commit 87419f9307
57 changed files with 841 additions and 206 deletions
--- a/app/workers/activitypub/fetch_replies_worker.rb
+++ b/app/workers/activitypub/fetch_replies_worker.rb
@@ -6,8 +6,8 @@ class ActivityPub::FetchRepliesWorker

  sidekiq_options queue: 'pull', retry: 3

-  def perform(parent_status_id, replies_uri)
-    ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri)
+  def perform(parent_status_id, replies_uri, options = {})
+    ActivityPub::FetchRepliesService.new.call(Status.find(parent_status_id), replies_uri, **options.deep_symbolize_keys)
  rescue ActiveRecord::RecordNotFound
    true
  end