diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-08 18:23:53 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-08 18:23:53 +0100 |
| commit | 692963d43beb5e66a86e15d63b5aa3eeca82f0a1 (patch) | |
| tree | bc7319ae242a889bb1d05b7afdd365d78a43ac1d /app/workers/activitypub | |
| parent | b1983623aec8e0b066d115736d2151e0c74407fa (diff) | |
| parent | b6d7726ecbc833abd00f6a9d36b24d9776cfe623 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/processing_worker.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb index cef595319..37e316354 100644 --- a/app/workers/activitypub/processing_worker.rb +++ b/app/workers/activitypub/processing_worker.rb @@ -6,7 +6,10 @@ class ActivityPub::ProcessingWorker sidekiq_options backtrace: true, retry: 8 def perform(account_id, body, delivered_to_account_id = nil) - ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true) + account = Account.find_by(id: account_id) + return if account.nil? + + ActivityPub::ProcessCollectionService.new.call(body, account, override_timestamps: true, delivered_to_account_id: delivered_to_account_id, delivery: true) rescue ActiveRecord::RecordInvalid => e Rails.logger.debug "Error processing incoming ActivityPub object: #{e}" end |