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

package/dist/wwwroot/routes/social-mail/social/buttons-3x/get.js

@@ -1,131 +1,117 @@
-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);
-};
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import CacheService from "../../../../../server/services/cache/CacheService.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
-import { Base36 } from "../../../../../common/Base36.js";
-import { toKMBString } from "../../../../../common/NumberFormats.js";
-import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
-import TempFileService from "../../../../../server/storage/TempFileService.js";
-/**
- * Social Buttons URL Pattern
- *
- * /social-mail/social/buttons-3x/{method}/{selector}/{emailID}/{activityID}
- *
- * method: can be track or any unicode emoji that will be considered as an engagement.
- *
- * selector: unique selector button that will be converted to PNG
- *
- * emailID: email id of the email, Base36 encoded.
- *
- * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
- *      We are not going to use subscriberID as each activityID will be unique and it will be new for
- *      new email.
- */
-export default class SocialButtonPage extends Page {
-    async run() {
-        const [method, selector, emailIDEncoded, activityID] = this.childPath;
-        let emailID = emailIDEncoded;
-        if (!/^\$/.test(emailID)) {
-            emailID = Base36.decode(emailID, false);
-        }
-        const key = `buttons/${method}/${emailID}`;
-        /**
-         * why do we need to cache this?
-         *
-         * It is to avoid putting load on puppeteer service.
-         * As rendering html to png will require significant cpu and network
-         * resources, as styles can reference any external images.
-         */
-        // const file = await this.cacheService.get({
-        //     key, factory: () => this.createImage(method, selector, emailID, activityID),
-        //     ttl: TimeSpan.fromSeconds(8600)
-        // });
-        const file = await this.createImage(method, selector, emailID, activityID);
-        this.cacheControl = "public, max-age=8600";
-        return new TempFileResult(file, {});
-    }
-    async createImage(method, selector, emailID, activityID) {
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
-        const tempFileService = ServiceProvider.resolve(this, TempFileService);
-        let count;
-        if (method === "track") {
-            count = await this.track(emailID, activityID);
-        }
-        else {
-            const engagement = decodeURIComponent(method);
-            // console.log(`Search for engagement ${engagement} in ${emailID}`);
-            const ec = await this.db.emailEngagements
-                .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
-                .first();
-            if (ec?.count) {
-                count = toKMBString(ec.count);
-            }
-        }
-        count ??= "";
-        const html = await this.getHtmlBody(emailID);
-        const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
-        await puppeteerService.htmlToPng(html, { deviceScaleFactor: 3, selector, outputFile: png.path, count });
-        return png;
-    }
-    async getHtmlBody(emailID) {
-        const email = await this.db.emails
-            .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-            .first();
-        if (email.htmlBody) {
-            return email.htmlBody;
-        }
-        const file = await this.cachedEmailService.getHtml(emailID);
-        return await file.readAsText();
-    }
-    async track(emailID, activityID) {
-        const ep = { emailID };
-        const isValidActivityID = !/^\$/.test(activityID);
-        if (isValidActivityID) {
-            const activity = await this.db.subscriberActivities
-                .where({
-                activityID: Base36.decode(activityID, false) ?? 0,
-                emailID
-            }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
-                .first();
-            if (activity) {
-                delete activity.activityID;
-                activity.activity = "view";
-                activity.ipAddress = this.request?.remoteIPAddress;
-                await this.db.subscriberActivities.statements.insert(activity);
-                await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID)
-                    .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1 }));
-            }
-        }
-        const ec = await this.db.emails
-            .where(ep, (p) => (x) => x.emailID === p.emailID)
-            .first();
-        if (ec?.viewCount) {
-            return toKMBString(ec.viewCount);
-        }
-    }
-}
-__decorate([
-    Inject,
-    __metadata("design:type", CacheService)
-], SocialButtonPage.prototype, "cacheService", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", CachedEmailService)
-], SocialButtonPage.prototype, "cachedEmailService", void 0);
-__decorate([
-    Inject,
-    __metadata("design:type", SocialMailContext)
-], SocialButtonPage.prototype, "db", void 0);
+// import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import Content, { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+// import Page from "@entity-access/server-pages/dist/Page.js";
+// import CacheService from "../../../../../server/services/cache/CacheService.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
+// import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
+// import { Base36 } from "../../../../../common/Base36.js";
+// import { toKMBString } from "../../../../../common/NumberFormats.js";
+// // import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
+// import TempFileService from "../../../../../server/storage/TempFileService.js";
+export {};
+// /**
+//  * Social Buttons URL Pattern
+//  *
+//  * /social-mail/social/buttons-3x/{method}/{selector}/{emailID}/{activityID}
+//  *
+//  * method: can be track or any unicode emoji that will be considered as an engagement.
+//  *
+//  * selector: unique selector button that will be converted to PNG
+//  *
+//  * emailID: email id of the email, Base36 encoded.
+//  *
+//  * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
+//  *      We are not going to use subscriberID as each activityID will be unique and it will be new for
+//  *      new email.
+//  */
+// export default class SocialButtonPage extends Page {
+//     @Inject
+//     private cacheService: CacheService;
+//     @Inject
+//     private cachedEmailService: CachedEmailService;
+//     @Inject
+//     private db: SocialMailContext;
+//     async run() {
+//         const [method, selector, emailIDEncoded, activityID] = this.childPath;
+//         let emailID = emailIDEncoded;
+//         if (!/^\$/.test(emailID)) {
+//             emailID = Base36.decode(emailID, false);
+//         }
+//         const key = `buttons/${method}/${emailID}`;
+//         /**
+//          * why do we need to cache this?
+//          *
+//          * It is to avoid putting load on puppeteer service.
+//          * As rendering html to png will require significant cpu and network
+//          * resources, as styles can reference any external images.
+//          */
+//         // const file = await this.cacheService.get({
+//         //     key, factory: () => this.createImage(method, selector, emailID, activityID),
+//         //     ttl: TimeSpan.fromSeconds(8600)
+//         // });
+//         const file = await this.createImage(method, selector, emailID, activityID);
+//         this.cacheControl = "public, max-age=8600";
+//         return new TempFileResult(file, {});
+//     }
+//     async createImage(method: string, selector, emailID, activityID) {
+//         const db = ServiceProvider.resolve(this, SocialMailContext);
+//         const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
+//         const tempFileService = ServiceProvider.resolve(this, TempFileService);
+//         let count: string;
+//         if (method === "track") {
+//             count = await this.track(emailID, activityID);
+//         } else {
+//             const engagement = decodeURIComponent(method);
+//             // console.log(`Search for engagement ${engagement} in ${emailID}`);
+//             const ec = await this.db.emailEngagements
+//                 .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
+//                 .first();
+//             if (ec?.count) {
+//                 count = toKMBString(ec.count);
+//             }
+//         }
+//         count ??= "";
+//         const html = await this.getHtmlBody(emailID);
+//         const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
+//         await puppeteerService.htmlToPng(html, { deviceScaleFactor: 3, selector, outputFile: png.path, count });
+//         return png;
+//     }
+//     async getHtmlBody(emailID: any) {
+//         const email = await this.db.emails
+//             .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
+//             .first();
+//         if (email.htmlBody) {
+//             return email.htmlBody;
+//         }
+//         const file = await this.cachedEmailService.getHtml(emailID);
+//         return await file.readAsText();
+//     }
+//     async track(emailID: any, activityID: any) {
+//         const ep = { emailID };
+//         const isValidActivityID = !/^\$/.test(activityID);
+//         if (isValidActivityID) {
+//             const activity = await this.db.subscriberActivities
+//             .where({
+//                 activityID: Base36.decode(activityID, false) ?? 0,
+//                 emailID
+//             }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
+//             .first();
+//             if (activity) {
+//                 delete activity.activityID;
+//                 activity.activity = "view";
+//                 activity.ipAddress = this.request?.remoteIPAddress;
+//                 await this.db.subscriberActivities.statements.insert(activity);
+//                 await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//                     .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1}));
+//             }
+//         }
+//         const ec = await this.db.emails
+//             .where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//             .first();
+//         if (ec?.viewCount) {
+//             return toKMBString(ec.viewCount);
+//         }
+//     }
+// }
 //# sourceMappingURL=get.js.map

