Make NoteEdit entity match the database schema

3 files changed, 9 insertions, 10 deletions

diff --git a/packages/backend/src/models/NoteEdit.ts b/packages/backend/src/models/NoteEdit.ts
index 57b3c10095..449c974d52 100644
--- a/packages/backend/src/models/NoteEdit.ts
+++ b/packages/backend/src/models/NoteEdit.ts
@@ -29,11 +29,6 @@ export class NoteEdit {
 	@Column('text', {
 		nullable: true,
 	})
-	public oldText: string | null;
-
-	@Column('text', {
-		nullable: true,
-	})
 	public newText: string | null;
 
 	@Column('varchar', {
@@ -54,8 +49,14 @@ export class NoteEdit {
 	})
 	public updatedAt: Date;
 
+	@Column('text', {
+		nullable: true,
+	})
+	public oldText: string | null;
+
 	@Column('timestamp with time zone', {
 		comment: 'The old date from before the edit',
+		nullable: true,
 	})
-	public oldDate: Date;
+	public oldDate: Date | null;
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/versions.ts b/packages/backend/src/server/api/endpoints/notes/versions.ts
index b5ee42e67a..1c6f9838f5 100644
--- a/packages/backend/src/server/api/endpoints/notes/versions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/versions.ts
@@ -106,7 +106,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 			for (const edit of edits) {
 				editArray.push({
-					oldDate: edit.oldDate.toISOString(),
+					oldDate: (edit.oldDate ?? edit.updatedAt).toISOString(),
 					updatedAt: edit.updatedAt.toISOString(),
 					text: edit.oldText ?? edit.newText ?? null,
 				});
diff --git a/packages/frontend/src/utility/get-note-versions-menu.ts b/packages/frontend/src/utility/get-note-versions-menu.ts
index d9bfe7699c..aac0375640 100644
--- a/packages/frontend/src/utility/get-note-versions-menu.ts
+++ b/packages/frontend/src/utility/get-note-versions-menu.ts
@@ -45,11 +45,9 @@ export async function getNoteVersionsMenu(props: { note: Misskey.entities.Note }
 
 	await statePromise.then((versions) => {
 		for (const edit of versions) {
-			const _time = new Date(edit.oldDate).getTime();
-
 			menu.push({
 				icon: 'ph-pencil-simple ph-bold ph-lg',
-				text: _time ? dateTimeFormat.format(_time) : dateTimeFormat.format(new Date(edit.updatedAt)),
+				text: dateTimeFormat.format(new Date(edit.oldDate)),
 				action: () => openVersion(edit),
 			});
 		}