Merge pull request #21 from nekoplanet/fix-note-edit-2

노트 수정 기능 관련
nekoplanet · Aug 3, 2024 · 161f15d · 161f15d
2 parents 76252a0 + d9133ab
commit 161f15d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/packages/backend/src/core/NoteUpdateService.ts b/packages/backend/src/core/NoteUpdateService.ts
@@ -97,7 +97,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
             const choiceTokens = data.poll && data.poll.choices
                 ? concat(data.poll.choices.map((choice: string) => mfm.parse(choice)))
                 : [];
-            
+
             const combinedTokens = tokens.concat(cwTokens).concat(choiceTokens);
 
             tags = data.apHashtags ?? extractHashtags(combinedTokens);
@@ -124,6 +124,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
         if (data.updatedAt === null || data.updatedAt === undefined)
             data.updatedAt = new Date();
         const updatedAtHistory = note.updatedAtHistory ?? [];
+        const noteEditHistory = note.noteEditHistory ?? [];
 
         const values = new MiNote({
             updatedAt: data.updatedAt,
@@ -135,7 +136,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
             emojis: emojis,
             attachedFileTypes: data.files ? data.files.map(file => file.type) : [],
             updatedAtHistory: [...updatedAtHistory, data.updatedAt],
-            noteEditHistory: [...note.noteEditHistory, ((note.cw ? note.cw + '\n' : '') + note.text as string)],
+            noteEditHistory: [...noteEditHistory, ((note.cw ? note.cw + '\n' : '') + note.text as string)],
         });
 
         try {
@@ -181,7 +182,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
                         });
 
                         await transactionalEntitymanager.insert(MiPoll, poll);
-                    }                    
+                    }
                 });
             } else if (note.hasPoll && !values.hasPoll) {
                 // start transaction
@@ -289,4 +290,4 @@ export class NoteUpdateService implements OnApplicationShutdown {
 	public onApplicationShutdown(signal?: string | undefined): void {
 		this.dispose();
 	}
-}
+}
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
@@ -153,6 +153,7 @@ const props = withDefaults(defineProps<{
 	autofocus?: boolean;
 	freezeAfterPosted?: boolean;
 	mock?: boolean;
+	editMode?: boolean;
 }>(), {
 	initialVisibleUsers: () => [],
 	autofocus: true,
@@ -773,6 +774,7 @@ async function post(ev?: MouseEvent) {
 		visibility: visibility.value,
 		visibleUserIds: visibility.value === 'specified' ? visibleUsers.value.map(u => u.id) : undefined,
 		reactionAcceptance: reactionAcceptance.value,
+		noteId: props.editMode ? props.initialNote?.id : undefined,
 	};
 
 	if (withHashtags.value && hashtags.value && hashtags.value.trim() !== '') {
@@ -809,7 +811,8 @@ async function post(ev?: MouseEvent) {
 	}
 
 	posting.value = true;
-	misskeyApi('notes/create', postData, token).then(() => {
+	const endpoint = props.editMode ? 'notes/update' : 'notes/create';
+	misskeyApi(endpoint, postData, token).then(() => {
 		if (props.freezeAfterPosted) {
 			posted.value = true;
 		} else {

diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -32,6 +32,7 @@ const props = withDefaults(defineProps<{
 	instant?: boolean;
 	fixed?: boolean;
 	autofocus?: boolean;
+	editMode?: boolean;
 }>(), {
 	initialLocalOnly: undefined,
 });

diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
@@ -218,20 +218,7 @@ export function getNoteMenu(props: {
 			text: i18n.ts.editConfirm,
 		}).then(({canceled}) => {
 			if (canceled) return;
-
-			misskeyApi('notes/update', {
-				noteId: appearNote.id,
-				text: (appearNote.text as string),
-				fileIds: appearNote.fileIds,
-				//mediaIds: appearNote.mediaIds,
-				poll: (appearNote.poll ? {
-					expiresAt: (appearNote.poll.expiresAt ? parseInt(appearNote.poll.expiresAt) : undefined),
-					expiredAfter: undefined,
-					multiple: appearNote.poll.multiple,
-					choices: appearNote.poll.choices.map((choice) => { return choice.text }),
-				} : undefined),//(appearNote.poll),
-				cw: (appearNote.cw ?? null),
-			});
+			os.post({ initialNote: appearNote, renote: appearNote.renote, reply: appearNote.reply, channel: appearNote.channel , editMode: true });
 		})
 	}