update backend api architecture

.gitignore

@@ -32,3 +32,4 @@ tmp
 test.*
 *.png
 !*/schemas/*
+todo

back/abl/Room-abl.ts

@@ -6,6 +6,8 @@ import { getLastMsgData, getRoomOwner } from "../db/Room-db";
 import emailManager from "../mails/EmailManager";
 import MailBuilder from "../mails/utils/mailBuilder";
 import { getAddresses } from "../db/utils/mail";
+import { getMembers, getMessages, getRooms } from "../db/api-db";
+import logger from "../system/Logger";
 
 function rmUserFromAddrs(addresses: { email: string }[], user: string) {
     let index = addresses.findIndex((a) => a.email == user);
@@ -58,4 +60,39 @@ export default class Room {
             res.status(statusCode.FORBIDDEN).send({ error: "Cannot add a new message in a room or a channel." });
         }
     }
+
+    static async getAll(body, res: Response) {
+        const { mailboxId, offset, limit } = body;
+        getRooms(mailboxId)
+            .then((rooms) => {
+                res.status(statusCode.OK).json(rooms);
+            })
+            .catch((err) => {
+                logger.err(err);
+                res.status(statusCode.INTERNAL_SERVER_ERROR);
+            });
+    }
+
+    static async getMessages(body, res: Response) {
+        const { roomId } = body;
+        getMessages(roomId)
+            .then((messages) => {
+                res.status(statusCode.OK).json(messages);
+            })
+            .catch((err) => {
+                logger.err(err);
+                res.status(statusCode.INTERNAL_SERVER_ERROR);
+            });
+    }
+
+    static async getMembers(body, res) {
+        const { roomId } = body;
+        getMembers(roomId).then((addresses) => {
+            res.status(statusCode.OK).json(addresses);
+        }).catch((err) => {
+            logger.err(err)
+            res.status(statusCode.INTERNAL_SERVER_ERROR);
+        });
+    }
+    
 }

back/abl/members.ts

@@ -1,13 +0,0 @@
-import statusCode from "../utils/statusCodes";
-import { getMembers } from "../db/api-db";
-import logger from "../system/Logger";
-
-export async function members(body, res) {
-    const { roomId } = body;
-    getMembers(roomId).then((addresses) => {
-        res.status(statusCode.OK).json(addresses);
-    }).catch((err) => {
-        logger.err(err)
-        res.status(statusCode.INTERNAL_SERVER_ERROR);
-    });
-}

back/abl/messages.ts

@@ -1,16 +0,0 @@
-import statusCode from "../utils/statusCodes";
-import { getMessages } from "../db/api-db";
-import logger from "../system/Logger";
-import { Response } from "express";
-
-export async function messages(body, res: Response) {
-    const { roomId } = body;
-    getMessages(roomId)
-        .then((messages) => {
-            res.status(statusCode.OK).json(messages);
-        })
-        .catch((err) => {
-            logger.err(err);
-            res.status(statusCode.INTERNAL_SERVER_ERROR);
-        });
-}

back/abl/rooms.ts

@@ -1,14 +0,0 @@
-import statusCode from "../utils/statusCodes";
-import { getRooms } from "../db/api-db";
-import logger from "../system/Logger";
-import { Response } from "express";
-
-export async function rooms(body, res: Response) {
-    const { mailboxId, offset, limit } = body;
-    getRooms(mailboxId).then((rooms) => {
-        res.status(statusCode.OK).json(rooms);
-    }).catch((err) => {
-        logger.err(err)
-        res.status(statusCode.INTERNAL_SERVER_ERROR);
-    });
-}

back/mails/imap/Mailbox.ts

@@ -1,4 +1,4 @@
-import Imap, { ImapMessageAttributes, Box } from "imap";
+import Imap, { Box } from "imap";
 import { getMailbox, getMailboxModseq, updateMailbox, updateMailboxModseq } from "../../db/imap/imap-db";
 import { Attrs, AttrsWithEnvelope } from "../../interfaces/mail/attrs.interface";
 import logger from "../../system/Logger";
@@ -62,7 +62,7 @@ export default class Mailbox {
 
     async updateModseq(newModseq: number) {
         updateMailboxModseq(this.id, newModseq).then(() => {
-            this.box.highestmodseq = newModseq;
+            this.box.highestmodseq = newModseq.toString();
         });
     }
 
@@ -76,7 +76,7 @@ export default class Mailbox {
 
         // sync flags
         const lastModseq = (await getMailboxModseq(this.id))[0]?.modseq ?? 0;
-        if (box.highestmodseq > lastModseq) {
+        if (parseInt(box.highestmodseq) > lastModseq) {
             const fetchStream = this.imap.fetch("1:*", { bodies: "", modifiers: { changedsince: lastModseq } });
             fetchStream.on("message", (message) => {
                 message.once("attributes", (attrs) => {
@@ -93,7 +93,7 @@ export default class Mailbox {
         } else {
             logger.log("Flags already up to date")
         }
-        this.updateModseq(box.highestmodseq);
+        this.updateModseq(parseInt(box.highestmodseq));
     }
 
     async syncMail(savedUid: number, currentUid: number) {

back/routes/mail.ts

@@ -1,10 +1,7 @@
 import express from "express";
 const router = express.Router();
 
-import { rooms } from "../abl/rooms";
 import Message from "../abl/Message-abl";
-import { messages } from "../abl/messages";
-import { members } from "../abl/members";
 import Account from "../abl/Account-abl";
 import validator from "../validator/validator";
 import Room from "../abl/Room-abl";
@@ -21,21 +18,21 @@ router.get("/accounts", async (req, res) => {
  */
 router.get("/:mailboxId/rooms", async (req, res) => {
     // todo offet limit
-    await validator.validate("getRooms", req.params, res, rooms);
+    await validator.validate("getRooms", req.params, res, Room.getAll);
 });
 
 /**
  * Return all messages from a room
  */
 router.get("/:roomId/messages", async (req, res) => {
-    await validator.validate("getMessages", req.params, res, messages);
+    await validator.validate("getMessages", req.params, res, Room.getMessages);
 });
 
 /**
  * Return all members from a room
  */
 router.get("/:roomId/members", async (req, res) => {
-    await validator.validate("getMembers", req.params, res, members);
+    await validator.validate("getMembers", req.params, res, Room.getMembers);
 });
 
 /**

front/src/components/structure/message/Options.vue

@@ -69,6 +69,7 @@ const setFlag = (flag: string, loadingState: Ref<boolean>) => {
                     class="option"
                     :loading="flaggedLoading"
                     :classes="hasFlag(props.msg?.flags, '\\Flagged') ? 'warn' : ''"
+                    v-tooltip="hasFlag(props.msg?.flags, '\\Flagged') ? 'Unflag' : 'Flag'"
                 />
                 <!-- 
                 <SvgLoader
@@ -93,8 +94,6 @@ const setFlag = (flag: string, loadingState: Ref<boolean>) => {
             <SvgLoader svg="reply-all-line" class="option" />
         </div>
         <div>reply</div>
-        <div>delete from all</div>
-        <div>delete from remote</div>
         <div>transfer</div>
         <div>see source</div>
         <div>{{ props.msg?.flags }}</div>