package/dist/wwwroot/routes/social-mail/social/buttons-3x/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/social/buttons-3x/get.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/social-mail/social/buttons-3x/get.tsx"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,yFAAyF;AACzF,+DAA+D;AAC/D,mFAAmF;AACnF,8EAA8E;AAC9E,oFAAoF;AACpF,8FAA8F;AAC9F,4DAA4D;AAC5D,wEAAwE;AACxE,sGAAsG;AACtG,kFAAkF;;AAElF,MAAM;AACN,gCAAgC;AAChC,KAAK;AACL,+EAA+E;AAC/E,KAAK;AACL,yFAAyF;AACzF,KAAK;AACL,oEAAoE;AACpE,KAAK;AACL,qDAAqD;AACrD,KAAK;AACL,2GAA2G;AAC3G,wGAAwG;AACxG,qBAAqB;AACrB,MAAM;AACN,uDAAuD;AAEvD,cAAc;AACd,0CAA0C;AAE1C,cAAc;AACd,sDAAsD;AAEtD,cAAc;AACd,qCAAqC;AAErC,oBAAoB;AAEpB,iFAAiF;AAEjF,wCAAwC;AAExC,sCAAsC;AACtC,uDAAuD;AACvD,YAAY;AAEZ,sDAAsD;AAEtD,cAAc;AACd,2CAA2C;AAC3C,aAAa;AACb,+DAA+D;AAC/D,+EAA+E;AAC/E,qEAAqE;AACrE,cAAc;AAEd,wDAAwD;AACxD,8FAA8F;AAC9F,iDAAiD;AACjD,iBAAiB;AAEjB,sFAAsF;AAEtF,sDAAsD;AAEtD,+CAA+C;AAC/C,QAAQ;AAER,yEAAyE;AACzE,uEAAuE;AACvE,oFAAoF;AACpF,kFAAkF;AAElF,6BAA6B;AAE7B,oCAAoC;AACpC,6DAA6D;AAC7D,mBAAmB;AACnB,6DAA6D;AAC7D,mFAAmF;AACnF,wDAAwD;AACxD,0HAA0H;AAC1H,4BAA4B;AAE5B,+BAA+B;AAC/B,iDAAiD;AACjD,gBAAgB;AAChB,YAAY;AAEZ,wBAAwB;AAExB,wDAAwD;AAExD,+FAA+F;AAC/F,mHAAmH;AACnH,sBAAsB;AACtB,QAAQ;AAER,wCAAwC;AAExC,6CAA6C;AAC7C,yEAAyE;AACzE,wBAAwB;AAExB,gCAAgC;AAChC,qCAAqC;AACrC,YAAY;AAEZ,uEAAuE;AACvE,0CAA0C;AAC1C,QAAQ;AAER,mDAAmD;AAEnD,kCAAkC;AAClC,6DAA6D;AAC7D,mCAAmC;AACnC,kEAAkE;AAClE,uBAAuB;AACvB,qEAAqE;AACrE,0BAA0B;AAC1B,yFAAyF;AACzF,wBAAwB;AAExB,8BAA8B;AAC9B,8CAA8C;AAC9C,8CAA8C;AAC9C,sEAAsE;AACtE,kFAAkF;AAElF,+FAA+F;AAC/F,kFAAkF;AAClF,gBAAgB;AAChB,YAAY;AAEZ,0CAA0C;AAC1C,uEAAuE;AACvE,wBAAwB;AAExB,+BAA+B;AAC/B,gDAAgD;AAChD,YAAY;AACZ,QAAQ;AAER,IAAI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.455",
+  "version": "1.7.2",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.401",
-    "@entity-access/server-pages": "^1.1.398",
+    "@entity-access/server-pages": "^1.1.399",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",
@@ -49,7 +49,6 @@
     "nodemailer": "^6.9.4",
     "pg": "^8.11.1",
     "pg-cursor": "^2.10.1",
