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

2024-11-01 08:04:03 +09:00 · 2024-11-01 08:04:03 +09:00 · 1c1f76697b
commit 1c1f76697b
parent 9c71b791e1 b06fd54c30
200 changed files with 1931 additions and 741 deletions
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@ -41,11 +41,11 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
    end
  end

-  def outbox_url(**kwargs)
+  def outbox_url(**)
    if params[:account_username].present?
-      account_outbox_url(@account, **kwargs)
+      account_outbox_url(@account, **)
    else
-      instance_actor_outbox_url(**kwargs)
+      instance_actor_outbox_url(**)
    end
  end