diff options
| author | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
| commit | c0341f06be5310a00b85a5d48fa80891d47c6710 (patch) | |
| tree | 907ef7f787f8bd446a6d9be1448a8bcff74e5a08 /app/workers/activitypub/processing_worker.rb | |
| parent | 169688aa9f2a69ac3d36332c833e9cad43b5f7a5 (diff) | |
| parent | 6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd (diff) | |
Merge remote-tracking branch 'glitch/main'
Not at all sure where the admin UI is going to display English language names now but OK.
Diffstat (limited to 'app/workers/activitypub/processing_worker.rb')
| -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 |