logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0698c610a6270f2c184dd97534afb0359cd23994
parent: 629fae8b3be3a04d5190a9048f0aa5a15bd17828
Author: unarist <m.unarist@gmail.com>
Date:   Sun, 17 Sep 2017 01:18:00 +0900

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.

Diffstat:

Mapp/workers/activitypub/reply_distribution_worker.rb4++--
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 @@ -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]