From 1c3f1e22765f5649092e0b90b2add0e62d665a41 Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Mon, 29 Sep 2025 02:00:17 -0700
Subject: [PATCH] feat: DeleteAllReadNonCin (#2824)

Closes #2822

Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2824
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
---
 src/controllers/api/inboxController.ts | 9 +++++----
 src/services/inboxService.ts           | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/controllers/api/inboxController.ts b/src/controllers/api/inboxController.ts
index 61911684..4f269794 100644
--- a/src/controllers/api/inboxController.ts
+++ b/src/controllers/api/inboxController.ts
@@ -4,6 +4,7 @@ import {
     createMessage,
     createNewEventMessages,
     deleteAllMessagesRead,
+    deleteAllMessagesReadNonCin,
     deleteMessageRead,
     getAllMessagesSorted,
     getMessage
@@ -31,11 +32,11 @@ export const inboxController: RequestHandler = async (req, res) => {
     if (deleteId) {
         if (deleteId === "DeleteAllRead") {
             await deleteAllMessagesRead(accountId);
-            res.status(200).end();
-            return;
+        } else if (deleteId === "DeleteAllReadNonCin") {
+            await deleteAllMessagesReadNonCin(accountId);
+        } else {
+            await deleteMessageRead(parseOid(deleteId as string));
         }
-
-        await deleteMessageRead(parseOid(deleteId as string));
         res.status(200).end();
     } else if (messageId) {
         const message = await getMessage(parseOid(messageId as string));
diff --git a/src/services/inboxService.ts b/src/services/inboxService.ts
index 38053c0d..c5d80fba 100644
--- a/src/services/inboxService.ts
+++ b/src/services/inboxService.ts
@@ -29,6 +29,10 @@ export const deleteAllMessagesRead = async (accountId: string): Promise<void> =>
     await Inbox.deleteMany({ ownerId: accountId, r: true });
 };
 
+export const deleteAllMessagesReadNonCin = async (accountId: string): Promise<void> => {
+    await Inbox.deleteMany({ ownerId: accountId, r: true, cinematic: null });
+};
+
 export const createNewEventMessages = async (req: Request): Promise<void> => {
     const account = await getAccountForRequest(req);
     const newEventMessages: IMessageCreationTemplate[] = [];