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

2025-01-17 16:29:11 +09:00 · 2025-01-17 16:29:11 +09:00 · 5d79bd078c
commit 5d79bd078c
parent 28cc7eb2c3 3af6739f21
150 changed files with 2982 additions and 1485 deletions
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@ -41,12 +41,8 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
    end
  end

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

  def next_page