From 98c26dfff80903dc082179a7df91d7a19af9fb08 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 21 Oct 2021 00:28:27 +0900 Subject: [PATCH] =?UTF-8?q?fix(activitypub):=20not=20reacted=20=E3=81=AA?= =?UTF-8?q?=20Undo.Like=20=E3=81=8Cinbox=E3=81=AB=E6=BB=9E=E7=95=99?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https: //github.com/mei23/misskey/commit/1cfb5e09a44819b82333df26409ec9d9657bdcfc Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com> --- CHANGELOG.md | 1 + src/remote/activitypub/kernel/undo/like.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a3d9a1caa..ec38ad9bdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ### Bugfixes - クライアント: テーマの管理が行えない問題を修正 - API: アプリケーション通知が取得できない問題を修正 +- ActivityPub: not reacted な Undo.Like がinboxに滞留するのを修正 ## 12.92.0 (2021/10/16) diff --git a/src/remote/activitypub/kernel/undo/like.ts b/src/remote/activitypub/kernel/undo/like.ts index 7f821cada0..107d3053e3 100644 --- a/src/remote/activitypub/kernel/undo/like.ts +++ b/src/remote/activitypub/kernel/undo/like.ts @@ -12,6 +12,10 @@ export default async (actor: IRemoteUser, activity: ILike) => { const note = await fetchNote(targetUri); if (!note) return `skip: target note not found ${targetUri}`; - await deleteReaction(actor, note); + await deleteReaction(actor, note).catch(e => { + if (e.id === '60527ec9-b4cb-4a88-a6bd-32d3ad26817d') return; + throw e; + }); + return `ok`; };