add: support for @lid

Author: jrCleber

prisma/migrations/20251111153820_add_cl_lid/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Message" ADD COLUMN     "keyLid" VARCHAR(100),
+ADD COLUMN     "keyParticipantLid" VARCHAR(100),
+ALTER COLUMN "keyRemoteJid" DROP NOT NULL;

prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"

prisma/schema.prisma

@@ -88,21 +88,23 @@ enum DeviceMessage {
 }
 
 model Message {
-  id               Int             @id @default(autoincrement())
-  keyId            String          @db.VarChar(100)
-  keyRemoteJid     String          @db.VarChar(100)
-  keyFromMe        Boolean         @db.Boolean
-  keyParticipant   String?         @db.VarChar(100)
-  pushName         String?         @db.VarChar(100)
-  messageType      String          @db.VarChar(100)
-  content          Json            @db.JsonB
-  messageTimestamp Int             @db.Integer
-  device           DeviceMessage
-  isGroup          Boolean?        @db.Boolean
-  Instance         Instance        @relation(fields: [instanceId], references: [id], onDelete: Cascade)
-  instanceId       Int
-  MessageUpdate    MessageUpdate[]
-  Media            Media?
+  id                Int             @id @default(autoincrement())
+  keyId             String          @db.VarChar(100)
+  keyRemoteJid      String?         @db.VarChar(100)
+  keyLid            String?         @db.VarChar(100)
+  keyFromMe         Boolean         @db.Boolean
+  keyParticipant    String?         @db.VarChar(100)
+  keyParticipantLid String?         @db.VarChar(100)
+  pushName          String?         @db.VarChar(100)
+  messageType       String          @db.VarChar(100)
+  content           Json            @db.JsonB
+  messageTimestamp  Int             @db.Integer
+  device            DeviceMessage
+  isGroup           Boolean?        @db.Boolean
+  Instance          Instance        @relation(fields: [instanceId], references: [id], onDelete: Cascade)
+  instanceId        Int
+  MessageUpdate     MessageUpdate[]
+  Media             Media?
 
   @@index([keyId], name: "keyId")
 }

src/whatsapp/services/whatsapp.service.ts

@@ -69,7 +69,6 @@ import makeWASocket, {
   WAMessage,
   WAMessageUpdate,
   WASocket,
-  WAVersion,
 } from '@whiskeysockets/baileys';
 import {
   ConfigService,
@@ -847,10 +846,12 @@ export class WAStartupService {
 
           messagesRaw.push({
             keyId: m.key.id,
-            keyRemoteJid: this.normalizeJid(m.key),
             keyFromMe: m.key.fromMe,
             pushName: m?.pushName || m.key.remoteJid.split('@')[0],
-            keyParticipant: m?.participant || this.normalizeParticipant(m.key),
+            keyRemoteJid: m.key?.remoteJid,
+            keyLid: m.key?.['senderLid'] || m.key?.['senderPn'],
+            keyParticipant: m?.participant || m.key?.participant,
+            keyParticipantLid: m.key?.['participantLid'] || m.key?.['participantPn'],
             messageType,
             content: m.message[messageType] as PrismType.Prisma.JsonValue,
             messageTimestamp: timestamp,
@@ -926,11 +927,13 @@ export class WAStartupService {
 
         const messageRaw = {
           keyId: received.key.id,
-          keyRemoteJid: this.normalizeJid(received.key),
           keyFromMe: received.key.fromMe,
           pushName: received.pushName,
-          keyParticipant:
-            received?.participant || this.normalizeParticipant(received.key),
+          keyRemoteJid: received.key?.remoteJid,
+          keyLid: received.key?.['senderLid'] || received.key?.['senderPn'],
+          keyParticipant: received?.participant || received.key?.participant,
+          keyParticipantLid:
+            received.key?.['participantLid'] || received.key?.['participantPn'],
           messageType,
           content: JSON.parse(
             JSON.stringify(received.message[messageType]),
@@ -1238,14 +1241,6 @@ export class WAStartupService {
     }
   }
 
-  private normalizeJid(key: proto.IMessageKey) {
-    return key?.remoteJid || key?.['remoteJidAlt'] || key?.['lid'];
-  }
-
-  private normalizeParticipant(key: proto.IMessageKey) {
-    return key?.participant || key?.['participantAlt'];
-  }
-
   private createJid(number: string): string {
     if (
       number.includes('@g.us') ||
@@ -2078,7 +2073,7 @@ export class WAStartupService {
     for await (const number of data.numbers) {
       const jid = this.createJid(number);
       if (isLidUser(jid)) {
-        onWhatsapp.push(new OnWhatsAppDto(jid, !!true, jid));
+        onWhatsapp.push(new OnWhatsAppDto(jid, true, jid));
       }
       if (isJidGroup(jid)) {
         const group = await this.findGroup({ groupJid: jid }, 'inner');