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

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

@@ -57,7 +57,7 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         }
         const { userID } = this.sessionUser;
         return query.where({ userID }, (p) => (x) =>
-            x.mailboxes.some((m) =>
+            x.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)
             )
@@ -76,10 +76,10 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         const q = mailboxes
             ? this.db.emails.where({ channelID, host, mailboxes}, (p) => (x) =>
                 x.status === "published"
-                && x.mailboxes.some((m) => Sql.in(m.mailboxID, p.mailboxes)))
+                && x.channelEmails.some((m) => Sql.in(m.mailboxID, p.mailboxes)))
             : this.db.emails.where({ channelID, host, domains}, (p) => (x) =>
                 x.status === "published"
-                && x.mailboxes.some((m) => Sql.in(m.mailbox.domainID, p.domains)));
+                && x.channelEmails.some((m) => Sql.in(m.mailbox.domainID, p.domains)));
         return q.limit(25);
     }
 
@@ -211,7 +211,7 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         await this.db.emailEngagements.asQuery()
             .delete(entity, (p) => (x) => x.emailID === p.emailID);
 
-        await this.db.mailboxEmails
+        await this.db.channelEmails
             .asQuery()
             .delete(entity, (p) => (x) => x.emailID === p.emailID);
 
@@ -244,11 +244,11 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         if (entry.isUpdated("status")) {
             switch(entity.status) {
                 case "published":
-                    await this.db.mailboxEmails.where(entity, (p) => (x) => x.emailID === p.emailID && x.mailbox.isChannel === true)
+                    await this.db.channelEmails.where(entity, (p) => (x) => x.emailID === p.emailID && x.mailbox.isChannel === true)
                         .update(entity, (p) => (x) => ({ datePublished: Sql.cast.asDateTime(p.dateSent) as any }));
                     break;
                 default:
-                    await this.db.mailboxEmails.where(entity, (p) => (x) => x.emailID === p.emailID && x.mailbox.isChannel === true)
+                    await this.db.channelEmails.where(entity, (p) => (x) => x.emailID === p.emailID && x.mailbox.isChannel === true)
                         .update(void 0, (p) => (x) => ({ datePublished: Sql.cast.asDateTime(null) as any }));
             }
         }

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

@@ -23,7 +23,7 @@ export default class EmailLogEvents extends BaseEvents<EmailLog> {
         }
         const { userID } = this.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)
             )

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

@@ -28,7 +28,7 @@ export default class EmailRecipientEvents extends AuthenticatedEvents<EmailRecip
         }
         const { userID } = this.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)
             )

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

@@ -13,7 +13,7 @@ export default class EmailTagEvents extends AuthenticatedEvents<EmailTag> {
         }
         const { userID } = this.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)
             )

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

@@ -21,10 +21,9 @@ export default class FileContentEvents extends AuthenticatedEvents<FileContent>
                 t.hostedDomain.domainUsers.some((d) => d.userID === p.userID)
                 || t.mailbox.userMailboxes.some((u) => u.userID === p.userID)
                 || t.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID))
-                ||
-                af.email.mailboxes.some((um) =>
-                    um.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
-                    || um.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
+                || af.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)
                 )
             )
         );

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

@@ -96,10 +96,10 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
                     timeRead: dateSent
                 });
 
