gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Fix forwarder being called with nil status when quote post is soft-deleted (#36463)

Browse Source
This commit is contained in:
Claire 2025-10-14 17:15:45 +02:00 committed by GitHub
parent fd516347cb
commit 50743cc35b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,11 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
@quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account) @quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account)
return if @quote.nil? return if @quote.nil?
ActivityPub::Forwarder.new(@account, @json, @quote.status).forward! ActivityPub::Forwarder.new(@account, @json, @quote.status).forward! if @quote.status.present?
@quote.reject! @quote.reject!
DistributionWorker.perform_async(@quote.status_id, { 'update' => true })
DistributionWorker.perform_async(@quote.status_id, { 'update' => true }) if @quote.status.present?
end end
def forwarder def forwarder