From c793038a8b7f6de6b45c5d6fddbfe3e330a7b3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sun, 11 May 2025 15:53:02 +0900 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E3=83=8E=E3=83=BC=E3=83=88?= =?UTF-8?q?=E8=B3=BC=E8=AA=AD=E3=81=AE=E6=8C=99=E5=8B=95=E6=94=B9=E5=96=84?= =?UTF-8?q?=20(#16023)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(frontend): ノート購読の挙動改善 * fix --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> --- packages/frontend/src/components/MkNote.vue | 12 +++++- .../src/components/MkNoteDetailed.vue | 10 ++++- .../components/MkReactionsViewer.reaction.vue | 3 +- .../src/composables/use-note-capture.ts | 40 ++++++++++++++----- 4 files changed, 51 insertions(+), 14 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index bbcf5de3b5..2737cd93e6 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -410,12 +410,15 @@ provide(DI.mfmEmojiReactCallback, (reaction) => { }); }); +let subscribeManuallyToNoteCapture: () => void = () => { }; + if (!props.mock) { - useNoteCapture({ + const { subscribe } = useNoteCapture({ note: appearNote, parentNote: note, $note: $appearNote, }); + subscribeManuallyToNoteCapture = subscribe; } if (!props.mock) { @@ -472,6 +475,8 @@ function renote(viaKeyboard = false) { os.popupMenu(menu, renoteButton.value, { viaKeyboard, }); + + subscribeManuallyToNoteCapture(); } function reply(): void { @@ -567,6 +572,11 @@ function undoReact(): void { misskeyApi('notes/reactions/delete', { noteId: appearNote.id, + }).then(() => { + noteEvents.emit(`unreacted:${appearNote.id}`, { + userId: $i!.id, + reaction: oldReaction, + }); }); } diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 5a2af6ac63..ea59254f3d 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -397,7 +397,7 @@ const reactionsPagination = computed(() => ({ }, })); -useNoteCapture({ +const { subscribe: subscribeManuallyToNoteCapture } = useNoteCapture({ note: appearNote, parentNote: note, $note: $appearNote, @@ -453,6 +453,9 @@ function renote() { const { menu } = getRenoteMenu({ note: note, renoteButton }); os.popupMenu(menu, renoteButton.value); + + // リノート後は反応が来る可能性があるので手動で購読する + subscribeManuallyToNoteCapture(); } function reply(): void { @@ -527,6 +530,11 @@ function undoReact(targetNote: Misskey.entities.Note): void { if (!oldReaction) return; misskeyApi('notes/reactions/delete', { noteId: targetNote.id, + }).then(() => { + noteEvents.emit(`unreacted:${appearNote.id}`, { + userId: $i!.id, + reaction: oldReaction, + }); }); } diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index 3a34084c0a..9fc773b335 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -89,8 +89,7 @@ async function toggleReaction() { }).then(() => { noteEvents.emit(`unreacted:${props.noteId}`, { userId: $i!.id, - reaction: props.reaction, - emoji: emoji.value, + reaction: oldReaction, }); if (oldReaction !== props.reaction) { misskeyApi('notes/reactions/create', { diff --git a/packages/frontend/src/composables/use-note-capture.ts b/packages/frontend/src/composables/use-note-capture.ts index 2f33c25a0a..dd00c2b66e 100644 --- a/packages/frontend/src/composables/use-note-capture.ts +++ b/packages/frontend/src/composables/use-note-capture.ts @@ -191,7 +191,9 @@ export function useNoteCapture(props: { note: Pick; parentNote: Misskey.entities.Note | null; $note: ReactiveNoteData; -}) { +}): { + subscribe: () => void; +} { const { note, parentNote, $note } = props; noteEvents.on(`reacted:${note.id}`, onReacted); @@ -254,6 +256,14 @@ export function useNoteCapture(props: { $note.pollChoices = choices; } + function subscribe() { + if ($i && store.s.realtimeMode) { + realtimeSubscribe(props); + } else { + pollingSubscribe(props); + } + } + onUnmounted(() => { noteEvents.off(`reacted:${note.id}`, onReacted); noteEvents.off(`unreacted:${note.id}`, onUnreacted); @@ -265,19 +275,29 @@ export function useNoteCapture(props: { // TODO: デバイスとサーバーの時計がズレていると不具合の元になるため、ズレを検知して警告を表示するなどのケアが必要かもしれない if (parentNote == null) { if ((Date.now() - new Date(note.createdAt).getTime()) > 1000 * 60 * 5) { // 5min - // リノートで表示されているノートでもないし、投稿からある程度経過しているので購読しない - return; + // リノートで表示されているノートでもないし、投稿からある程度経過しているので自動で購読しない + return { + subscribe: () => { + subscribe(); + }, + }; } } else { if ((Date.now() - new Date(parentNote.createdAt).getTime()) > 1000 * 60 * 5) { // 5min - // リノートで表示されているノートだが、リノートされてからある程度経過しているので購読しない - return; + // リノートで表示されているノートだが、リノートされてからある程度経過しているので自動で購読しない + return { + subscribe: () => { + subscribe(); + }, + }; } } - if ($i && store.s.realtimeMode) { - realtimeSubscribe(props); - } else { - pollingSubscribe(props); - } + subscribe(); + + return { + subscribe: () => { + // すでに購読しているので何もしない + }, + }; }