-                await db.mailboxEmails.statements.insert({
-                    emailID,
-                    mailboxID
-                });
+                // await db.mailboxEmails.statements.insert({
+                //     emailID,
+                //     mailboxID
+                // });
 
                 await db.emails
                     .where(entity , (p) => (x) => x.threadContacts.some((t) => t.mailboxID === p.mailboxID

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

@@ -1,5 +1,5 @@
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
-import MailboxEmail from "../entities/MailboxEmail.js";
+import ChannelEmail from "../entities/ChannelEmail.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
@@ -9,13 +9,17 @@ import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js"
 import Page from "@entity-access/server-pages/dist/Page.js";
 import SocialMailContext from "../SocialMailContext.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
-export default class MailboxEmailEvents extends AuthenticatedEvents<MailboxEmail> {
+export default class MailboxEmailEvents extends AuthenticatedEvents<ChannelEmail> {
 
     @Inject
     ecs: EncryptionService;
 
-    filter(query: IEntityQuery<MailboxEmail>): IEntityQuery<MailboxEmail> {
+    @Inject
+    ss: SessionSecurity;
+
+    filter(query: IEntityQuery<ChannelEmail>): IEntityQuery<ChannelEmail> {
         if (!this.verify) {
             return query;
         }
@@ -41,22 +45,22 @@ export default class MailboxEmailEvents extends AuthenticatedEvents<MailboxEmail
         const db = ServiceProvider.resolve(this, SocialMailContext);
 
         const q = mailboxes
-            ? db.mailboxEmails.where({ channelID, host, mailboxes}, (p) => (x) =>
+            ? db.channelEmails.where({ channelID, host, mailboxes}, (p) => (x) =>
                 x.datePublished !== null
                 && Sql.in(x.mailboxID, p.mailboxes))
-            : db.mailboxEmails.where({ channelID, host, domains}, (p) => (x) =>
+            : db.channelEmails.where({ channelID, host, domains}, (p) => (x) =>
                 x.datePublished !== null
                 && Sql.in(x.mailbox.domainID, p.domains));
         return q.limit(25);
     }
 
-    beforeInsert(entity: MailboxEmail, entry: ChangeEntry<MailboxEmail>) {
+    beforeInsert(entity: ChannelEmail, entry: ChangeEntry<ChannelEmail>) {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();
         }
     }
 
-    beforeSerialize(items: MailboxEmail[]) {
+    beforeSerialize(items: ChannelEmail[]) {
         const { ecs } = this;
         for (const item of items) {
             if (!item.datePublished) {
@@ -66,4 +70,9 @@ export default class MailboxEmailEvents extends AuthenticatedEvents<MailboxEmail
         }
     }
 
+    preJson(entity: ChannelEmail): ChannelEmail {
+        this.ss.injectPublicKey(entity);
+        return entity;
+    }
+
 }

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

@@ -18,10 +18,11 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import SyncMailboxWorkflow from "../../workflows/sync/SyncMailboxWorkflow.js";
 import TagService from "../../services/tags/TagService.js";
 import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
-import MailboxEmail from "../entities/MailboxEmail.js";
+import ChannelEmail from "../entities/ChannelEmail.js";
 import MailboxTag from "../entities/MailboxTag.js";
 import MailboxContactEvent from "../entities/MailboxContactEvent.js";
 import ScopeVars from "../../../common/ScopeVars.js";
+import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 
 export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
 
@@ -195,7 +196,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
     }
 
     includeFilter(query: IEntityQuery<Mailbox>, type?: any, key?: string) {
-        if (type === MailboxEmail) {
+        if (type === ChannelEmail) {
             return query;
         }
         if (type === MailboxTag) {
@@ -261,18 +262,18 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         // }
 
         await db.fileContents.asQuery()
-            .where(entity, (p) => (x) => x.appFiles.some((a) => a.email.mailboxes.some((m) => m.mailboxID === p.mailboxID)))
+            .where(entity, (p) => (x) => x.appFiles.some((a) => a.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID)))
             .update(void 0, (p) => (x) => ({
                 deleted: true
             }));
 
 
         await db.appFiles.asQuery()
-            .delete(entity, (p) => (x) => x.email.mailboxes.some((m) => m.mailboxID === p.mailboxID));
+            .delete(entity, (p) => (x) => x.email.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID));
 
 
         await db.emails.asQuery()
-            .delete(entity, (p) => (x) => x.mailboxes.some((m) => m.mailboxID === p.mailboxID));
+            .delete(entity, (p) => (x) => x.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID));
 
         await db.mailboxContactEmails.asQuery()
             .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
@@ -280,7 +281,7 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         await db.mailboxContactTags.asQuery()
             .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
 
-        await db.mailboxEmails.asQuery()
+        await db.channelEmails.asQuery()
             .delete(entity, (p) => (x) => x.mailboxID === p.mailboxID);
     }
 

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

@@ -23,8 +23,8 @@ export default class TagEvents extends AuthenticatedEvents<Tag> {
         const { userID } = this.sessionUser;
         return query.where({ userID }, (p) => (x) =>
             x.emailTags.some((et) =>
-                et.email.mailboxes.some((m) =>
-                    m.mailbox.userMailboxes.some((um) => um.userID === p.userID)
+                et.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)
                 )
             )

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

@@ -22,9 +22,9 @@ export default class TextDocumentEvents extends AuthenticatedEvents<TextDocument
                 || t.mailbox.userMailboxes.some((u) => u.userID === p.userID)
                 || t.mailbox.domain.hostedDomain.domainUsers.some((u) => u.userID === p.userID))
                 ||
-                af.email.mailboxes.some((um) =>
-                    um.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
-                    || um.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
+                af.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)
                 )
             )
         );

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

@@ -14,7 +14,7 @@ export default class ThreadParticipantEvents extends AuthenticatedEvents<ThreadP
         }
         const { userID } = this.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)
             )

