fix: add lid

Author: jrCleber

src/whatsapp/services/whatsapp.service.ts

@@ -644,7 +644,7 @@ export class WAStartupService {
             },
           })
           .then((result) => {
-            if (result?.id) {
+            if (result && result.id) {
               this.repository.chat
                 .update({
                   where: {
@@ -748,7 +748,7 @@ export class WAStartupService {
           } else {
             list.push(find);
           }
-          this.ws.send(this.instance.name, 'contacts.update', list);
+          this.ws.send(this.instance.name, 'contacts.upsert', list);
 
           await this.sendDataWebhook('contactsUpsert', list);
         } catch (error) {
@@ -813,7 +813,7 @@ export class WAStartupService {
 
           messagesRaw.push({
             keyId: m.key.id,
-            keyRemoteJid: m.key.remoteJid,
+            keyRemoteJid: m.key?.remoteJid || m.key?.['lid'],
             keyFromMe: m.key.fromMe,
             pushName: m?.pushName || m.key.remoteJid.split('@')[0],
             keyParticipant: m?.participant || m.key?.participant,
@@ -844,6 +844,7 @@ export class WAStartupService {
     }) => {
       for (const received of messages) {
         if (!received?.message) {
+          await this.client.waitForMessage(received.key.id)
           continue;
         }
 
@@ -863,7 +864,7 @@ export class WAStartupService {
 
         const messageRaw = {
           keyId: received.key.id,
-          keyRemoteJid: received.key.remoteJid,
+          keyRemoteJid: received.key?.remoteJid || received?.key?.['lid'],
           keyFromMe: received.key.fromMe,
           pushName: received.pushName,
           keyParticipant: received?.participant || received.key?.participant,
@@ -1171,7 +1172,7 @@ export class WAStartupService {
   }
 
   private createJid(number: string): string {
-    if (number.includes('@g.us') || number.includes('@s.whatsapp.net')) {
+    if (number.includes('@g.us') || number.includes('@s.whatsapp.net') || number.includes('@lid')) {
       return number;
     }
 
@@ -1327,7 +1328,7 @@ export class WAStartupService {
         return {
           keyId: m.key.id,
           keyFromMe: m.key.fromMe,
-          keyRemoteJid: m.key.remoteJid,
+          keyRemoteJid: m.key?.remoteJid || m.key?.['lid'],
           keyParticipant: m?.participant,
           pushName: m?.pushName,
           messageType: getContentType(m.message),
@@ -1353,10 +1354,12 @@ export class WAStartupService {
       messageSent['externalAttributes'] = options?.externalAttributes;
 
       this.ws.send(this.instance.name, 'send.message', messageSent);
+      this.ws.send(this.instance.name, 'messages.upsert', messageSent);
+      
       this.sendDataWebhook('sendMessage', messageSent).catch((error) =>
         this.logger.error(error),
       );
-       this.sendDataWebhook('messagesUpsert', messageSent).catch((error) =>
+      this.sendDataWebhook('messagesUpsert', messageSent).catch((error) =>
         this.logger.error(error),
       );
 
@@ -2094,7 +2097,20 @@ export class WAStartupService {
       });
 
       if (!everyOne) {
-        await this.client.chatModify({ clear: true }, message.keyRemoteJid);
+        await this.client.chatModify(
+          {
+            clear: {
+              messages: [
+                {
+                  id: message.keyId,
+                  fromMe: message.keyFromMe,
+                  timestamp: message.messageTimestamp,
+                },
+              ],
+            },
+          } as any,
+          message.keyRemoteJid,
+        );
       }
 
       await this.client.sendMessage(message.keyRemoteJid, {