feat: show files of noteEdit

packages/backend/src/models/repositories/note-edit.ts

@@ -2,6 +2,9 @@ import { db } from "@/db/postgre.js";
 import { NoteEdit } from "@/models/entities/note-edit.js";
 import { awaitAll } from "@/prelude/await-all.js";
 import type { Packed } from "@/misc/schema.js";
+import {
+	DriveFiles,
+} from "../index.js";
 
 export const NoteEditRepository = db.getRepository(NoteEdit).extend({
 	async pack(
@@ -14,6 +17,7 @@ export const NoteEditRepository = db.getRepository(NoteEdit).extend({
 			text: noteEdit.text,
 			cw: noteEdit.cw,
 			fileIds: noteEdit.fileIds,
+			files: DriveFiles.packMany(noteEdit.fileIds),
 		})
 
 		return packed;

packages/backend/src/models/schema/note-edit.ts

@@ -39,11 +39,22 @@ export const packedNoteEdit = {
 		fileIds: {
 			type: "array",
 			optional: true,
-			nullable: true,
+			nullable: false,
 			items: {
 				type: "string",
 				format: "id",
 			},
 		},
+		files: {
+			type: "array",
+			optional: true,
+			nullable: false,
+			items: {
+				type: "object",
+				optional: false,
+				nullable: false,
+				ref: "DriveFile",
+			},
+		},
 	},
 } as const;

packages/client/src/pages/note-history.vue

@@ -87,18 +87,28 @@ onMounted(() => {
 });
 
 function convertNoteEditsToNotes(noteEdits: NoteEdit[]) {
-	return [note.value].concat(
+	const now: NoteEdit = {
-		noteEdits.map(e => convertNoteEditToNote(e))
+		id: note.value.id,
-	);
+		noteId: note.value.id,
-}
+		updatedAt: note.value.createdAt,
+		text: note.value.text,
+		cw: note.value.cw,
+		files: note.value.files,
+		fileIds: note.value.fileIds,
+	};
 
-function convertNoteEditToNote(noteEdit: NoteEdit): Note {
+	return [now].concat(noteEdits).map((noteEdit: NoteEdit, index, arr): Note => {
 		return Object.assign({}, note.value, {
 			id: crypto.randomUUID(), // Don't use noteId
-		createdAt: noteEdit.updatedAt,
+			// Conversion from updatedAt to createdAt
+			// The createdAt of a edition's content is actually the updatedAt of the previous one.
+			createdAt: arr[(index + 1) % arr.length].updatedAt,
 			text: noteEdit.text,
 			cw: noteEdit.cw,
 			_shouldInsertAd_: false,
+			files: noteEdit.files,
+			fileIds: noteEdit.fileIds,
+		});
 	});
 }
 </script>

packages/firefish-js/src/entities.ts

@@ -182,7 +182,8 @@ export type NoteEdit = {
 	text: string | null;
 	cw: string | null;
 	updatedAt: string;
-	fileIds: DriveFile["id"];
+	fileIds: DriveFile["id"][];
+	files: DriveFile[];
 }
 
 export type NoteReaction = {