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

3 weeks ago · 50743cc35b
parent fd516347cb
commit 50743cc35b
1 changed files with 4 additions and 2 deletions
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@ -59,9 +59,11 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
    @quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account)
    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!
-    DistributionWorker.perform_async(@quote.status_id, { 'update' => true })
+
+    DistributionWorker.perform_async(@quote.status_id, { 'update' => true }) if @quote.status.present?
  end

  def forwarder