]> cat aescling's git repositories - mastodon.git/commitdiff
Fix an error in ReplyDistributionWorker when replied status was deleted (#4974)
authorunarist <m.unarist@gmail.com>
Sat, 16 Sep 2017 16:18:00 +0000 (01:18 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 16 Sep 2017 16:18:00 +0000 (18:18 +0200)
Reply distribution is proceed by Sidekiq, so replied status may be deleted before this.

app/workers/activitypub/reply_distribution_worker.rb

index f9127340f7d4ee3d95f5ce78998c32a0b520892c..fe99fc05f295691d412417fd555c056f1fcf5384 100644 (file)
@@ -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]