back/db/imap/storeMessage-db.ts

@@ -1,24 +1,17 @@
 import { transformEmojis } from "../../utils/string";
 import { execQuery, execQueryAsync, execQueryAsyncWithId } from "../db";
 
-export async function registerMessage(timestamp: string, rfc822size: number, messageID: string) {
+export async function registerMessage(timestamp, rfc822size, messageId) {
     const query = `
         INSERT INTO message 
             (idate, messageID, rfc822size) VALUES (?, ?, ?)
             ON DUPLICATE KEY UPDATE message_id = LAST_INSERT_ID(message_id)
         `;
-    const values = [timestamp, messageID, rfc822size];
+    const values = [timestamp, messageId, rfc822size];
     return await execQueryAsyncWithId(query, values);
 }
 
-export function registerMailbox_message(
+export function registerMailbox_message(mailboxId, uid, messageId, modseq, seen, deleted) {
-    mailboxId: number,
-    uid: number,
-    messageId: number,
-    modseq: number,
-    seen: boolean,
-    deleted: boolean,
-) {
     const query = `
         INSERT IGNORE INTO mailbox_message 
             (mailbox_id, uid, message_id, modseq, seen, deleted) VALUES (?, ?, ?, ?, ?, ?)
@@ -27,13 +20,7 @@ export function registerMailbox_message(
     execQuery(query, values);
 }
 
-export function registerFlag(messageId: number, flagId: number) {
+export function registerBodypart(messageId, part, bodypartId, bytes, nbLines) {
-    const query = `INSERT IGNORE INTO flag_name (message_id, flag_id) VALUES (?, ?)`;
-    const values = [messageId, flagId];
-    execQuery(query, values);
-}
-
-export function registerBodypart(messageId: number, part: string, bodypartId: number, bytes: number, nbLines: null) {
     const query = `
         INSERT IGNORE INTO part_number
             (message_id, part, bodypart_id, bytes, nb_lines) VALUES (?, ?, ?, ?, ?)
@@ -49,13 +36,7 @@ export async function saveBodypart(bytes, hash, text, data) {
     return await execQueryAsyncWithId(query, values);
 }
 
-export async function saveHeader_fields(
+export async function saveHeader_fields(messageId, fieldId, bodypartId, part, value) {
-    messageId: number,
-    fieldId: number,
-    bodypartId: number,
-    part: string,
-    value: string,
-) {
     value = transformEmojis(value);
     const query = `
         INSERT IGNORE INTO header_field
@@ -65,7 +46,7 @@ export async function saveHeader_fields(
     return await execQueryAsync(query, values);
 }
 
-export async function saveAddress_fields(messageId: number, fieldId: number, addressId: number, number: number) {
+export async function saveAddress_fields(messageId, fieldId, addressId, number) {
     const query = `
         INSERT IGNORE INTO address_field
             (message_id , field_id, address_id, number) VALUES (?, ?, ?, ?)
@@ -74,7 +55,7 @@ export async function saveAddress_fields(messageId: number, fieldId: number, add
     return await execQueryAsync(query, values);
 }
 
-export function saveSource(messageId: number, content: string) {
+export function saveSource(messageId, content) {
     content = transformEmojis(content);
     const query = `
         INSERT INTO source (message_id, content) VALUES (?, ?)

back/db/message/updateMessage-db.ts

@@ -1,30 +0,0 @@
-import { execQuery, execQueryAsync, execQueryAsyncWithId } from "../db";
-
-export async function getFlags(uid: number): Promise<{flag_id: number, flag_name: string}[]> {
-    const query = `
-        SELECT * FROM flag_name
-        INNER JOIN flag ON flag.flag_id = flag_name.flag_id
-        INNER JOIN mailbox_message ON mailbox_message.message_id = flag.message_id
-        WHERE mailbox_message.uid = ?
-    `;
-    const values = [uid];
-    return await execQueryAsync(query, values);
-}
-
-export async function deleteFlag(messageId: number, flagId: number) {
-    const query = `DELETE FROM flag WHERE message_id = ? AND flag_id = ?`;
-    const values = [messageId, flagId];
-    execQuery(query, values);
-}
-
-export async function updateMailboxSeen(messageId: number, isSeen: boolean) {
-    const query = `UPDATE mailbox_message SET seen = ? WHERE message_id = ?`;
-    const values = [messageId, isSeen];
-    return await execQueryAsync(query, values);
-}
-
-export async function updateMailboxDeleted(messageId: number, isDeleted: boolean) {
-    const query = `UPDATE mailbox_message SET deleted = ? WHERE message_id = ?`;
-    const values = [messageId, isDeleted];
-    return await execQueryAsync(query, values);
-}

back/db/saveMessage-db.ts

@@ -1,8 +1,8 @@
-import { RoomType } from "../../mails/message/saveMessage";
+import { RoomType } from "../mails/saveMessage";
-import { hasSameElements } from "../../utils/array";
+import { hasSameElements } from "../utils/array";
-import { transformEmojis } from "../../utils/string";
+import { transformEmojis } from "../utils/string";
-import { execQueryAsync, execQueryAsyncWithId, execQuery } from "../db";
+import { execQueryAsync, execQueryAsyncWithId, execQuery } from "./db";
-import { queryFromId, queryToId, queryCcId } from "../utils/addressQueries";
+import { queryFromId, queryToId, queryCcId } from "./utils/addressQueries";
 
 export async function getAllMembers(messageId: number) {
     const query = `

back/db/structureV2.sql

@@ -161,21 +161,3 @@ CREATE TABLE app_room_member (
   FOREIGN KEY (room_id) REFERENCES app_room(room_id) ON DELETE CASCADE,
   FOREIGN KEY (member_id) REFERENCES address(address_id)
 );
-
--- 15
-create table flag_name (
-  flag_id          INT NOT NULL,
-  flag_name        VARCHAR(255) NOT NULL,
-  PRIMARY KEY (flag_id),
-  UNIQUE KEY (flag_name)
-);
-
--- 16
-create table flag (
-  message_id        INT NOT NULL,
-  flag_id           INT NOT NULL,
-  UNIQUE KEY (message_id, flag_id),
-  FOREIGN KEY (message_id) REFERENCES message(message_id) ON DELETE CASCADE,
-  FOREIGN KEY (message_id) REFERENCES message(message_id) ON DELETE CASCADE,
-  FOREIGN KEY (flag_id) REFERENCES flag_name(flag_id) ON DELETE CASCADE
-);

back/db/utils/mail.ts

@@ -16,18 +16,6 @@ export async function getFieldId(field: string): Promise<number> {
     return await execQueryAsyncWithId(query, values);
 }
 
-export async function getFlagId(flag: string): Promise<number> {
-    const query = `INSERT INTO flag_name (flag_name) VALUES (?) ON DUPLICATE KEY UPDATE flag_id=LAST_INSERT_ID(flag_id)`;
-    const values = [flag];
-    return await execQueryAsyncWithId(query, values);
-}
-
-export async function getMessageIdOnUid(uid: number): Promise<{message_id: number}[]> {
-    const query = `SELECT message_id FROM mailbox_message WHERE uid = ?`;
-    const values = [uid];
-    return await execQueryAsync(query, values);
-}
-
 export async function findRoomByOwner(ownerId: number): Promise<{ room_id: number }[]> {
     const query = `SELECT room_id FROM app_room WHERE owner_id = ?`;
     const values = [ownerId];

back/mails/imap/Mailbox.ts

@@ -2,15 +2,8 @@ import Imap, { ImapMessageAttributes, Box } from "imap";
 import { getMailbox, updateMailbox } from "../../db/imap/imap-db";
 import { Attrs, AttrsWithEnvelope } from "../../interfaces/mail/attrs.interface";
 import logger from "../../system/Logger";
-import RegisterMessageInApp from "../message/saveMessage";
+import RegisterMessageInApp from "../saveMessage";
-import { saveMessage } from "../message/storeMessage";
+import { saveMessage } from "../storeMessage";
-import updateMessage from "../message/updateMessage";
-
-export interface ImapInfo {
-    uid: number;
-    modseq: string;
-    flags: string[];
-}
 
 export default class Mailbox {
     imap: Imap;
@@ -45,7 +38,6 @@ export default class Mailbox {
                 logger.log("Already up to date")
             }
 
-            // wait for new mails
             this.imap.on("mail", (numNewMsgs: number) => {
                 if (!this.syncing) {
                     // if not syncing restart a sync
@@ -55,11 +47,6 @@ export default class Mailbox {
                     this.msgToSync += numNewMsgs;
                 }
             });
-
-            this.imap.on("update", (seqno: number, info: ImapInfo) => {
-                const updateMsg = new updateMessage(info.uid, info.flags);
-                updateMsg.updateFlags();
-            });
         });
     }
 

back/mails/message/updateMessage.ts

@@ -1,43 +0,0 @@
-import { registerFlag } from "../../db/message/storeMessage-db";
-import { deleteFlag, getFlags, updateMailboxDeleted, updateMailboxSeen } from "../../db/message/updateMessage-db";
-import { getFlagId, getMessageIdOnUid } from "../../db/utils/mail";
-
-export default class updateMessage {
-    uid: number;
-    flags: string[];
-
-    constructor(_uid: number, _flags: string[]) {
-        this.uid = _uid;
-        this.flags = _flags;
-    }
-
-    async updateFlags() {
-        const messageId = (await getMessageIdOnUid(this.uid))[0].message_id;
-        const currentFlags = await getFlags(this.uid);
-
-        const flagsToAdd = this.flags.filter((flag) => !currentFlags.find((f) => flag == f.flag_name));
-        const flagToRm = currentFlags.filter((f) => !this.flags.includes(f.flag_name));
-
-        flagsToAdd.forEach(async (flag) => {
-            const flagId = await getFlagId(flag);
-            registerFlag(messageId, flagId);
-        });
-
-        flagToRm.forEach(async (flag) => {
-            deleteFlag(messageId, flag.flag_id);
-        });
-
-        // todo update seen counter rooms
-        if (flagsToAdd.includes("\\Seen")) {
-            updateMailboxSeen(messageId, true);
-        } else if (flagToRm.find((f) => f.flag_name == "\\Seen")) {
-            updateMailboxSeen(messageId, false);
-        }
-
-        if (flagsToAdd.includes("\\Deleted")) {
-            updateMailboxDeleted(messageId, true);
-        } else if (flagToRm.find((f) => f.flag_name == "\\Deleted")) {
-            updateMailboxDeleted(messageId, false);
-        }
-    }
-}

back/mails/saveMessage.ts

@@ -10,12 +10,12 @@ import {
     getThreadInfo,
     incrementNotSeenRoom,
     getThreadInfoOnId,
-} from "../../db/message/saveMessage-db";
+} from "../db/saveMessage-db";
 
-import { findRoomByOwner, getAddresseId, getUserIdOfMailbox } from "../../db/utils/mail";
+import { findRoomByOwner, getAddresseId, getUserIdOfMailbox } from "../db/utils/mail";
-import { nbMembers } from "../utils/envelopeUtils";
+import { nbMembers } from "./utils/envelopeUtils";
-import logger from "../../system/Logger";
+import logger from "../system/Logger";
-import { Attrs, Envelope, User } from "../../interfaces/mail/attrs.interface";
+import { Attrs, Envelope, User } from "../interfaces/mail/attrs.interface";
 
 /**
  * take object address and join mailbox and host to return mailbox@host
@@ -50,7 +50,7 @@ export default class RegisterMessageInApp {
         this.envelope = this.attrs.envelope;
         this.messageID = this.envelope?.messageId;
         this.boxId = _boxId;
-        this.isSeen = this.attrs.flags.includes("\\Seen");
+        this.isSeen = this.attrs.flags.includes("\\Seen") ? true : false;
         this.ownerId = -1;
         this.userId = -1;
         this.inReplyTo = "";

back/mails/storeMessage.ts

@@ -1,5 +1,5 @@
-import { getAddresseId, getFlagId } from "../../db/utils/mail";
+import { getAddresseId } from "../db/utils/mail";
-import { EmailAddress, ParsedMail, simpleParser } from "mailparser";
+import {simpleParser} from "mailparser";
 import moment from "moment";
 import Imap from "imap";
 import {
@@ -10,12 +10,11 @@ import {
     registerBodypart,
     saveBodypart,
     saveSource,
-    registerFlag,
+} from "../db/imap/storeMessage-db";
-} from "../../db/message/storeMessage-db";
 
-import { getFieldId } from "../../db/utils/mail";
+import { getFieldId } from "../db/utils/mail";
-import logger from "../../system/Logger";
+import logger from "../system/Logger";
-import { AttrsWithEnvelope } from "../../interfaces/mail/attrs.interface";
+import { AttrsWithEnvelope } from "../interfaces/mail/attrs.interface";
 
 export function saveMessage(attrs: AttrsWithEnvelope, mailboxId: number, imap: Imap): Promise<number> {
     const envelope = attrs.envelope;
@@ -26,13 +25,10 @@ export function saveMessage(attrs: AttrsWithEnvelope, mailboxId: number, imap: I
     return new Promise((resolve, reject) => {
         registerMessage(ts, rfc822size, messageID)
             .then((messageId) => {
-                const isSeen: boolean = attrs.flags.includes("\\Seen");
+                const isSeen = attrs.flags.includes("\\Seen") ? 1 : 0; // todo verify
-                const deleted: boolean = attrs.flags.includes("\\Deleted");
+                const deleted = attrs.flags.includes("\\Deleted") ? 1 : 0; // todo verify
 
-                registerMailbox_message(mailboxId, attrs.uid, messageId, attrs?.modseq || 0, isSeen, deleted);
+                registerMailbox_message(mailboxId, attrs.uid, messageId, attrs?.modseq, isSeen, deleted);
-                registerFlags(messageId, attrs.flags);
-
-                // fetch message to save everything
                 const f = imap.fetch(attrs.uid, { bodies: "" });
                 let buffer = "";
 
@@ -73,24 +69,14 @@ export function saveMessage(attrs: AttrsWithEnvelope, mailboxId: number, imap: I
     });
 }
 
-function registerFlags(messageId: number, flags: string[]) {
+async function saveFromParsedData(parsed, messageId) {
-    flags.forEach((flag) => {
-        getFlagId(flag).then((flagId) => {
-            registerFlag(messageId, flagId);
-        }).catch((err: Error) => {
-            logger.err(err);
-        });
-    });
-}
-
-async function saveFromParsedData(parsed: ParsedMail, messageId: number) {
     const promises: Promise<any>[] = [];
     Object.keys(parsed).forEach((key) => {
         if (["from", "to", "cc", "bcc", "replyTo"].includes(key)) {
             promises.push(
                 // save address field
                 getFieldId(key).then((fieldId) => {
-                    parsed[key].value.forEach((addr: EmailAddress, nb: number) => {
+                    parsed[key].value.forEach((addr, nb) => {
                         getAddresseId(addr.address, addr.name).then(async (addressId) => {
                             await saveAddress_fields(messageId, fieldId, addressId, nb);
                         });
@@ -134,6 +120,7 @@ async function saveFromParsedData(parsed: ParsedMail, messageId: number) {
     // todo when transfered
 }
 
+
 if (process.env["NODE_DEV"] == "TEST") {
     module.exports = {
         saveFromParsedData,

back/test/mail/saveMessage-test.ts

@@ -10,7 +10,7 @@ import { generateAttrs, generateUsers, randomInt } from "../test-utils/test-attr
 import { jest, describe, it, expect } from "@jest/globals";
 import { mocked } from "jest-mock";
 
-import registerMessageInApp, { RoomType } from "../../mails/message/saveMessage";
+import registerMessageInApp, { RoomType } from "../../mails/saveMessage";
 
 const db = new saveMessageDatabase(generateUsers(5));
 const ownUser = db.users[0];
@@ -52,7 +52,7 @@ import {
     getThreadInfo,
     getThreadInfoOnId,
     incrementNotSeenRoom,
-} from "../../db/message/saveMessage-db";
+} from "../../db/saveMessage-db";
 import { AttrsWithEnvelopeTest, createReplyWithSameMembers } from "../test-utils/test-messageUtils";
 // todo esbuild
 // new message from us

back/test/test-utils/db/test-saveMessage.ts

@@ -1,5 +1,5 @@
 import { AttrsWithEnvelope, User } from "../../../interfaces/mail/attrs.interface";
-import { RoomType } from "../../../mails/message/saveMessage";
+import { RoomType } from "../../../mails/saveMessage";
 import { getMembers } from "../../../mails/utils/envelopeUtils";
 import { hasSameElements } from "../../../utils/array";
 import { generateUsers, UserTest } from "../test-attrsUtils";