@social-mail/social-mail-web-server 1.5.455 → 1.7.2

package/dist/server/services/puppeteer/PuppeteerServer.js

@@ -1,269 +1,177 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose, inner;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-            if (async) inner = dispose;
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-};
-var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
-    return function (env) {
-        function fail(e) {
-            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-            env.hasError = true;
-        }
-        function next() {
-            while (env.stack.length) {
-                var rec = env.stack.pop();
-                try {
-                    var result = rec.dispose && rec.dispose.call(rec.value);
-                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-                }
-                catch (e) {
-                    fail(e);
-                }
-            }
-            if (env.hasError) throw env.error;
-        }
-        return next();
-    };
-})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-});
-/* eslint-disable no-console */
-import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import puppeteer from "puppeteer-core";
-import { globalEnv } from "../../../common/globalEnv.js";
-import HtmlSanitizer from "../dom/HtmlSanitizer.js";
-import { rmdir, writeFile } from "node:fs/promises";
-import { existsSync, mkdirSync } from "node:fs";
-import LockFile from "../../storage/LockFile.js";
-const options = [
-    '--disable-background-networking',
-    '--disable-background-timer-throttling',
-    '--disable-backgrounding-occluded-windows',
-    '--disable-breakpad',
-    '--disable-client-side-phishing-detection',
-    '--disable-component-update',
-    '--disable-default-apps',
-    '--disable-dev-shm-usage',
-    '--disable-domain-reliability',
-    '--disable-extensions',
-    '--disable-features=AudioServiceOutOfProcess',
-    '--disable-hang-monitor',
-    '--disable-ipc-flooding-protection',
-    '--disable-notifications',
-    '--disable-offer-store-unmasked-wallet-cards',
-    '--disable-popup-blocking',
-    '--disable-print-preview',
-    '--disable-prompt-on-repost',
-    '--disable-renderer-backgrounding',
-    '--disable-setuid-sandbox',
-    '--disable-speech-api',
-    '--disable-sync',
-    '--disk-cache-size=33554432',
-    // '--hide-scrollbars',
-    // '--ignore-gpu-blacklist',
-    // '--metrics-recording-only',
-    '--mute-audio',
-    '--no-default-browser-check',
-    '--no-first-run',
-    '--no-pings',
-    '--no-sandbox',
-    '--no-zygote',
-    '--password-store=basic',
-    '--use-mock-keychain',
-    // '--single-process',
-    '--autoplay-policy=no-user-gesture-required',
-    // '--enable-logging=stderr',
-    // '--v=1',
-    // '--disable-gpu',
-    //   '--window-size=400,800',
-];
-const buffer = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAAtJREFUGFdjYAACAAAFAAGq1chRAAAAAElFTkSuQmCC", "base64");
-let PuppeteerServer = class PuppeteerServer {
-    async htmlToPdf(content, { outputFile, deviceScaleFactor, pdfOptions }) {
-        try {
-            const env_1 = { stack: [], error: void 0, hasError: false };
-            try {
-                const page = __addDisposableResource(env_1, await this.newPage({ deviceScaleFactor }), true);
-                content = this.htmlSanitizer.prepareForPreview(content);
-                if (typeof pdfOptions === "string") {
-                    pdfOptions = JSON.parse(pdfOptions);
-                }
-                await page.pdf({ ...pdfOptions,
-                    path: outputFile });
-            }
-            catch (e_1) {
-                env_1.error = e_1;
-                env_1.hasError = true;
-            }
-            finally {
-                const result_1 = __disposeResources(env_1);
-                if (result_1)
-                    await result_1;
-            }
-        }
-        catch (error) {
-            await writeFile(outputFile, buffer);
-            if (/Node\shas\s0\swidth/i.test(error.message ?? error)) {
-                return;
-            }
-            console.log(content);
-            console.error(error);
-        }
-    }
-    async htmlToPng(content, { selector, outputFile, count, deviceScaleFactor }) {
-        try {
-            const env_2 = { stack: [], error: void 0, hasError: false };
-            try {
-                const page = __addDisposableResource(env_2, await this.newPage({ deviceScaleFactor }), true);
-                content = this.htmlSanitizer.prepareForPreview(content);
-                await page.setContent(content, {
-                    waitUntil: "networkidle2"
-                });
-                const element = await page.$(selector);
-                if (!element) {
-                    await writeFile(buffer, outputFile);
-                    return;
-                }
-                if (count) {
-                    await element.evaluate((e, c) => {
-                        const span = e.querySelector(`[data-social-mail-element="count"]`);
-                        if (span) {
-                            span.textContent = c;
-                        }
-                    }, count);
-                }
-                await element.scrollIntoView();
-                const clip = await element.boundingBox();
-                let top = Math.floor(clip.y);
-                if (top < clip.y) {
-                    clip.height++;
-                }
-                else {
-                    top -= 2;
-                    clip.height += 4;
-                }
-                clip.height = Math.ceil(clip.height);
-                clip.y = top;
-                await page.screenshot({
-                    path: outputFile,
-                    clip,
-                    omitBackground: true
-                });
-            }
-            catch (e_2) {
-                env_2.error = e_2;
-                env_2.hasError = true;
-            }
-            finally {
-                const result_2 = __disposeResources(env_2);
-                if (result_2)
-                    await result_2;
-            }
-        }
-        catch (error) {
-            await writeFile(outputFile, buffer);
-            if (/Node\shas\s0\swidth/i.test(error.message ?? error)) {
-                return;
-            }
-            console.log(content);
-            console.error(error);
-        }
-    }
-    async svgToPng(svgFile, outputFile) {
-        const env_3 = { stack: [], error: void 0, hasError: false };
-        try {
-            const page = __addDisposableResource(env_3, await this.newPage(), true);
-            await page.goto(svgFile, { waitUntil: "networkidle2" });
-            await page.screenshot({ path: outputFile });
-        }
-        catch (e_3) {
-            env_3.error = e_3;
-            env_3.hasError = true;
-        }
-        finally {
-            const result_3 = __disposeResources(env_3);
-            if (result_3)
-                await result_3;
-        }
-    }
-    async newPage({ deviceScaleFactor } = {}) {
-        const lf = await LockFile.lock("puppeteer-html-to-image");
-        const userDataDir = `/tmp/${Date.now().toString(36)}`;
-        if (!existsSync(userDataDir)) {
-            try {
-                mkdirSync(userDataDir, { recursive: true });
-            }
-            catch {
-                // ignore this...
-            }
-        }
-        const browser = await puppeteer.launch({
-            executablePath: globalEnv.puppeteerExecutablePath,
-            userDataDir,
-            args: options,
-            // dumpio: true,
-            // ignoreHTTPSErrors: true,
-            ignoreDefaultArgs: ["--mute-audio"]
-        });
-        const page = await browser.newPage();
-        await page.setViewport({
-            ...(page.viewport() ?? {}),
-            deviceScaleFactor
-        });
-        // we will kill browser in 15 seconds..
-        const ct = setTimeout(() => browser.close().catch(console.error), 15000);
-        page[Symbol.asyncDispose] = async () => {
-            clearTimeout(ct);
-            lf[Symbol.dispose]();
-            try {
-                await browser.close();
-            }
-            catch {
-                // ignore error.
-            }
-            try {
-                await rmdir(userDataDir);
-            }
-            catch {
-                // ignore
-            }
-        };
-        return page;
-    }
-};
-__decorate([
-    Inject,
-    __metadata("design:type", HtmlSanitizer)
-], PuppeteerServer.prototype, "htmlSanitizer", void 0);
-PuppeteerServer = __decorate([
-    RegisterSingleton
-], PuppeteerServer);
-export default PuppeteerServer;
+// /* eslint-disable no-console */
+// import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+// import puppeteer, { Page } from "puppeteer-core";
+// import { globalEnv } from "../../../common/globalEnv.js";
+// import HtmlSanitizer from "../dom/HtmlSanitizer.js";
+// import GlobalEvents from "../../../common/GlobalEvents.js";
+// import { rmdir, writeFile } from "node:fs/promises";
+// import { existsSync, mkdirSync, unlinkSync } from "node:fs";
+// import LockFile from "../../storage/LockFile.js";
+export {};
+// const options = [
+//     '--disable-background-networking',
+//     '--disable-background-timer-throttling',
+//     '--disable-backgrounding-occluded-windows',
+//     '--disable-breakpad',
+//     '--disable-client-side-phishing-detection',
+//     '--disable-component-update',
+//     '--disable-default-apps',
+//     '--disable-dev-shm-usage',
+//     '--disable-domain-reliability',
+//     '--disable-extensions',
+//     '--disable-features=AudioServiceOutOfProcess',
+//     '--disable-hang-monitor',
+//     '--disable-ipc-flooding-protection',
+//     '--disable-notifications',
+//     '--disable-offer-store-unmasked-wallet-cards',
+//     '--disable-popup-blocking',
+//     '--disable-print-preview',
+//     '--disable-prompt-on-repost',
+//     '--disable-renderer-backgrounding',
+//     '--disable-setuid-sandbox',
+//     '--disable-speech-api',
+//     '--disable-sync',
+//     '--disk-cache-size=33554432',
+//     // '--hide-scrollbars',
+//     // '--ignore-gpu-blacklist',
+//     // '--metrics-recording-only',
+//     '--mute-audio',
+//     '--no-default-browser-check',
+//     '--no-first-run',
+//     '--no-pings',
+//     '--no-sandbox',
+//     '--no-zygote',
+//     '--password-store=basic',
+//     '--use-mock-keychain',
+//     // '--single-process',
+//     '--autoplay-policy=no-user-gesture-required',
+//     // '--enable-logging=stderr',
+//     // '--v=1',
+//     // '--disable-gpu',
+//     //   '--window-size=400,800',
+// ];
+// // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+// export type DisposablePage = Partial<Page> & AsyncDisposable ;
+// const buffer = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAAtJREFUGFdjYAACAAAFAAGq1chRAAAAAElFTkSuQmCC", "base64");
+// @RegisterSingleton
+// export default class PuppeteerServer {
+//     @Inject
+//     htmlSanitizer: HtmlSanitizer;
+//     public async htmlToPdf(content: string, { outputFile, deviceScaleFactor, pdfOptions }: { outputFile: string, pdfOptions?: string, deviceScaleFactor?: number }) {
+//         try {
+//             await using page = await this.newPage({ deviceScaleFactor });
+//             content = this.htmlSanitizer.prepareForPreview(content);
+//             if(typeof pdfOptions === "string") {
+//                 pdfOptions = JSON.parse(pdfOptions);
+//             }
+//             await page.pdf({ ... pdfOptions as any,
+//                 path: outputFile
+//              });
+//         } catch (error) {
+//             await writeFile(outputFile, buffer);
+//             if (/Node\shas\s0\swidth/i.test(error.message ?? error)) {
+//                 return;
+//             }
+//             console.log(content);
+//             console.error(error);
+//         }
+//     }
+//     public async htmlToPng(content: string, {
+//         selector,
+//         outputFile,
+//         count,
+//         deviceScaleFactor
+//     }: { selector?: string; outputFile: string, count?: string, deviceScaleFactor?: number}) {
+//         try {
+//             await using page = await this.newPage({ deviceScaleFactor });
+//             content = this.htmlSanitizer.prepareForPreview(content);
+//             await page.setContent(content, {
+//                 waitUntil: "networkidle2"
+//             });
+//             const element = await page.$(selector);
+//             if (!element) {
+//                 await writeFile(buffer, outputFile);
+//                 return;
+//             }
+//             if (count) {
+//                 await element.evaluate((e, c) => {
+//                     const span = e.querySelector(`[data-social-mail-element="count"]`);
+//                     if (span) {
+//                         span.textContent = c;
+//                     }
+//                 }, count);
+//             }
+//             await element.scrollIntoView();
+//             const clip = await element.boundingBox();
+//             let top = Math.floor(clip.y);
+//             if (top < clip.y) {
+//                 clip.height++;
+//             } else {
+//                 top-=2;
+//                 clip.height+=4;
+//             }
+//             clip.height = Math.ceil(clip.height);
+//             clip.y = top;
+//             await page.screenshot({
+//                 path: outputFile,
+//                 clip,
+//                 omitBackground: true
+//             });
+//             // change the dpi...
+//         } catch (error) {
+//             await writeFile(outputFile, buffer);
+//             if (/Node\shas\s0\swidth/i.test(error.message ?? error)) {
+//                 return;
+//             }
+//             console.log(content);
+//             console.error(error);
+//         }
+//     }
+//     public async svgToPng(svgFile: string, outputFile: string) {
+//         await using page = await this.newPage();
+//         await page.goto(svgFile, { waitUntil: "networkidle2"});
+//         await page.screenshot({ path: outputFile });
+//     }
+//     public async newPage({ deviceScaleFactor }: Partial<puppeteer.Viewport> = {}): Promise<DisposablePage> {
+//         const lf = await LockFile.lock("puppeteer-html-to-image");
+//         const userDataDir = `/tmp/${Date.now().toString(36)}`;
+//         if(!existsSync(userDataDir)) {
+//             try {
+//                 mkdirSync(userDataDir, { recursive: true });
+//             } catch {
+//                 // ignore this...
+//             }
+//         }
+//         const browser = await puppeteer.launch({
+//                 executablePath: globalEnv.puppeteerExecutablePath,
+//                 userDataDir,
+//                 args: options,
+//                 // dumpio: true,
+//                 // ignoreHTTPSErrors: true,
+//                 ignoreDefaultArgs: ["--mute-audio"]
+//         });
+//         const page = await browser.newPage();
+//         await page.setViewport({
+//             ... (page.viewport() ?? {} as any),
+//             deviceScaleFactor
+//         });
+//         // we will kill browser in 15 seconds..
+//         const ct = setTimeout(() => browser.close().catch(console.error), 15000);
+//         page[Symbol.asyncDispose] = async () => {
+//             clearTimeout(ct);
+//             lf[Symbol.dispose]();
+//             try {
+//                 await browser.close();
+//             } catch {
+//                 // ignore error.
+//             }
+//             try {
+//                 await rmdir(userDataDir);
+//             } catch {
+//                 // ignore
+//             }
+//         };
+//         return page as any as DisposablePage;
+//     }
+// }
 //# sourceMappingURL=PuppeteerServer.js.map

