fix(whatsapp): enhance contact and chat handling with improved JID ma…

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

@@ -1,4 +1,4 @@
 import { getCollectionsDto } from '@api/dto/business.dto';
 import { OfferCallDto } from '@api/dto/call.dto';
 import {
   ArchiveChatDto,
@@ -436,7 +436,7 @@
       qrcodeTerminal.generate(qr, { small: true }, (qrcode) =>
         this.logger.log(
           `\n{ instance: ${this.instance.name} pairingCode: ${this.instance.qrcode.pairingCode}, qrcodeCount: ${this.instance.qrcode.count} }\n` +
             qrcode,
         ),
       );
 
@@ -462,16 +462,16 @@
 
       const statusCode = (lastDisconnect?.error as Boom)?.output?.statusCode;
       const codesToNotReconnect = [DisconnectReason.loggedOut, DisconnectReason.forbidden, 402, 406];
       const shouldReconnect = !codesToNotReconnect.includes(statusCode);
 
       this.logger.info({
         message: 'Connection closed, evaluating reconnection',
         statusCode,
         shouldReconnect,
         instanceName: this.instance.name,
       });
 
       if (shouldReconnect) {
         // Add 3 second delay before reconnection to prevent rapid reconnection loops
         this.logger.info('Reconnecting in 3 seconds...');
         setTimeout(async () => {
@@ -488,7 +488,7 @@
 
         await this.prismaRepository.instance.update({
           where: { id: this.instanceId },
           data: {
             connectionStatus: 'close',
             disconnectionAt: new Date(),
             disconnectionReasonCode: statusCode,
@@ -1017,14 +1017,29 @@
         }
 
         const contactsMap = new Map();
+        const contactsMapLidJid = new Map();
 
         for (const contact of contacts) {
+          let jid = null;
+
+          if (contact?.id?.search('@lid') !== -1) {
+            if (contact.phoneNumber) {
+              jid = contact.phoneNumber;
+            }
+          }
+
+          if (!jid) {
+            jid = contact?.id;
+          }
+
           if (contact.id && (contact.notify || contact.name)) {
-            contactsMap.set(contact.id, { name: contact.name ?? contact.notify, jid: contact.id });
+            contactsMap.set(contact.id, { name: contact.name ?? contact.notify, jid });
           }
+
+          contactsMapLidJid.set(contact.id, { jid });
         }
 
-        const chatsRaw: { remoteJid: string; instanceId: string; name?: string }[] = [];
+        const chatsRaw: { remoteJid: string; remoteLid: string; instanceId: string; name?: string }[] = [];
         const chatsRepository = new Set(
           (await this.prismaRepository.chat.findMany({ where: { instanceId: this.instanceId } })).map(
             (chat) => chat.remoteJid,
@@ -1036,13 +1051,39 @@
             continue;
           }
 
-          chatsRaw.push({ remoteJid: chat.id, instanceId: this.instanceId, name: chat.name });
+          let remoteJid = null;
+          let remoteLid = null;
+
+          if (chat.id.search('@lid') !== -1) {
+            const contact = contactsMapLidJid.get(chat.id);
+
+            remoteLid = chat.id;
+
+            if (contact && contact.jid) {
+              remoteJid = contact.jid;
+            }
+          }
+
+          if (!remoteLid && chat.accountLid && chat.accountLid.search('@lid') !== -1) {
+            remoteLid = chat.accountLid;
+          }
+
+          if (!remoteJid) {
+            remoteJid = chat.id;
+          }
+
+          chatsRaw.push({ remoteJid, remoteLid, instanceId: this.instanceId, name: chat.name });
         }
 
         this.sendDataWebhook(Events.CHATS_SET, chatsRaw);
 
         if (this.configService.get<Database>('DATABASE').SAVE_DATA.HISTORIC) {
-          await this.prismaRepository.chat.createMany({ data: chatsRaw, skipDuplicates: true });
+          const chatsToCreateMany = JSON.parse(JSON.stringify(chatsRaw)).map((chat) => {
+            delete chat.remoteLid;
+            return chat;
+          });
+
+          await this.prismaRepository.chat.createMany({ data: chatsToCreateMany, skipDuplicates: true });
         }
 
         const messagesRaw: any[] = [];
@@ -1072,10 +1113,10 @@
 
           if (Long.isLong(m?.messageTimestamp)) {
             m.messageTimestamp = m.messageTimestamp?.toNumber();
           }
 
           if (this.configService.get<Chatwoot>('CHATWOOT').ENABLED) {
             if (m.messageTimestamp <= timestampLimitToImport) {
               continue;
             }
           }
@@ -1526,8 +1567,14 @@
           this.logger.verbose(messageRaw);
 
           sendTelemetry(`received.message.${messageRaw.messageType ?? 'unknown'}`);
-          if ((messageRaw.key as any).remoteJid?.includes('@lid') && (messageRaw.key as any).remoteJidAlt) {
-            (messageRaw.key as any).remoteJid = (messageRaw.key as any).remoteJidAlt;
+
+          if (messageRaw.key.remoteJid?.includes('@lid') && messageRaw.key.remoteJidAlt) {
+            const lid = messageRaw.key.remoteJid;
+
+            messageRaw.key.remoteJid = messageRaw.key.remoteJidAlt;
+            messageRaw.key.remoteJidAlt = lid;
+
+            messageRaw.key.addressingMode = 'pn';
           }
           console.log(messageRaw);