diff --git a/CHANGELOG.md b/CHANGELOG.md index 9526f67760..bd249f8608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - Fix: robots.txtの内容を調整 - Fix: 特定のユーザーに管理者権限を持つロールが複数ついている際に、取得できるユーザーIDが重複する問題を修正 (Cherry-picked from https://github.com/lqvp/misskey-tempura/commit/17ed4108cec4b6bd2fd989db5a9091db91fa37a7) +- Fix: ブロックしたサーバーからのInboxジョブが蓄積し続ける問題を修正 + (Cherry-picked from https://github.com/lqvp/misskey-tempura/commit/3f0f4bfe923f2b3a7837017b54841598f421c6ef) - Fix: support activity with `actor` as an id string or embedded object in inbox processor and ActivityPub inbox service - Fix: コンフィグファイルに `meilisearch` の設定がある状態でほかの検索プロバイダを利用すると、UI上からリモートのノートの検索ができない問題を修正 diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index 98af3477a8..78261a096a 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -243,17 +243,17 @@ export class InboxProcessorService implements OnApplicationShutdown { } } 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 === 'd450b8a9-48e4-4dab-ae36-f4db763fda7c') { // invalid Note - return e.message; - } - if (e.id === '9f466dab-c856-48cd-9e65-ff90ff750580') { - return 'note contains too many mentions'; + switch (e.id) { + case '689ee33f-f97c-479a-ac49-1b9f8140af99': + return 'blocked notes with prohibited words'; + case '85ab9bd7-3a41-4530-959d-f07073900109': + return 'actor has been suspended'; + case 'd450b8a9-48e4-4dab-ae36-f4db763fda7c': // invalid Note + return e.message; + case '9f466dab-c856-48cd-9e65-ff90ff750580': + return 'note contains too many mentions'; + case '09d79f9e-64f1-4316-9cfa-e75c4d091574': // Instance is blocked + return 'skip: blocked instance'; } } throw e;