package/dist/server/services/puppeteer/PuppeteerServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PuppeteerServer.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PuppeteerServer.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerServer.ts"],"names":[],"mappings":"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"}

package/dist/server/services/puppeteer/PuppeteerService.d.ts

@@ -1,2 +1,2 @@
-export { default as PuppeteerService } from "./PuppeteerServer.js";
+export {};
 //# sourceMappingURL=PuppeteerService.d.ts.map

package/dist/server/services/puppeteer/PuppeteerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":""}

package/dist/server/services/puppeteer/PuppeteerService.js

@@ -1,2 +1,3 @@
-export { default as PuppeteerService } from "./PuppeteerServer.js";
+export {};
+// export { default as PuppeteerService } from "./PuppeteerServer.js";
 //# sourceMappingURL=PuppeteerService.js.map

package/dist/server/services/puppeteer/PuppeteerService.js.map

@@ -1 +1 @@
-{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":";AAAA,sEAAsE"}

package/dist/server/smtp/services/CachedEmailService.js

@@ -76,7 +76,7 @@ let CachedEmailService = class CachedEmailService {
             return htmlFile;
         };
         const ef = await this.cacheService.get({
-            key: `cached-email-html-a8-${emailID}-${emailAddressID}-${signedFileLogID}`,
+            key: `cached-email-html-a9-${emailID}-${emailAddressID}-${signedFileLogID}`,
             factory,
             ttl: TimeSpan.fromDays(30)
         });

package/dist/server/smtp/services/EmailReferenceService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailReferenceService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailReferenceService.ts"],"names":[],"mappings":"AAIA,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI3E,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAQtD,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG;IACvD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CAErB,CAAC;AAEF,MAAM,WAAW,0BAA0B;IAAG,OAAO,MAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAAC,WAAW,CAAC,EAAE,QAAQ,CAAA;CAAE;AAGtH,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAE/B,cAAc,UAAQ;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,QAAQ,CAAkB;IAGlC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,UAAU,CAAa;IAElB,gBAAgB,CAAC,OAAO,EAAE,0BAA0B;IAW3D,YAAY,CAAE,EAAE,EAAE,kBAAkB;YAkM5B,cAAc;YAoBd,qBAAqB;CA2NtC"}
+{"version":3,"file":"EmailReferenceService.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/services/EmailReferenceService.ts"],"names":[],"mappings":"AAIA,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAI3E,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAQtD,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG;IACvD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CAErB,CAAC;AAEF,MAAM,WAAW,0BAA0B;IAAG,OAAO,MAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAAC,WAAW,CAAC,EAAE,QAAQ,CAAA;CAAE;AAGtH,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAE/B,cAAc,UAAQ;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,QAAQ,CAAkB;IAGlC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,UAAU,CAAa;IAElB,gBAAgB,CAAC,OAAO,EAAE,0BAA0B;IAW3D,YAAY,CAAE,EAAE,EAAE,kBAAkB;YAkM5B,cAAc;YAoBd,qBAAqB;CA0NtC"}

