bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-04 03:25:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix crash when serializing quotes of deleted posts for ActivityPub (#36381)

Browse source
This commit is contained in:
Claire 2025-10-09 15:52:38 +02:00 • committed by GitHub
parent b7c5e60426
commit d4a4a7177a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 97 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/activitypub/process_status_update_service.rb
View file

@ -300,7 +300,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
def update_quote!
quote_uri = @status_parser.quote_uri
if quote_uri.present?
if @status_parser.quote?
approval_uri = @status_parser.quote_approval_uri
approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
@ -310,7 +310,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
# Revoke the quote while we get a chance… maybe this should be a `before_destroy` hook?
RevokeQuoteService.new.call(@status.quote) if @status.quote.quoted_account&.local? && @status.quote.accepted?
@status.quote.destroy
quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
@quote_changed = true
else
quote = @status.quote