mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-05 16:43:09 +02:00
upd: update notes live on feed
This commit is contained in:
parent
d869d7aa05
commit
5d40ca6568
3 changed files with 24 additions and 2 deletions
|
@ -525,7 +525,9 @@ export class NoteEditService implements OnApplicationShutdown {
|
|||
// Pack the note
|
||||
const noteObj = await this.noteEntityService.pack(note);
|
||||
|
||||
this.globalEventService.publishNotesStream(noteObj);
|
||||
this.globalEventService.publishNoteStream(note.id, 'updated', {
|
||||
updatedAt: note.updatedAt!,
|
||||
});
|
||||
|
||||
this.roleService.addNoteToRoleTimeline(noteObj);
|
||||
|
||||
|
|
|
@ -142,6 +142,9 @@ export interface NoteStreamTypes {
|
|||
reaction: string;
|
||||
userId: MiUser['id'];
|
||||
};
|
||||
updated: {
|
||||
updatedAt: Date;
|
||||
}
|
||||
}
|
||||
type NoteStreamEventTypes = {
|
||||
[key in keyof NoteStreamTypes]: {
|
||||
|
|
|
@ -7,6 +7,7 @@ import { onUnmounted, Ref } from 'vue';
|
|||
import * as Misskey from 'misskey-js';
|
||||
import { useStream } from '@/stream.js';
|
||||
import { $i } from '@/account.js';
|
||||
import * as os from '@/os.js';
|
||||
|
||||
export function useNoteCapture(props: {
|
||||
rootEl: Ref<HTMLElement>;
|
||||
|
@ -16,7 +17,7 @@ export function useNoteCapture(props: {
|
|||
const note = props.note;
|
||||
const connection = $i ? useStream() : null;
|
||||
|
||||
function onStreamNoteUpdated(noteData): void {
|
||||
async function onStreamNoteUpdated(noteData): void {
|
||||
const { type, id, body } = noteData;
|
||||
|
||||
if (id !== note.value.id) return;
|
||||
|
@ -75,6 +76,22 @@ export function useNoteCapture(props: {
|
|||
props.isDeletedRef.value = true;
|
||||
break;
|
||||
}
|
||||
|
||||
case "updated": {
|
||||
const editedNote = await os.api("notes/show", {
|
||||
noteId: id,
|
||||
});
|
||||
|
||||
const keys = new Set<string>();
|
||||
Object.keys(editedNote)
|
||||
.concat(Object.keys(note.value))
|
||||
.forEach((key) => keys.add(key));
|
||||
keys.forEach((key) => {
|
||||
note.value[key] = editedNote[key];
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue