fix: support newsletter send targets

Author: ricardoSpara

.gitignore

@@ -35,6 +35,9 @@ lerna-debug.log*
 /instances/*
 !/instances/.gitkeep
 /test/
+!/test/
+/test/*
+!/test/createJid.test.ts
 /src/env.yml
 /store
 *.env

src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts

@@ -2342,7 +2342,7 @@ export class BaileysStartupService extends ChannelStartupService {
     this.logger.verbose(`Sending message to ${sender}`);
 
     try {
-      if (options?.delay) {
+      if (options?.delay && !isJidNewsletter(sender)) {
         this.logger.verbose(`Typing for ${options.delay}ms to ${sender}`);
         if (options.delay > 20000) {
           let remainingDelay = options.delay;
@@ -3577,8 +3577,9 @@ export class BaileysStartupService extends ChannelStartupService {
     const jids: {
       groups: { number: string; jid: string }[];
       broadcast: { number: string; jid: string }[];
+      newsletters: { number: string; jid: string }[];
       users: { number: string; jid: string; name?: string }[];
-    } = { groups: [], broadcast: [], users: [] };
+    } = { groups: [], broadcast: [], newsletters: [], users: [] };
 
     data.numbers.forEach((number) => {
       const jid = createJid(number);
@@ -3587,6 +3588,8 @@ export class BaileysStartupService extends ChannelStartupService {
         jids.groups.push({ number, jid });
       } else if (jid === 'status@broadcast') {
         jids.broadcast.push({ number, jid });
+      } else if (isJidNewsletter(jid)) {
+        jids.newsletters.push({ number, jid });
       } else {
         jids.users.push({ number, jid });
       }
@@ -3597,6 +3600,9 @@ export class BaileysStartupService extends ChannelStartupService {
     // BROADCAST
     onWhatsapp.push(...jids.broadcast.map(({ jid, number }) => new OnWhatsAppDto(jid, false, number)));
 
+    // NEWSLETTERS
+    onWhatsapp.push(...jids.newsletters.map(({ jid, number }) => new OnWhatsAppDto(jid, true, number)));
+
     // GROUPS
     const groups = await Promise.all(
       jids.groups.map(async ({ jid, number }) => {

src/utils/createJid.ts

@@ -35,7 +35,12 @@ function formatBRNumber(jid: string) {
 export function createJid(number: string): string {
   number = number.replace(/:\d+/, '');
 
-  if (number.includes('@g.us') || number.includes('@s.whatsapp.net') || number.includes('@lid')) {
+  if (
+    number.includes('@g.us') ||
+    number.includes('@s.whatsapp.net') ||
+    number.includes('@lid') ||
+    number.includes('@newsletter')
+  ) {
     return number;
   }
 

test/createJid.test.ts

@@ -0,0 +1,10 @@
+import assert from 'node:assert/strict';
+
+import { createJid } from '../src/utils/createJid';
+
+const newsletterJid = '120363410820597640@newsletter';
+
+assert.equal(createJid(newsletterJid), newsletterJid);
+assert.equal(createJid('120363425112220321@g.us'), '120363425112220321@g.us');
+
+console.log('createJid newsletter support ok');