@social-mail/social-mail-web-server 1.7.73 → 1.7.74

package/package.json

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

package/src/server/workflows/channel/BroadcastEmail.ts

@@ -41,6 +41,7 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
     }
 
     private from: string;
+    private threadID: number;
 
     async run() {
 
@@ -48,9 +49,10 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
         this.failedPreserveTime = TimeSpan.fromHours(1);
 
         if (!this.input.subscribe) {
-            const { from } = await this.publish();
+            const { from, threadID } = await this.publish();
 
             this.from = from;
+            this.threadID = threadID;
         }
 
         for (let i = 0; i < 10000; i++) {
@@ -115,7 +117,7 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
 
         // load email..
         const from = (await eas.getEmailAddress(this.input.mailboxID)).emailAddress;
-        return { from };
+        return { from, threadID: email.threadID };
 
     }
 
@@ -198,13 +200,15 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
                 && !x.emailAddress.subscriberActivities.some((sa) => sa.emailID === p.emailID)).include((x) => x.emailAddress);
         }
 
-        return db.mailboxContacts.where(this.input, (p) => (x) => x.mailboxID === p.mailboxID
+        const input = { ... this.input, threadID: this.threadID ?? this.input.emailID };
+
+        return db.mailboxContacts.where(input, (p) => (x) => x.mailboxID === p.mailboxID
             && x.emailAddressID !== p.mailboxID
             && !x.emailAddress.subscriberActivities.some((sa) => sa.emailID === p.emailID)
             && x.status === "active"
             && (x.subscriptionType === null
                 || x.subscriptionType === "all"
-                || x.mailbox.emails.some((ce) => ce.email.thread.threadParticipants.some((tp) => tp.emailAddressID === x.emailAddressID)) )
+                || x.mailbox.emails.some((ce) => ce.emailID === p.threadID && ce.email.threadParticipants.some((tp) => tp.emailAddressID === x.emailAddressID)) )
             )
             .include((x) => x.emailAddress);
     }