diff options
| author | Marie <marie@kaifa.ch> | 2024-02-23 13:42:52 +0100 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-23 13:42:52 +0100 |
| commit | 15d231901143018147432af4a8c0e26fd8f0cadf (patch) | |
| tree | 1e6d5c932d6750ba81e931bf759e559d1392ab4f /packages/backend/src/queue/processors/InboxProcessorService.ts | |
| parent | merge: Reactions not working on child notes in detailed view (!438) (diff) | |
| parent | enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeD... (diff) | |
| download | sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.tar.gz sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.tar.bz2 sharkey-15d231901143018147432af4a8c0e26fd8f0cadf.zip | |
merge: upstream
Diffstat (limited to 'packages/backend/src/queue/processors/InboxProcessorService.ts')
| -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 0a52c9da63..d5e103abe3 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'; @@ -191,7 +192,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'; } } |