ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
rebase/4.0.0rc2
unarist 2017-09-17 01:18:00 +09:00 committed by Eugen Rochko
parent 629fae8b3b
commit 0698c610a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/workers/activitypub/reply_distribution_worker.rb
View File

@ -7,9 +7,9 @@ class ActivityPub::ReplyDistributionWorker
def perform(status_id) def perform(status_id)
@status = Status.find(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| ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[signed_payload, @status.account_id, inbox_url] [signed_payload, @status.account_id, inbox_url]