gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
KMY 2024-05-17 08:53:59 +09:00
commit 094ff9d2ee
153 changed files with 1412 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/activitypub/collections_controller.rb
View file

@ -18,7 +18,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
def set_items
case params[:id]
when 'featured'
@items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
@items = for_signed_account { preload_collection(@account.pinned_statuses, Status) }
@items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
when 'tags'
@items = for_signed_account { @account.featured_tags }

2
app/controllers/activitypub/outboxes_controller.rb
View file

@ -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,

2
app/controllers/activitypub/references_controller.rb
View file

@ -31,7 +31,7 @@ class ActivityPub::ReferencesController < ActivityPub::BaseController
end
def cached_references
cache_collection(Status.where(id: results).reorder(:id), Status)
preload_collection(Status.where(id: results).reorder(:id), Status)
end
def results