diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-05-28 18:17:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 18:17:39 +0900 |
| commit | e2eb7e8ca99839cedc01ef35c16f23da13b4ba3b (patch) | |
| tree | a435d61a5fd731b5326112461f1a5243a624ad0a /packages/backend/src/queue/processors | |
| parent | Bump version to 2024.5.0-beta.5 (diff) | |
| parent | feat: sentry integration (#13897) (diff) | |
| download | sharkey-e2eb7e8ca99839cedc01ef35c16f23da13b4ba3b.tar.gz sharkey-e2eb7e8ca99839cedc01ef35c16f23da13b4ba3b.tar.bz2 sharkey-e2eb7e8ca99839cedc01ef35c16f23da13b4ba3b.zip | |
Merge branch 'develop' into release/2024.5.0
Diffstat (limited to 'packages/backend/src/queue/processors')
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index f465339075..fa7009f8f5 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -204,13 +204,22 @@ export class InboxProcessorService { // アクティビティを処理 try { - await this.apInboxService.performActivity(authUser.user, activity); + const result = await this.apInboxService.performActivity(authUser.user, activity); + if (result && !result.startsWith('ok')) { + this.logger.warn(`inbox activity ignored (maybe): id=${activity.id} reason=${result}`); + return result; + } } catch (e) { if (e instanceof IdentifiableError) { if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') { return 'blocked notes with prohibited words'; } - if (e.id === '85ab9bd7-3a41-4530-959d-f07073900109') return 'actor has been suspended'; + if (e.id === '85ab9bd7-3a41-4530-959d-f07073900109') { + return 'actor has been suspended'; + } + if (e.id === 'd450b8a9-48e4-4dab-ae36-f4db763fda7c') { // invalid Note + return e.message; + } } throw e; } |