diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-02-22 20:59:57 +0900 |
|---|---|---|
| committer | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-02-22 20:59:57 +0900 |
| commit | 2bd9f05a922ae142554ce68cd97dce7e29bb9bba (patch) | |
| tree | f4eb13d0afc2631430501ab4265f079b3a9f4486 /packages/backend/src/queue/processors | |
| parent | enhance: サーバーごとにモデレーションノートを残せるよ... (diff) | |
| parent | fix: 禁止キーワードを含むノートがDelayed Queueに追加され... (diff) | |
| download | sharkey-2bd9f05a922ae142554ce68cd97dce7e29bb9bba.tar.gz sharkey-2bd9f05a922ae142554ce68cd97dce7e29bb9bba.tar.bz2 sharkey-2bd9f05a922ae142554ce68cd97dce7e29bb9bba.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src/queue/processors')
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index 7adadd799b..0a713149e5 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -24,6 +24,7 @@ import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js'; import { LdSignatureService } from '@/core/activitypub/LdSignatureService.js'; import { ApInboxService } from '@/core/activitypub/ApInboxService.js'; import { bindThis } from '@/decorators.js'; +import { IdentifiableError } from '@/misc/identifiable-error.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; import type { InboxJobData } from '../types.js'; @@ -180,7 +181,14 @@ export class InboxProcessorService { }); // アクティビティを処理 - await this.apInboxService.performActivity(authUser.user, activity); + try { + await this.apInboxService.performActivity(authUser.user, activity); + } catch (e) { + if (e instanceof IdentifiableError) { + if (e.id === '689ee33f-f97c-479a-ac49-1b9f8140af99') return 'blocked notes with prohibited words'; + } + throw e; + } return 'ok'; } } |