@social-mail/social-mail-web-server 1.7.539 → 1.7.541

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.539",
+  "version": "1.7.541",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/common/Hashtags.ts

@@ -1,6 +1,6 @@
 import { tokenizeRegex } from "../protocols/core/tokenizer.js";
 
-const tags = /((?<=\s)|^)(#\p{L}[\p{L}\d\-_\/]{2,200})/gmiu;
+const tags = /((?<=[\s,\.;])|^)(#\p{L}[\p{L}\d\-_\/]{2,200})/gmiu;
 
 export default class Hashtags {
 

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.mailboxContactEvents.some((m) =>
+            x.email.threadContacts.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/EmailEvents.ts

@@ -278,6 +278,22 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
                     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;
+                case "deleted":
+                    await this.db.channelEmails.where(entity, (p) => (x) => x.emailID === p.emailID && x.mailbox.isChannel === true)
+                        .update(entity, (p) => (x) => ({ datePublished: null }));
+
+                    // subtract tag counts...
+                    await this.db.mailboxTags.where(entity, (p) => (x) => x.tag.emailTags.some((e) => e.emailID === p.emailID))
+                        .update(void 0, (p) => (x) => ({
+                            count: Sql.math.max(0, x.count -1 )
+                        }));
+
+                    await this.db.mailboxContactTags.where(entity, (p) => (x) => x.tag.emailTags.some((e) => e.emailID === p.emailID))
+                        .update(void 0, (p) => (x) => ({
+                            count: Sql.math.max(0, x.count -1 )
+                        }));
+
+                    break;
                 default:
                     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/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.mailboxContactEvents.some((m) =>
+            x.email.threadContacts.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/TagEvents.ts

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

@@ -5,7 +5,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.8.111"
+        version: "1.8.115"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/smtp/services/EmailReferenceService.ts

@@ -13,7 +13,6 @@ import EngagementService from "./EngagementService.js";
 // import PostReceiveWorkflow from "../../workflows/post-receive/PostReceiveWorkflow.js";
 import Hashtags from "../../../common/Hashtags.js";
 import TagService from "../../services/tags/TagService.js";
-import EmailTag from "../../model/entities/EmailTag.js";
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 
 export type IMailboxThreadInfo = Partial<MailboxContact> & {

package/src/server/workflows/repair/counts/RepairEmailCountsWorkflow.ts

@@ -56,7 +56,7 @@ export default class RepairEmailCountsWorkflow extends Workflow<{ mailboxID? }>
         const q = db.emails
                 .where({ start, mailboxID }, (p) => (x) => x.emailID > p.start
                     && x.threadID === null
-                    && x.mailboxContactEvents.some((t) => t.mailboxID === p.mailboxID)
+                    && x.threadContacts.some((t) => t.mailboxID === p.mailboxID)
                     && x.lastReplyID === null
                 );
         const list = await q

package/src/server/workflows/repair/tags/RepairEmailTagsWorkflow.ts

@@ -108,7 +108,9 @@ export default class RepairEmailTagsWorkflow extends Workflow<{ mailboxID? }> {
                     tagID: x.tagID,
                     count: Sql.coll.sum(
                         x.emailTags.filter((e) =>
-                            e.email.threadContacts.some((m) =>
+                            e.email.status !== "draft"
+                            && e.email.status !== "deleted"
+                            && e.email.threadContacts.some((m) =>
                                 m.mailboxID === p.mailboxID
                                 && m.emailAddressID === p.emailAddressID
                             )
@@ -125,6 +127,9 @@ export default class RepairEmailTagsWorkflow extends Workflow<{ mailboxID? }> {
                         && x.emailTags.some((t) => t.tagID === p.tagID)
                     ).orderByDescending(void 0, (p) => (x) => x.dateCreated).first();
 
+                    if (!last) {
+                        continue;
+                    }
                     const dateUpdated = last.dateCreated;
 
                     await db.mailboxContactTags.statements.upsert({ emailAddressID, mailboxID, tagID, count, dateUpdated },
@@ -173,9 +178,12 @@ export default class RepairEmailTagsWorkflow extends Workflow<{ mailboxID? }> {
 
                     // get last updated...
                     const last = await db.emails.where({ tagID, mailboxID}, (p) => (x) =>
-                        x.mailboxContactEvents.some((m) => m.mailboxID === p.mailboxID)
+                        x.threadContacts.some((m) => m.mailboxID === p.mailboxID)
                         && x.emailTags.some((t) => t.tagID === p.tagID)
                     ).orderByDescending(void 0, (p) => (x) => x.dateCreated).first();
+                    if (!last) {
+                        continue;
+                    }
 
                     const dateUpdated = last.dateCreated;