Merge branch 'develop' of codeberg.org:calckey/calckey into develop

packages/backend/src/db/meilisearch.ts

@@ -262,5 +262,29 @@ export default hasConfig
 					indexed_count: stats.indexes["posts"].numberOfDocuments,
 				};
 			},
+			deleteNotes: async (note: Note | Note[] | string | string[]) => {
+				if (note instanceof Note) {
+					note = [note];
+				}
+				if (typeof note === "string") {
+					note = [note];
+				}
+
+				let deletionBatch = note.map((n) => {
+					if(n instanceof Note) {
+						return n.id;
+					}
+
+					if(n.length > 0) return n;
+
+					logger.error(`Failed to delete note from Meilisearch, invalid post ID: ${JSON.stringify(n)}`)
+
+					throw new Error(`Invalid note ID passed to meilisearch deleteNote: ${JSON.stringify(n)}`)
+				}).filter((el) => el !== null);
+
+				await posts.deleteDocuments(deletionBatch as string[]).then(() => {
+					logger.info(`submitted ${deletionBatch.length} large batch for deletion`)
+				});
+			},
 	  }
 	: null;

packages/backend/src/queue/processors/db/delete-account.ts

@@ -7,6 +7,7 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import { MoreThan } from "typeorm";
 import { deleteFileSync } from "@/services/drive/delete-file.js";
 import { sendEmail } from "@/services/send-email.js";
+import meilisearch from "@/db/meilisearch.js";
 
 const logger = queueLogger.createSubLogger("delete-account");
 
@@ -43,6 +44,9 @@ export async function deleteAccount(
 			cursor = notes[notes.length - 1].id;
 
 			await Notes.delete(notes.map((note) => note.id));
+			if (meilisearch) {
+				await meilisearch.deleteNotes(notes);
+			}
 		}
 
 		logger.succ("All of notes deleted");

packages/backend/src/services/note/delete.ts

@@ -21,6 +21,7 @@ import {
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { registerOrFetchInstanceDoc } from "../register-or-fetch-instance-doc.js";
 import { deliverToRelays } from "../relay.js";
+import meilisearch from "@/db/meilisearch.js";
 
 /**
  * 投稿を削除します。
@@ -119,6 +120,10 @@ export default async function (
 		id: note.id,
 		userId: user.id,
 	});
+
+	if(meilisearch) {
+		await meilisearch.deleteNotes(note.id);
+	}
 }
 
 async function findCascadingNotes(note: Note) {