From 48e527317f00563c430c73b72304ba74deb5622b Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Thu, 23 Jul 2020 21:42:14 -0500 Subject: [Bug] Use safe navigation to prevent crash if reply is orphaned --- app/workers/activitypub/distribution_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/workers') diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb index ec1b1f20e..2ee86d496 100644 --- a/app/workers/activitypub/distribution_worker.rb +++ b/app/workers/activitypub/distribution_worker.rb @@ -35,7 +35,7 @@ class ActivityPub::DistributionWorker # Deliver the status to all followers. # If the status is a reply to another local status, also forward it to that # status' authors' followers. - @inboxes ||= if @status.reply? && @status.thread.account.local? && @status.distributable? + @inboxes ||= if @status.reply? && @status.thread&.account&.local? && @status.distributable? @account.followers.or(@status.thread.account.followers).inboxes else @account.followers.inboxes -- cgit