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

Fix potential duplicate handling of quote accept/reject/delete (#37537)

Browse Source
This commit is contained in:
Claire 2026-01-19 14:47:27 +01:00 committed by GitHub
parent 9b6500f74a
commit 220115757d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/accept.rb
View File

@ -46,7 +46,7 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
def accept_quote!(quote) def accept_quote!(quote)
approval_uri = value_or_id(first_of_value(@json['result'])) approval_uri = value_or_id(first_of_value(@json['result']))
return if unsupported_uri_scheme?(approval_uri) || quote.quoted_account != @account || !quote.status.local? return if unsupported_uri_scheme?(approval_uri) || quote.quoted_account != @account || !quote.status.local? || !quote.pending?
# NOTE: we are not going through `ActivityPub::VerifyQuoteService` as the `Accept` is as authoritative # NOTE: we are not going through `ActivityPub::VerifyQuoteService` as the `Accept` is as authoritative
# as the stamp, but this means we are not checking the stamp, which may lead to inconsistencies # as the stamp, but this means we are not checking the stamp, which may lead to inconsistencies

2
app/lib/activitypub/activity/delete.rb
View File

@ -56,7 +56,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
end end
def revoke_quote def revoke_quote
@quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account) @quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account, state: [:pending, :accepted])
return if @quote.nil? return if @quote.nil?
ActivityPub::Forwarder.new(@account, @json, @quote.status).forward! if @quote.status.present? ActivityPub::Forwarder.new(@account, @json, @quote.status).forward! if @quote.status.present?

4
app/models/quote.rb
View File

@ -51,9 +51,9 @@ class Quote < ApplicationRecord
def reject! def reject!
if accepted? if accepted?
update!(state: :revoked) update!(state: :revoked, approval_uri: nil)
elsif !revoked? elsif !revoked?
update!(state: :rejected) update!(state: :rejected, approval_uri: nil)
end end
end end