package/dist/server/smtp/services/EmailReferenceService.js

@@ -207,7 +207,6 @@ let EmailReferenceService = class EmailReferenceService {
             .include((x) => [
             x.recipients.forEach((r) => r.emailAddress.mailbox),
             x.senderEmail.mailbox,
-            x.mailboxes.forEach((r) => r.mailbox),
             x.thread.lastReply
         ])
             .first();
@@ -299,17 +298,17 @@ let EmailReferenceService = class EmailReferenceService {
                     });
                 }
                 // event sent emails are part of mailbox
-                await db.mailboxEmails.statements.selectOrInsert({
-                    mailboxID: senderID,
-                    emailID
-                });
+                // await db.mailboxEmails.statements.selectOrInsert({
+                //     mailboxID: senderID,
+                //     emailID
+                // });
                 if (mailbox) {
                     // this is the case when email was sent from the system
                     // we will insert in respective mailboxes here...
-                    await db.mailboxEmails.statements.selectOrInsert({
-                        mailboxID: emailAddressID,
-                        emailID
-                    });
+                    // await db.mailboxEmails.statements.selectOrInsert({
+                    //     mailboxID: emailAddressID,
+                    //     emailID
+                    // });
                     saved.add(emailAddressID);
                     // Recipient's thread - Inbox
                     await this.updateThread({
@@ -338,10 +337,10 @@ let EmailReferenceService = class EmailReferenceService {
                 // we will only store in mailboxes that exist on the system
                 saved.add(emailAddressID);
                 if (mailbox) {
-                    await db.mailboxEmails.statements.selectOrInsert({
-                        mailboxID: emailAddressID,
-                        emailID
-                    });
+                    // await db.mailboxEmails.statements.selectOrInsert({
+                    //     mailboxID: emailAddressID,
+                    //     emailID
+                    // });
                     const mailboxID = emailAddressID;
                     await this.updateThread({
                         engagement,
@@ -364,28 +363,28 @@ let EmailReferenceService = class EmailReferenceService {
         // this is the case when mail is either forwarded
         // or sent as bcc to hosted mailbox
         // in that case we will put mail in sender's folder
-        if (email.mailboxes) {
-            for (const { mailbox } of email.mailboxes) {
-                const mailboxID = mailbox.mailboxID;
-                if (saved.has(mailboxID)) {
-                    continue;
-                }
-                await this.updateThread({
-                    engagement,
-                    mailbox,
-                    mailboxID,
-                    emailAddressID: senderID,
-                    lastEmailID: emailID,
-                    silent,
-                    timeRead,
-                    dateUpdated,
-                    tagIDs,
-                    email,
-                    newOpenThread,
-                    newThread,
-                });
-            }
-        }
+        // if (email.mailboxes) {
+        //     for (const { mailbox } of email.mailboxes) {
+        //         const mailboxID = mailbox.mailboxID;
+        //         if (saved.has(mailboxID)) {
+        //             continue;
+        //         }
+        //         await this.updateThread({
+        //             engagement,
+        //             mailbox,
+        //             mailboxID,
+        //             emailAddressID: senderID,
+        //             lastEmailID: emailID,
+        //             silent,
+        //             timeRead,
+        //             dateUpdated,
+        //             tagIDs,
+        //             email,
+        //             newOpenThread,
+        //             newThread,
+        //         });
+        //     }
+        // }
         return email;
     }
 };