-    "puppeteer-core": "^22.6.2",
     "qrcode": "^1.5.3",
     "semver": "^7.6.2",
     "sharp": "^0.33.5",

package/src/server/model/SocialMailContext.ts

@@ -22,7 +22,7 @@ import DomainRelay from "./entities/DomainRelay.js";
 import MailboxContact from "./entities/MailboxContact.js";
 import MailboxContactEmail from "./entities/MailboxContactEmail.js";
 import UserAuthFactor from "./entities/UserAuthFactor.js";
-import MailboxEmail from "./entities/MailboxEmail.js";
+import ChannelEmail from "./entities/ChannelEmail.js";
 import AppFileTag from "./entities/AppFileTag.js";
 import UserPin from "./entities/UserPin.js";
 import Contact, { ContactAddress, ContactDomain, ContactEmail, ContactItem, ContactPhone } from "./entities/Contact.js";
@@ -146,7 +146,7 @@ export default class SocialMailContext extends EntityContext {
 
     public mailboxes = this.model.register(Mailbox);
 
-    public mailboxEmails = this.model.register(MailboxEmail);
+    public channelEmails = this.model.register(ChannelEmail);
 
 
     public mailboxContacts = this.model.register(MailboxContact);

package/src/server/model/SocialMailContextEvents.ts

@@ -54,7 +54,7 @@ import EmailTemplate from "./entities/EmailTemplate.js";
 import EmailTemplateEvents from "./events/EmailTemplateEvents.js";
 import MailboxSyncTarget from "./entities/MailboxSyncTarget.js";
 import MailboxSyncTargetEvents from "./events/MailboxSyncTargetEvents.js";
-import MailboxEmail from "./entities/MailboxEmail.js";
+import ChannelEmail from "./entities/ChannelEmail.js";
 import MailboxEmailEvents from "./events/MailboxEmailEvents.js";
 import EmailLogEvents from "./events/EmailLogEvents.js";
 import WebSite from "./entities/WebSite.js";
@@ -182,7 +182,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(MailboxContactEvent, MailboxContactEventEvents);
         this.register(MailboxContactTag, MailboxContactTagEvents);
         this.register(MailboxTag, MailboxTagEvents);
-        this.register(MailboxEmail, MailboxEmailEvents);
+        this.register(ChannelEmail, MailboxEmailEvents);
         this.register(NameToken, NameTokenEvents);
         this.register(StoreItem, StoreItemEvents);
         this.register(StoreItemPrice, StoreItemPriceEvents);

package/src/server/model/entities/AppFile.ts

@@ -22,8 +22,7 @@ import type { StoreItem } from "./StoreItem.js";
 import type { StoreMediaFile } from "./StoreMediaFile.js";
 import CheckConstraint from "@entity-access/entity-access/dist/decorators/CheckConstraint.js";
 import type { StoreJournal } from "./StoreJournal.js";
-import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import EncryptionService from "../../services/encryption/EncryptionService.js";
+import type ChannelEmail from "./ChannelEmail.js";
 
 const accessTypesEnum = ["create", "read", "write", "delegate"] as const;
 export type fileAccessTypes = typeof accessTypesEnum[number];
@@ -208,6 +207,7 @@ export default class AppFile {
     storeItems: StoreItem[];
     currentVersionWebSites: WebSite[];
     storeMediaFiles: StoreMediaFile[];
+    channelEmails: ChannelEmail[];
 
     @ReadOnlyJsonProperty
     public get postID() {

package/src/server/model/entities/{MailboxEmail.ts → ChannelEmail.ts}

@@ -6,6 +6,7 @@ import Mailbox from "./Mailbox.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import { ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import AppFile from "./AppFile.js";
 
 @Table("MailboxEmails")
 @Index({
@@ -30,7 +31,7 @@ import { ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/
     ],
     filter: (x) => x.datePublished !== null && x.isThread === true
 })
-export default class MailboxEmail {
+export default class ChannelEmail {
 
     @Column({ dataType: "BigInt", key: true, order: 1 })
     @RelateTo(Mailbox, {
@@ -45,7 +46,7 @@ export default class MailboxEmail {
     @Column({ dataType: "BigInt", key: true, order: 2})
     @RelateTo(Email, {
         property: (me) => me.email,
-        inverseProperty: (e) => e.mailboxes,
+        inverseProperty: (e) => e.channelEmails,
         foreignKeyConstraint: {
             cascade: "delete"
         }
@@ -75,8 +76,21 @@ export default class MailboxEmail {
     @Column({ dataType: "Boolean", default: () => false})
     isThread: boolean;
 
+    @Column({dataType: "BigInt", nullable: true})
+    @RelateTo(AppFile, {
+        property: (x) => x.previewFile,
+        inverseProperty: (x) => x.channelEmails,
+        foreignKeyConstraint: {
+            name: "FC_ChannelEmails_PreviewFileID",
+            cascade: "set-null"
+        }
+    })
+    previewFileID: number;
+
     mailbox: Mailbox;
 
+    previewFile: AppFile;
+
     @ReadOnlyJsonProperty
     postID: string;
 

package/src/server/model/entities/Email.ts

@@ -10,7 +10,7 @@ import AppFile from "./AppFile.js";
 import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 import type MailboxContact from "./MailboxContact.js";
 import MailboxContactEmail from "./MailboxContactEmail.js";
-import type MailboxEmail from "./MailboxEmail.js";
+import type ChannelEmail from "./ChannelEmail.js";
 import { User } from "./User.js";
 import type SubscriberActivity from "./SubscriberActivity.js";
 import { IgnoreJsonProperty, JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
@@ -277,7 +277,7 @@ export class Email {
 
     // public originalFile: AppFile;
 
-    public mailboxes: MailboxEmail[];
+    // public mailboxes: MailboxEmail[];
 
     public parent: Email;
 
@@ -299,6 +299,7 @@ export class Email {
     public engagements: EmailEngagement[];
     mailboxContactEvents: MailboxContactEvent[];
     threadParticipants: ThreadParticipant[];
+    channelEmails: ChannelEmail[];
 }
 
 @Table("EmailLogs")

package/src/server/model/entities/EmailAddress.ts

@@ -12,6 +12,7 @@ import type SubscriberActivity from "./SubscriberActivity.js";
 import type EmailAddressName from "./EmailAddressName.js";
 import type StoreAccountEmail from "./StoreAccountEmail.js";
 import type ThreadParticipant from "./ThreadParticipant.js";
+import type MailboxContactEmail from "./MailboxContactEmail.js";
 
 @Table("EmailAddresses")
 @Index({
@@ -56,5 +57,6 @@ export default class EmailAddress {
     names: EmailAddressName[];
     storeAccounts: StoreAccountEmail[];
     threadParticipants: ThreadParticipant[];
+    mailboxContactEmails: MailboxContactEmail[];
 
 }

package/src/server/model/entities/Mailbox.ts

@@ -6,7 +6,7 @@ import EmailAddress from "./EmailAddress.js";
 import { HostedDomain } from "./HostedDomain.js";
 import type  MailboxContact from "./MailboxContact.js";
 import type MailboxContactEmail from "./MailboxContactEmail.js";
-import type MailboxEmail from "./MailboxEmail.js";
+import type ChannelEmail from "./ChannelEmail.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import type UserPin from "./UserPin.js";
 import type Contact from "./Contact.js";
@@ -211,7 +211,7 @@ export default class Mailbox {
 
     public domain: Domain;
 
-    public emails: MailboxEmail[];
+    public emails: ChannelEmail[];
 
     public userMailboxes: UserMailbox[];
 

package/src/server/model/entities/MailboxContactEmail.ts

@@ -2,7 +2,7 @@ import Column from "@entity-access/entity-access/dist/decorators/Column.js";
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { Email } from "./Email.js";
 import Mailbox from "./Mailbox.js";
-import type EmailAddress from "./EmailAddress.js";
+import EmailAddress from "./EmailAddress.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
@@ -33,6 +33,10 @@ export default class MailboxContactEmail {
     mailboxID: number;
 
     @Column({ key: true, dataType: "BigInt", order: 2})
+    @RelateTo(EmailAddress, {
+        property: (x) => x.emailAddress,
+        inverseProperty: (x) => x.mailboxContactEmails
+    })
     emailAddressID: number;
 
     @Column({ key: true, dataType: "BigInt", order: 3, indexOrder: "descending"})

package/src/server/model/events/AppFileEvents.ts

@@ -30,6 +30,8 @@ import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSe
 import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
 import FileConversionService from "../../services/convert/FileConversionService.js";
 import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+import ChannelEmail from "../entities/ChannelEmail.js";
+import Mailbox from "../entities/Mailbox.js";
 
 export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
 
@@ -75,6 +77,20 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
         return db.appFiles.where({ path }, (p) => (x) => Sql.text.like(x.path, p.path));
     }
 
+    @ExternalQuery
+    async channelPostFiles(post: Email | ChannelEmail) {
+        return this.db.appFiles.where(post, (p) => (x) => x.emailID === p.emailID);
+    }
+
+    // @ExternalQuery
+    // async channelAllFiles(post: Mailbox) {
+    //     return this.db.appFiles.where(post, (p) => (x) => x.email.status === "published"
+    //         && x.email.channelEmails.some((m) => m.mailboxID === p.mailboxID));
+    // }
+    // async channelFiles(emailID) {
+
+    // }
+
     @ExternalQuery
     async channelEmailFiles(emailID) {
         const page = ServiceProvider.resolve(this, Page as any) as Page;
@@ -86,10 +102,10 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
         let q = mailboxes
             ? this.db.appFiles.where({ mailboxes }, (p) => (x) =>
                 x.email.status === "published"
-                && x.email.mailboxes.some((mc)=> Sql.in(mc.mailboxID, p.mailboxes )))
+                && x.email.channelEmails.some((mc)=> Sql.in(mc.mailboxID, p.mailboxes )))
             : this.db.appFiles.where({ domains }, (p) => (x) =>
                 x.email.status === "published"
-                && x.email.mailboxes.some((mc)=> Sql.in(mc.mailbox.domainID, p.domains )))
+                && x.email.channelEmails.some((mc)=> Sql.in(mc.mailbox.domainID, p.domains )))
             ;
 
         if (emailID) {
@@ -111,14 +127,14 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
             x.email.status === "published");
 
         if (mailboxID) {
-            q = q.where({ mailboxID }, (p) => (x) => x.email.mailboxes.some((m) => m.mailboxID === p.mailboxID));
+            q = q.where({ mailboxID }, (p) => (x) => x.email.channelEmails.some((m) => m.mailboxID === p.mailboxID));
         } else {
             if (mailboxes) {
                 q = q.where({ mailboxes }, (p) => (x) =>
-                    x.email.mailboxes.some((mc)=> Sql.in(mc.mailboxID, p.mailboxes )));
+                    x.email.channelEmails.some((mc)=> Sql.in(mc.mailboxID, p.mailboxes )));
             } else {
                 q = q.where({ domains }, (p) => (x) =>
-                    x.email.mailboxes.some((mc)=> Sql.in(mc.mailbox.domainID, p.domains )));
+                    x.email.channelEmails.some((mc)=> Sql.in(mc.mailbox.domainID, p.domains )));
             }
         }
 
@@ -254,6 +270,9 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
         if (type === Email) {
             return query;
         }
+        if (type === ChannelEmail) {
+            return query;
+        }
         return this.filter(query);
     }
 

package/src/server/model/events/AppFileTagEvents.ts

@@ -1,6 +1,7 @@
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import AppFileTag from "../entities/AppFileTag.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 export default class AppFileTagEvents extends AuthenticatedEvents<AppFileTag> {
 
@@ -8,11 +9,9 @@ export default class AppFileTagEvents extends AuthenticatedEvents<AppFileTag> {
         if (this.sessionUser.isAdmin) {
             return query;
         }
-        const { userID } = this.sessionUser;
-        return query.where({ userID}, (p) => (x) =>
-            x.file.email.mailboxes.some((mb) => mb.mailbox.userMailboxes.some((um) => um.userID === p.userID)
-            || mb.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID )
-            ));
+        return query.where(this.sessionUser, (p) => (x) =>
+            Sql.text.likeAny(x.file.path, p.readFileAccess)
+        );
     }
 
     includeFilter(query: IEntityQuery<AppFileTag>, type?: any, key?: string): IEntityQuery<AppFileTag> {

package/src/server/model/events/EmailAddressEvents.ts

@@ -13,14 +13,11 @@ export default class EmailAddressEvents extends AuthenticatedEvents<EmailAddress
         }
         const { userID } = this.sessionUser;
         return query.where({ userID }, (p) => (x) =>
-            x.mailbox.userMailboxes.some((um) => um.userID === p.userID)
-                || x.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
-                || x.senders.some((us) =>
-                    us.mailboxes.some((mb) =>
-                        mb.mailbox.userMailboxes.some((du) => du.userID === p.userID)
-                        || mb.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
-                    )
-            ));
+            x.mailboxContactEmails.some((mce) =>
+                mce.mailbox.userMailboxes.some((u) => u.userID === p.userID)
+                || mce.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID)
+            )
+        );
     }
 
     includeFilter(query: IEntityQuery<EmailAddress>, type?: any, key?: string): IEntityQuery<EmailAddress> {

package/src/server/model/events/EmailEngagementEvents.ts

@@ -14,7 +14,7 @@ export default class EmailEngagementEvents extends AuthenticatedEvents<EmailEnga
         }
         const { userID } = sessionUser;
         return query.where({ userID }, (p) => (x) =>
-            x.email.mailboxes.some((m) =>
+            x.email.mailboxContactEvents.some((m) =>
                 m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
                 || m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
             )