Merge pull request #24

fix (frontend): Refresh on note edit
nekoplanet · Aug 6, 2024 · f8e8c22 · f8e8c22
2 parents 38a412a + 69b96da
commit f8e8c22
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 118 deletions.
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
diff --git a/packages/backend/src/core/NoteUpdateService.ts b/packages/backend/src/core/NoteUpdateService.ts
@@ -28,6 +28,7 @@ import { MiPoll, IPoll } from "@/models/Poll.js";
 import { concat } from "@/misc/prelude/array.js";
 import { extractHashtags } from "@/misc/extract-hashtags.js";
 import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
+import { ApiError } from "@/server/api/error.js";
 
 type MinimumUser = {
     id: MiUser['id'];
@@ -76,7 +77,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
         username: MiUser['username'],
         host: MiUser['host'],
         isBot: MiUser['isBot'],
-    }, data: Option, note: MiNote, silent = false): Promise<MiNote | null> {
+    }, data: Option, note: MiNote, silent = false): Promise<MiNote> {
         if (data.updatedAt == null) data.updatedAt = new Date();
 
         if (data.text) {
@@ -121,7 +122,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
     private async updateNote(user: {
         id: MiUser['id'],
         host: MiUser['host'],
-    }, note: MiNote, data: Option, tags: string[], emojis: string[]): Promise<MiNote | null> {
+    }, note: MiNote, data: Option, tags: string[], emojis: string[]): Promise<MiNote> {
         if (data.updatedAt === null || data.updatedAt === undefined) {
             data.updatedAt = new Date();
         }
@@ -199,7 +200,9 @@ export class NoteUpdateService implements OnApplicationShutdown {
                 await this.notesRepository.update({ id: note.id }, values);
             }
 
-            return await this.notesRepository.findOneBy({ id: note.id });
+            const updatedNote = await this.notesRepository.findOneBy({ id: note.id });
+            if (updatedNote) return updatedNote;
+            throw new ApiError({ message: 'Updated note has gone.', id: '6dffaa9b-f578-45ac-9755-9e64290b4528', code: 'NOTE_UPDATE_GONE' }, { noteId: note.id });
         } catch (e) {
             console.error(e); throw e;
         }

diff --git a/packages/backend/src/server/api/endpoints/notes/update.ts b/packages/backend/src/server/api/endpoints/notes/update.ts
@@ -44,6 +44,11 @@ export const meta = {
 			code: 'CANNOT_CREATE_ALREADY_EXPIRED_POLL',
 			id: '04da457d-b083-4055-9082-955525eda5a5',
 		},
+        updatedNoteGone: {
+            message: 'Updated note has gone.',
+            code: 'NOTE_UPDATE_GONE',
+            id: '6dffaa9b-f578-45ac-9755-9e64290b4528',
+        },
     },
 } as const;
 
@@ -150,9 +155,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
             };
 
             const updatedNote = await this.noteUpdateService.update(me, data, note, false);
-
+            
             return {
-                updatedNote: await this.noteEntityService.pack(updatedNote!, me),
+                updatedNote: await this.noteEntityService.pack(updatedNote, me),
             };
         });
     }

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
@@ -733,7 +733,7 @@ export function post(props: Record<string, any> = {}): Promise<void> {
 		//       Vueが渡されたコンポーネントに内部的に__propsというプロパティを生やす影響で、
 		//       複数のpost formを開いたときに場合によってはエラーになる
 		//       もちろん複数のpost formを開けること自体Misskeyサイドのバグなのだが
-		let dispose;
+		let dispose: () => void;
 		popup(MkPostFormDialog, props, {
 			closed: () => {
 				resolve();

diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
@@ -217,7 +217,9 @@ export function getNoteMenu(props: {
 			text: i18n.ts.editConfirm,
 		}).then(({ canceled }) => {
 			if (canceled) return;
-			os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, editMode: true });
+			os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel, editMode: true })
+			.then(() => { location.reload(); });
+			// 노트 수정 사항이 바로 반영되지 않는 문제 수정을 위해 일단 넣었습니다. 수정이 되면 강제 새로고침합니다.
 		});
 	}