fix(frontend): Recieve Unrenote on streaming (#12079)
* fix(frontend): Recieve Unrenote 表示しているリノートがリノート解除されたらストリーミングで受信してすぐに消えるようにする * fix(frontend): Recieve Unrenote lint fixing * fix(frontend): Recieve Unrenote Decapture Decapture忘れてたー
This commit is contained in:
parent
3c3d05ba2e
commit
7b361224f8
3 changed files with 11 additions and 1 deletions
packages/frontend/src
|
@ -232,6 +232,7 @@ const keymap = {
|
|||
useNoteCapture({
|
||||
rootEl: el,
|
||||
note: $$(appearNote),
|
||||
pureNote: $$(note),
|
||||
isDeletedRef: isDeleted,
|
||||
});
|
||||
|
||||
|
|
|
@ -296,6 +296,7 @@ const reactionsPagination = $computed(() => ({
|
|||
useNoteCapture({
|
||||
rootEl: el,
|
||||
note: $$(appearNote),
|
||||
pureNote: $$(note),
|
||||
isDeletedRef: isDeleted,
|
||||
});
|
||||
|
||||
|
|
|
@ -11,15 +11,17 @@ import { $i } from '@/account.js';
|
|||
export function useNoteCapture(props: {
|
||||
rootEl: Ref<HTMLElement>;
|
||||
note: Ref<Misskey.entities.Note>;
|
||||
pureNote: Ref<Misskey.entities.Note>;
|
||||
isDeletedRef: Ref<boolean>;
|
||||
}) {
|
||||
const note = props.note;
|
||||
const pureNote = props.pureNote;
|
||||
const connection = $i ? useStream() : null;
|
||||
|
||||
function onStreamNoteUpdated(noteData): void {
|
||||
const { type, id, body } = noteData;
|
||||
|
||||
if (id !== note.value.id) return;
|
||||
if ((id !== note.value.id) && (id !== pureNote.value.id)) return;
|
||||
|
||||
switch (type) {
|
||||
case 'reacted': {
|
||||
|
@ -82,6 +84,7 @@ export function useNoteCapture(props: {
|
|||
if (connection) {
|
||||
// TODO: このノートがストリーミング経由で流れてきた場合のみ sr する
|
||||
connection.send(document.body.contains(props.rootEl.value) ? 'sr' : 's', { id: note.value.id });
|
||||
if (pureNote.value.id !== note.value.id) connection.send('s', { id: pureNote.value.id });
|
||||
if (withHandler) connection.on('noteUpdated', onStreamNoteUpdated);
|
||||
}
|
||||
}
|
||||
|
@ -91,6 +94,11 @@ export function useNoteCapture(props: {
|
|||
connection.send('un', {
|
||||
id: note.value.id,
|
||||
});
|
||||
if (pureNote.value.id !== note.value.id) {
|
||||
connection.send('un', {
|
||||
id: pureNote.value.id,
|
||||
});
|
||||
}
|
||||
if (withHandler) connection.off('noteUpdated', onStreamNoteUpdated);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue