@realvare/based 2.7.1 → 2.7.2

package/lib/Socket/messages-recv.js

@@ -235,12 +235,22 @@ const makeMessagesRecvSocket = (config) => {
             }
         }
     };
-    const handleGroupNotification = (participant, child, msg) => {
+    const handleGroupNotification = async (participant, child, groupJid, msg) => {
         var _a, _b, _c, _d;
-        const participantJid = WABinary_1.lidToJid(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant);
+        const participantJid = (((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant);
         switch (child === null || child === void 0 ? void 0 : child.tag) {
             case 'create':
-                const metadata = (0, groups_1.extractGroupMetadata)(child);
+                let metadata = (0, groups_1.extractGroupMetadata)(child);
+                const fullMetadata = await groupMetadata(groupJid);
+                if (metadata.owner && metadata.owner.endsWith('@lid')) {
+                    const found = fullMetadata.participants.find(p => p.id === metadata.owner);
+                    metadata.owner = found?.jid || (0, WABinary_1.lidToJid)(metadata.owner);
+                }
+                let resolvedAuthor = participant;
+                if (participant.endsWith('@lid')) {
+                    const found = fullMetadata.participants.find(p => p.id === participant);
+                    resolvedAuthor = found?.jid || (0, WABinary_1.lidToJid)(participant);
+                }
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE;
                 msg.messageStubParameters = [metadata.subject];
                 msg.key = { participant: metadata.owner };
@@ -251,7 +261,7 @@ const makeMessagesRecvSocket = (config) => {
                     }]);
                 ev.emit('groups.upsert', [{
                         ...metadata,
-                        author: participant
+                        author: resolvedAuthor
                     }]);
                 break;
             case 'ephemeral':
@@ -265,7 +275,7 @@ const makeMessagesRecvSocket = (config) => {
                 break;
             case 'modify':
                 const oldNumber = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
-                msg.messageStubParameters = oldNumber.map(j => WABinary_1.lidToJid(j)) || [];
+                msg.messageStubParameters = oldNumber || [];
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;
             case 'promote':
@@ -283,7 +293,7 @@ const makeMessagesRecvSocket = (config) => {
                     child.tag === 'remove') {
                     msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = participants.map(j => WABinary_1.lidToJid(j));
+                msg.messageStubParameters = participants;
                 break;
             case 'subject':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT;
@@ -331,10 +341,26 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
                 msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
                 break;
-                break;
             default:
             // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
+        // Resolve LIDs to real JIDs for all messageStubParameters
+        if (msg.messageStubParameters) {
+            const metadata = await groupMetadata(groupJid);
+            msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => {
+                if (typeof param === 'string' && param.endsWith('@lid')) {
+                    const found = metadata.participants.find(p => p.id === param);
+                    return found?.jid || (0, WABinary_1.lidToJid)(param);
+                }
+                return param;
+            }));
+        }
+        // Also resolve key.participant if needed
+        if (msg.key?.participant && msg.key.participant.endsWith('@lid')) {
+            const metadata = await groupMetadata(groupJid);
+            const found = metadata.participants.find(p => p.id === msg.key.participant);
+            msg.key.participant = found?.jid || (0, WABinary_1.lidToJid)(msg.key.participant);
+        }
     };
     const handleNewsletterNotification = (id, node) => {
         const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
@@ -407,7 +433,7 @@ const makeMessagesRecvSocket = (config) => {
                 handleMexNewsletterNotification(node.attrs.from, child);
                 break;
             case 'w:gp2':
-                handleGroupNotification(node.attrs.participant, child, result);
+                await handleGroupNotification(node.attrs.participant, child, from, result);
                 break;
             case 'mediaretry':
                 const event = (0, Utils_1.decodeMediaRetryNode)(node);
@@ -659,7 +685,6 @@ const makeMessagesRecvSocket = (config) => {
                             update: { status: WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK }
                         })));
                     }
-
                     if (attrs.type === 'retry') {
                         // correctly set who is asking for the retry
                         key.participant = key.participant || attrs.from;
@@ -1051,11 +1076,9 @@ const makeMessagesRecvSocket = (config) => {
     });
     ev.on('connection.update', (update) => {
         const { connection, lastDisconnect } = update;
-
         if (connection === 'close') {
             const statusCode = lastDisconnect?.error?.output?.statusCode;
             const shouldReconnect = statusCode !== Types_1.DisconnectReason.loggedOut;
-
             if (shouldReconnect) {
                 logger.info('Connection closed, will handle reconnection automatically');
             } else {
@@ -1064,14 +1087,12 @@ const makeMessagesRecvSocket = (config) => {
         } else if (connection === 'open') {
             sendActiveReceipts = true;
         }
-
         // Update sendActiveReceipts based on connection status
         if (typeof update.isOnline !== 'undefined') {
             sendActiveReceipts = update.isOnline;
             logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`);
         }
     });
-
     // Enhanced retry logic for stuck pending messages with anti-ban delays
     ev.on('messages.update', (updates) => {
         const config = (0, performance_config_1.getPerformanceConfig)();
@@ -1079,7 +1100,6 @@ const makeMessagesRecvSocket = (config) => {
             if (update.update.status === WAProto_1.proto.WebMessageInfo.Status.PENDING &&
                 Date.now() - (update.update.timestamp || 0) > 30000) { // 30 seconds
                 logger.debug({ key: update.key }, 'retrying stuck pending message with anti-ban delay');
-
                 // Apply anti-ban delay before retry
                 setTimeout(async () => {
                     try {
@@ -1104,4 +1124,4 @@ const makeMessagesRecvSocket = (config) => {
         requestPlaceholderResend,
     };
 };
-exports.makeMessagesRecvSocket = makeMessagesRecvSocket;
+exports.makeMessagesRecvSocket = makeMessagesRecvSocket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realvare/based",
-  "version": "2.7.01",
+  "version": "2.7.02",
   "description": "whatsapp api by sam",
   "keywords": [
     "baileys",