From 0698c610a6270f2c184dd97534afb0359cd23994 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 17 Sep 2017 01:18:00 +0900
Subject: [PATCH] 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.
---
app/workers/activitypub/reply_distribution_worker.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
index f9127340f7..fe99fc05f2 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]
--
GitLab