package/src/server/seed/ui/seed-ui.ts

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.787";
+    const version = "1.4.9";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/channels/ChannelPageService.tsx

@@ -10,6 +10,7 @@ import { globalEnv } from "../../../common/globalEnv.js";
 import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import EncryptionService from "../encryption/EncryptionService.js";
+import EmailAddressService from "../EmailAddressService.js";
 
 const render = (parent: HTMLElement, { name, attributes, children }: XNode) => {
     const child = parent.ownerDocument.createElement(name);
@@ -61,6 +62,9 @@ export default class ChannelPageService {
     @Inject
     encryptionService: EncryptionService;
 
+    @Inject
+    eas: EmailAddressService;
+
     getMailboxEmail(mailboxSlug: string, postSlug: string) {
 
         mailboxSlug = mailboxSlug.toLowerCase();
@@ -77,14 +81,14 @@ export default class ChannelPageService {
         const emailID = Base36.decode(emailIDBase36) as any;
 
         if (mailboxSlug === "@") {
-            return this.db.mailboxEmails.where({ emailID}, (p) => (x) => x.emailID === p.emailID).first();
+            return this.db.channelEmails.where({ emailID}, (p) => (x) => x.emailID === p.emailID).first();
         }
 
         if(mailboxSlug.startsWith("@")) {
             mailboxSlug = mailboxSlug.substring(1) + "@%";
         }
 
-        return this.db.mailboxEmails.where({ emailID, mailboxSlug}, (p) => (x) => Sql.text.like(x.mailbox.emailAddress.emailAddress,p.mailboxSlug)
+        return this.db.channelEmails.where({ emailID, mailboxSlug}, (p) => (x) => Sql.text.like(x.mailbox.emailAddress.emailAddress,p.mailboxSlug)
             && x.emailID === p.emailID
         ).first();
     }
@@ -101,19 +105,21 @@ export default class ChannelPageService {
 
     async getEmailMeta(host, url, blogID, emailID) {
 
-        const email = await this.db.emails
+        const channelEmail = await this.db.channelEmails
             .where({ blogID, emailID }, (p) => (x) => x.emailID === p.emailID
-                && x.status === "published"
-                && x.mailboxes.some((m) => m.mailboxID === p.blogID))
-            .include((x) => [x.attachments])
+                && x.datePublished !== null)
+            .include((x) => [x.email])
             .firstOrFail();
 
-        const blog = await this.db.mailboxes
-            .where({ blogID }, (p) => (x) => x.mailboxID === p.blogID)
-            .include((x) => x.emailAddress)
-            .first();
+        if (channelEmail.previewFileID) {
+            await this.db.changeSet.getEntry(channelEmail).loadNavigationAsync((x) => x.previewFile);
+        }
+
+        const { email, previewFile } = channelEmail;
+
+        const blog = await this.eas.getHostedMailbox(blogID);
 
-        const title = email.subject;
+        const title = channelEmail.email.subject;
 
         const meta = [] as XNode[];
 
@@ -122,18 +128,17 @@ export default class ChannelPageService {
         meta.push(<meta property="og:type" content="article" />);
         meta.push(<meta property="og:site_name" content={blog.emailAddress.name} />);
         meta.push(<meta name="author" content={email.senderName}/>);
-        meta.push(<meta property="article:published_date" content={DateTime.from(email.dateSent ?? email.dateCreated).asJSDate.toUTCString()}/>);
-        meta.push(<meta property="article:publisher" content={email.senderName}/>);
+        meta.push(<meta property="article:published_date" content={DateTime.from(channelEmail.datePublished ?? channelEmail.datePublished).asJSDate.toUTCString()}/>);
+        meta.push(<meta property="article:publisher" content={blog.emailAddress.emailAddress}/>);
         if (email.summary) {
             meta.push(<meta property="og:description" content={email.summary}/>);
         }
 
         // find first image...
-        const firstImage = email.attachments?.find((x) => /^(image|video)/i.test(x.contentType));
-        if (firstImage) {
+        if (previewFile) {
             const cdn = globalEnv.cdn ?? host;
             const postID = this.encryptionService.general.encrypt(emailID);
-            meta.push(<meta property="og:image" content={`https://${cdn}/social-mail/cd/${host}/webp(300)/${postID}/${firstImage.appFileID}/${firstImage.name}/${firstImage.name}.300.webp`}/>);
+            meta.push(<meta property="og:image" content={`https://${cdn}/social-mail/cd/${host}/webp(300)/${postID}/${previewFile.appFileID}/${previewFile.name}/${previewFile.name}.300.webp`}/>);
         }
 
         return { meta, email, title };
@@ -161,7 +166,7 @@ export default class ChannelPageService {
 
             const e = await this.db.emails
                 .where({ blogID }, (p) => (x) => x.status === "published"
-                    && x.mailboxes.some((m) => m.mailboxID === p.blogID)
+                    && x.channelEmails.some((m) => m.mailboxID === p.blogID)
                 )
                 .orderByDescending(void 0, (p) => (x) => x.emailID)
                 .first();

package/src/server/services/dom/HtmlSanitizer.tsx

@@ -235,13 +235,14 @@ export default class HtmlSanitizer {
                         clean.ownerDocument.body.appendChild(emojiBar);
                     }
 
-                    emojiBar.setAttribute("style", "border: soild 1px lightgray; border-radius: 9999px; padding: 2px; padding-left: 5px; padding-right: 5px;");
+                    emojiBar.setAttribute("style", "border: solid 1px lightgray;border-radius: 9999px;padding: 2px;padding-left: 5px;" +
+                        "padding-right: 5px;display: table;margin-top: 20px;width: 100%;box-sizing: border-box;");
 
-                    const emojiButton = (emoji, label = "", body = emoji, mail = emoji) =>
+                    const emojiButton = (emoji, label = "", { body = emoji, mail = emoji, style=""} = {}) =>
                         ((<a
                             href={`mailto:${senderEmail}?subject=${emoji}:${messageID}&body=${body}`}
                             title={label}
-                            style="border-radius:9999px;padding:2px;padding-left:5px;padding-right:5px;text-decoration:none;"
+                            style={"border-radius:9999px;padding:2px;padding-left:5px;padding-right:5px;text-decoration:none;" + style}
                             ><emoji-button emoji={emoji}>{emoji}{label}</emoji-button>
                         </a>) as XNode).render();
 
@@ -249,9 +250,8 @@ export default class HtmlSanitizer {
                         ${ emojiButton("🙂")}
                         ${ emojiButton("👍")}
                         ${ emojiButton("✅")}
-                        ${emojiButton("💬", "Reply", "")}
-                        <div style="display:block;min-width:100px;height:10px;margin-left: auto;"/>
-                        ${ emojiButton("❌", "Unsubscribe")}
+                        ${emojiButton("💬", "Reply", { body: "" })}
+                        ${ emojiButton("❌", "Unsubscribe", { style: "display:table-cell; text-align: right;"})}
                     `;
                 } catch (error) {
                     console.error(error);

package/src/server/services/emails/UnreadCountService.ts

@@ -1,7 +1,7 @@
 import Inject, { RegisterTransient, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import UpdateUnreadCounts from "../../workflows/email/UpdateUnreadCounts.js";
-import MailboxEmail from "../../model/entities/MailboxEmail.js";
+import ChannelEmail from "../../model/entities/ChannelEmail.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import MailboxNamespace from "../socket/rooms/MailboxNamespace.js";