Merge branch 'fix/10868' into 'develop'

fix: #10868 incorrect text inserted to note_edit

Co-authored-by: Lhcfl <Lhcfl@outlook.com>

Closes #10868

See merge request firefish/firefish!10712

packages/backend/src/models/entities/note.ts

@@ -296,7 +296,7 @@ export class Note {
 		nullable: true,
 		comment: "The updated date of the Note.",
 	})
-	public updatedAt: Date;
+	public updatedAt: Date | null;
 	//#endregion
 
 	constructor(data: Partial<Note>) {

packages/backend/src/server/api/endpoints/notes/edit.ts

@@ -606,13 +606,13 @@ export default define(meta, paramDef, async (ps, user) => {
 		update.updatedAt = new Date();
 		await Notes.update(note.id, update);
 
-		// Add NoteEdit history
+		// Add NoteEdit history for the previous one
 		await NoteEdits.insert({
 			id: genId(),
 			noteId: note.id,
-			text: ps.text || undefined,
-			cw: ps.cw,
-			fileIds: ps.fileIds,
+			text: note.text || undefined,
+			cw: note.cw,
+			fileIds: note.fileIds,
 			updatedAt: new Date(),
 		});