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

2024-05-17 08:53:59 +09:00 · 2024-05-17 08:53:59 +09:00 · 094ff9d2ee
commit 094ff9d2ee
parent d5e9bc5247 b2388be71e
153 changed files with 1412 additions and 631 deletions
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@ -60,7 +60,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
  def set_statuses
    return unless page_requested?

-    @statuses = cache_collection_paginated_by_id(
+    @statuses = preload_collection_paginated_by_id(
      AccountStatusesFilter.new(@account, signed_request_account).results,
      Status,
      LIMIT,