tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shorten caching of quote posts pending approval (#37570)

Browse Source
This commit is contained in:
Claire 2026-01-22 13:38:00 +01:00 committed by GitHub
parent 42b2fdb0ac
commit 958103368e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/statuses_controller.rb
View File

@ -29,7 +29,7 @@ class StatusesController < ApplicationController
end end
format.json do format.json do
expires_in 3.minutes, public: true if @status.distributable? && public_fetch_mode? expires_in @status.quote&.pending? ? 5.seconds : 3.minutes, public: true if @status.distributable? && public_fetch_mode?
render_with_cache json: @status, content_type: 'application/activity+json', serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter render_with_cache json: @status, content_type: 'application/activity+json', serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter
end end
end end

11
app/models/quote.rb
View File

@ -47,6 +47,8 @@ class Quote < ApplicationRecord
def accept! def accept!
update!(state: :accepted) update!(state: :accepted)
reset_parent_cache! if attribute_changed?(:state)
end end
def reject! def reject!
@ -75,6 +77,15 @@ class Quote < ApplicationRecord
private private
def reset_parent_cache!
return if status_id.nil?
Rails.cache.delete("v3:statuses/#{status_id}")
# This clears the web cache for the ActivityPub representation
Rails.cache.delete("statuses/show:v3:statuses/#{status_id}")
end
def set_accounts def set_accounts
self.account = status.account self.account = status.account
self.quoted_account = quoted_status&.account self.quoted_account = quoted_status&.account