diff options
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/delivery_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/activitypub/reply_distribution_worker.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index cd67b6710..a4e829343 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -16,7 +16,7 @@ class ActivityPub::DeliveryWorker raise Mastodon::UnexpectedResponseError, @response unless response_successful? rescue => e - raise e.class, "Delivery failed for #{inbox_url}: #{e.message}" + raise e.class, "Delivery failed for #{inbox_url}: #{e.message}", e.backtrace[0] end private diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb index f9127340f..fe99fc05f 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] |