From: unarist <m.unarist@gmail.com>
Date: Sat, 16 Sep 2017 16:18:00 +0000 (+0900)
Subject: Fix an error in ReplyDistributionWorker when replied status was deleted (#4974)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0698c610a6270f2c184dd97534afb0359cd23994;p=mastodon.git

Fix an error in ReplyDistributionWorker when replied status was deleted (#4974)

Reply distribution is proceed by Sidekiq, so replied status may be deleted before this.
---

diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
index f9127340f..fe99fc05f 100644
--- a/app/workers/activitypub/reply_distribution_worker.rb
+++ b/app/workers/activitypub/reply_distribution_worker.rb
@@ -7,9 +7,9 @@ class ActivityPub::ReplyDistributionWorker
 
   def perform(status_id)
     @status  = Status.find(status_id)
-    @account = @status.thread.account
+    @account = @status.thread&.account
 
-    return if skip_distribution?
+    return if @account.nil? || skip_distribution?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
       [signed_payload, @status.account_id, inbox_url]