@yemo-dev/yebail 1.1.2 → 1.1.3

package/EXAMPLES.md

@@ -1,9 +1,13 @@
-# yebails code examples (`sendMessage`)
+# yebail code examples (`sendMessage`)
+
+> [!NOTE]
+> **Mengapa yebail bknnya yebails?**
+> Karena `yebail` adalah suksesor dari `yebails` yang mendukung fitur pesan interaktif lebih lengkap (seperti full button, native flow, dll) dan optimalisasi untuk WhatsApp versi terbaru.
 
 GitHub-only distribution. After `npm install` or `npm install github:yemo-dev/baileys`:
 
 ```js
-const makeWASocket = require('yebails').default
+const makeWASocket = require('@yemo-dev/yebail').default
 ```
 
 From a local clone (without global install):
@@ -23,7 +27,7 @@ yebails supports **local** and **cloud** databases the same way: you choose how
 ### 1) Filesystem (default)
 
 ```js
-const { default: makeWASocket, useMultiFileAuthState } = require('yebails')
+const { default: makeWASocket, useMultiFileAuthState } = require('@yemo-dev/yebail')
 
 const { state, saveCreds } = await useMultiFileAuthState('./auth_info_baileys')
 const sock = makeWASocket({ auth: state })
@@ -35,7 +39,7 @@ sock.ev.on('creds.update', saveCreds)
 Install the optional native driver: `npm install better-sqlite3`
 
 ```js
-const { default: makeWASocket, useSqliteAuthState } = require('yebails')
+const { default: makeWASocket, useSqliteAuthState } = require('@yemo-dev/yebail')
 
 const { state, saveCreds } = await useSqliteAuthState('./wa-session.db')
 const sock = makeWASocket({ auth: state })
@@ -50,7 +54,7 @@ Implement three async functions: **`get(key)`** → JSON string or `null`, **`se
 
 ```js
 const Redis = require('ioredis')
-const { default: makeWASocket, useCustomAuthState } = require('yebails')
+const { default: makeWASocket, useCustomAuthState } = require('@yemo-dev/yebail')
 
 const redis = new Redis(process.env.REDIS_URL)
 const prefix = 'yebails:session:'
@@ -626,16 +630,88 @@ await sock.sendMessage(jid, {
 })
 ```
 
-## AI marker (send option)
+---
+
+## Interactive Messages (Buttons & Native Flow)
+
+`yebails` supports the latest WhatsApp interactive message formats:
+
+### 1) Buttons Message
+```js
+await sock.sendMessage(jid, {
+    text: "Pilih Menu",
+    footer: "yebail-pro",
+    buttons: [
+        { buttonId: 'id1', buttonText: { displayText: 'Button 1' }, type: 1 },
+        { buttonId: 'id2', buttonText: { displayText: 'Button 2' }, type: 1 }
+    ],
+    headerType: 1
+})
+```
+
+### 2) List Message
+```js
+await sock.sendMessage(jid, {
+    text: "Daftar Layanan",
+    footer: "yebail-pro",
+    title: "Silakan Pilih",
+    buttonText: "Klik di sini",
+    sections: [
+        {
+            title: "Kategori 1",
+            rows: [
+                { title: "Opsi 1", rowId: "opt1", description: "Deskripsi 1" },
+                { title: "Opsi 2", rowId: "opt2", description: "Deskripsi 2" }
+            ]
+        }
+    ]
+})
+```
 
+### 3) Native Flow Message (Full Buttons)
 ```js
-await sock.sendMessage(jid, { text: 'Hello' }, { ai: true })
+await sock.sendMessage(jid, {
+    viewOnceMessage: {
+        message: {
+            interactiveMessage: {
+                header: { title: "Header Title" },
+                body: { text: "Body Text" },
+                footer: { text: "Footer Text" },
+                nativeFlowMessage: {
+                    buttons: [
+                        {
+                            name: "cta_url",
+                            buttonParamsJson: JSON.stringify({
+                                display_text: "Buka Google",
+                                url: "https://google.com",
+                                merchant_url: "https://google.com"
+                            })
+                        },
+                        {
+                            name: "quick_reply",
+                            buttonParamsJson: JSON.stringify({
+                                display_text: "Balas Cepat",
+                                id: "reply_id"
+                            })
+                        }
+                    ]
+                }
+            }
+        }
+    }
+})
 ```
 
+### 4) Status Mentions
+```js
+await sock.sendStatusMentions({
+    image: { url: './status.jpg' },
+    caption: 'Hello Status!'
+}, ['6281234567890@s.whatsapp.net', '6289876543210@s.whatsapp.net'])
+
 ---
 
 ## Notes
 
 - Native button names (`name` in `interactiveButtons`) must match what the server expects; the examples above follow common Baileys patterns.
 - Some message types are only stable in private chats or only available for business accounts.
-- For `relayMessage` with an AI flag, use uppercase `AI: true` according to your socket implementation.

package/README.md

@@ -1,6 +1,10 @@
 # @yemo-dev/yebail
 
-**@yemo-dev/yebail** is a high-performance, WebSocket-based WhatsApp Web API library. It is a specialized distribution of Baileys, optimized for stability and automated version tracking.
+**@yemo-dev/yebail** is a high-performance, WebSocket-based WhatsApp Web API library. It is a specialized, feature-rich distribution of Baileys, optimized for interactive messages and automated version tracking.
+
+> [!NOTE]
+> **Mengapa yebail bknnya yebails?**
+> Karena `yebail` adalah suksesor dari `yebails` yang mendukung fitur pesan interaktif lebih lengkap (seperti full button, native flow, dll) dan optimalisasi untuk WhatsApp versi terbaru.
 
 > [!TIP]
 > This version is maintained with an **Auto-Update** system that tracks the latest WhatsApp Web revisions to ensure continuous compatibility.
@@ -29,7 +33,7 @@ npm install github:yemo-dev/baileys
 
 ## Import
 
-After installing from npm, the module name is `@yemo-dev/yebail`:
+After installing from npm, the module name is `@yemo-dev/yebails`:
 
 ```js
 const { 

package/lib/Socket/messages-send.js

@@ -268,21 +268,51 @@ const makeMessagesSocket = (config) => {
         }));
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
-        var _a;
+    const profilePictureUrl = async (jid) => {
+        if ((0, WABinary_1.isJidNewsletter)(jid)) {
+            const metadata = await sock.newsletterMetadata('JID', jid);
+            return (0, Utils_1.getUrlFromDirectPath)(metadata.thread_metadata.picture?.direct_path || '');
+        }
+        else {
+            const result = await query({
+                tag: 'iq',
+                attrs: {
+                    target: (0, WABinary_1.jidNormalizedUser)(jid),
+                    to: WABinary_1.S_WHATSAPP_NET,
+                    type: 'get',
+                    xmlns: 'w:profile:picture'
+                },
+                content: [{
+                        tag: 'picture',
+                        attrs: {
+                            type: 'image',
+                            query: 'url'
+                        }
+                    }]
+            });
+            const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
+            return child?.attrs?.url || null;
+        }
+    };
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, additionalNodes }) => {
         const meId = authState.creds.me.id;
-        let shouldIncludeDeviceIdentity = false;
-        const { user, server } = (0, WABinary_1.jidDecode)(jid);
+        const meLid = authState.creds.me?.lid;
+        const isRetryResend = Boolean(participant?.jid);
+        let shouldIncludeDeviceIdentity = isRetryResend;
+        let didPushAdditional = false;
         const statusJid = 'status@broadcast';
+        const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const isGroup = server === 'g.us';
-        const isNewsletter = server === 'newsletter';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
-        msgId = msgId || (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id);
+        const isNewsletter = server === 'newsletter';
+        const isGroupOrStatus = isGroup || isStatus;
+        const finalJid = jid;
+        msgId = msgId || (0, Utils_1.generateMessageID)(meId);
         useUserDevicesCache = useUserDevicesCache !== false;
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
         const participants = [];
-        const destinationJid = (!isStatus) ? (0, WABinary_1.jidEncode)(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
+        const destinationJid = !isStatus ? finalJid : statusJid;
         const binaryNodeContent = [];
         const devices = [];
         const meMsg = {
@@ -293,34 +323,63 @@ const makeMessagesSocket = (config) => {
             messageContextInfo: message.messageContextInfo
         };
         const extraAttrs = {};
+        const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/;
+        const messages = (0, Utils_1.normalizeMessageContent)(message);
+        const buttonType = getButtonType(messages);
+        const pollMessage = messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3;
         if (participant) {
-            // when the retry request is not for a group
-            // only send to the specific device that asked for a retry
-            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
-                additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
+                additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };
             }
             const { user, device } = (0, WABinary_1.jidDecode)(participant.jid);
-            devices.push({ user, device });
+            devices.push({
+                user,
+                device,
+                jid: participant.jid
+            });
         }
         await authState.keys.transaction(async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
             const mediaType = getMediaType(message);
             if (mediaType) {
                 extraAttrs['mediatype'] = mediaType;
             }
-            if ((_a = (0, Utils_1.normalizeMessageContent)(message)) === null || _a === void 0 ? void 0 : _a.pinInChatMessage) {
+            if (isNewsletter) {
+                const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
+                const bytes = (0, Utils_1.encodeNewsletterMessage)(patched);
+                binaryNodeContent.push({
+                    tag: 'plaintext',
+                    attrs: {},
+                    content: bytes
+                });
+                const stanza = {
+                    tag: 'message',
+                    attrs: {
+                        to: jid,
+                        id: msgId,
+                        type: getTypeMessage(message),
+                        ...(additionalAttributes || {})
+                    },
+                    content: binaryNodeContent
+                };
+                logger.debug({ msgId }, `sending newsletter message to ${jid}`);
+                await sendNode(stanza);
+                return;
+            }
+            if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
                 extraAttrs['decrypt-fail'] = 'hide';
             }
-            if (isGroup || isStatus) {
+            if (messages.interactiveResponseMessage?.nativeFlowResponseMessage) {
+                extraAttrs['native_flow_name'] = messages.interactiveResponseMessage.nativeFlowResponseMessage?.name || 'menu_options';
+            }
+            if (isGroupOrStatus && !isRetryResend) {
                 const [groupData, senderKeyMap] = await Promise.all([
                     (async () => {
                         let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined;
-                        if (groupData && Array.isArray(groupData === null || groupData === void 0 ? void 0 : groupData.participants)) {
+                        if (groupData && Array.isArray(groupData?.participants)) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
                         else if (!isStatus) {
-                            groupData = await groupMetadata(jid);
+                            groupData = await sock.groupMetadata(jid);
                         }
                         return groupData;
                     })(),
@@ -332,125 +391,169 @@ const makeMessagesSocket = (config) => {
                         return {};
                     })()
                 ]);
-                if (!participant) {
-                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : [];
-                    if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList);
-                    }
-                    if (!isStatus) {
-                        additionalAttributes = {
-                            ...additionalAttributes,
-                            // eslint-disable-next-line camelcase
-                            addressing_mode: (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) || 'pn'
-                        };
-                    }
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false, ((_k = message.protocolMessage) === null || _k === void 0 ? void 0 : _k.type) === WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE);
-                    devices.push(...additionalDevices);
+                const participantsList = groupData ? groupData.participants.map(p => p.id) : [];
+                if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
+                    additionalAttributes = {
+                        ...additionalAttributes,
+                        expiration: groupData.ephemeralDuration.toString()
+                    };
+                }
+                if (isStatus && statusJidList) {
+                    participantsList.push(...statusJidList);
+                }
+                const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                devices.push(...additionalDevices);
+                if (isGroup) {
+                    additionalAttributes = {
+                        ...additionalAttributes,
+                        addressing_mode: groupData?.addressingMode || 'lid'
+                    };
                 }
                 const patched = await patchMessageBeforeSending(message);
                 if (Array.isArray(patched)) {
                     throw new boom_1.Boom('Per-jid patching is not supported in groups');
                 }
                 const bytes = (0, Utils_1.encodeWAMessage)(patched);
+                const groupAddressingMode = additionalAttributes?.['addressing_mode'] || groupData?.addressingMode || 'lid';
+                const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId;
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
-                    meId,
+                    meId: groupSenderIdentity
                 });
-                const senderKeyJids = [];
-                // ensure a connection is established with every device
-                for (const { user, device } of devices) {
-                    const jid = (0, WABinary_1.jidEncode)(user, (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) === 'lid' ? 'lid' : 's.whatsapp.net', device);
-                    if (!senderKeyMap[jid] || !!participant) {
-                        senderKeyJids.push(jid);
-                        // store that this person has had the sender keys sent to them
-                        senderKeyMap[jid] = true;
+                const senderKeyRecipients = [];
+                for (const device of devices) {
+                    const deviceJid = device.jid;
+                    const hasKey = !!senderKeyMap[deviceJid];
+                    if ((!hasKey || !!participant) &&
+                        !(0, WABinary_1.isHostedLidUser)(deviceJid) &&
+                        !(0, WABinary_1.isHostedPnUser)(deviceJid) &&
+                        device.device !== 99) {
+                        senderKeyRecipients.push(deviceJid);
+                        senderKeyMap[deviceJid] = true;
                     }
                 }
-                // if there are some participants with whom the session has not been established
-                // if there are, we re-send the senderkey
-                if (senderKeyJids.length) {
-                    logger.debug({ senderKeyJids }, 'sending new sender key');
+                if (senderKeyRecipients.length) {
+                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key');
                     const senderKeyMsg = {
                         senderKeyDistributionMessage: {
                             axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
                             groupId: destinationJid
                         }
                     };
-                    await assertSessions(senderKeyJids, false);
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, extraAttrs);
+                    const senderKeySessionTargets = senderKeyRecipients;
+                    await assertSessions(senderKeySessionTargets);
+                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
                 binaryNodeContent.push({
                     tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg' },
+                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
                     content: ciphertext
                 });
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
-            else if (isNewsletter) {
-                // Message edit
-                if ((_b = message.protocolMessage) === null || _b === void 0 ? void 0 : _b.editedMessage) {
-                    msgId = (_c = message.protocolMessage.key) === null || _c === void 0 ? void 0 : _c.id;
-                    message = message.protocolMessage.editedMessage;
+            else if (!isGroupOrStatus && !isRetryResend) {
+                /** ADDRESSING CONSISTENCY: Match own identity to conversation context **/
+                let ownId = meId;
+                if (isLid && meLid) {
+                    ownId = meLid;
+                    logger.debug({ to: jid, ownId }, 'Using LID identity for @lid conversation');
                 }
-                // Message delete
-                if (((_d = message.protocolMessage) === null || _d === void 0 ? void 0 : _d.type) === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = (_e = message.protocolMessage.key) === null || _e === void 0 ? void 0 : _e.id;
-                    message = {};
-                }
-                const patched = await patchMessageBeforeSending(message, []);
-                if (Array.isArray(patched)) {
-                    throw new boom_1.Boom('Per-jid patching is not supported in channel');
+                else {
+                    logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation');
                 }
-                const bytes = (0, Utils_1.encodeNewsletterMessage)(patched);
-                binaryNodeContent.push({
-                    tag: 'plaintext',
-                    attrs: mediaType ? { mediatype: mediaType } : {},
-                    content: bytes
+                const { user: ownUser } = (0, WABinary_1.jidDecode)(ownId);
+                const targetUserServer = isLid ? 'lid' : 's.whatsapp.net';
+                devices.push({
+                    user,
+                    device: 0,
+                    jid: (0, WABinary_1.jidEncode)(user, targetUserServer, 0)
                 });
-            }
-            else {
-                const { user: meUser } = (0, WABinary_1.jidDecode)(meId);
-                if (!participant) {
-                    devices.push({ user });
-                    if (user !== meUser) {
-                        devices.push({ user: meUser });
-                    }
-                    if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true, ((_k = message.protocolMessage) === null || _k === void 0 ? void 0 : _k.type) === WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE);
-                        devices.push(...additionalDevices);
-                    }
+                if (user !== ownUser) {
+                    const ownUserServer = isLid ? 'lid' : 's.whatsapp.net';
+                    const ownUserForAddressing = isLid && meLid ? (0, WABinary_1.jidDecode)(meLid).user : (0, WABinary_1.jidDecode)(meId).user;
+                    devices.push({
+                        user: ownUserForAddressing,
+                        device: 0,
+                        jid: (0, WABinary_1.jidEncode)(ownUserForAddressing, ownUserServer, 0)
+                    });
                 }
-                const allJids = [];
-                const meJids = [];
-                const otherJids = [];
-                for (const { user, device } of devices) {
-                    const isMe = user === meUser;
-                    const jid = (0, WABinary_1.jidEncode)(isMe && isLid ? ((_g = (_f = authState.creds) === null || _f === void 0 ? void 0 : _f.me) === null || _g === void 0 ? void 0 : _g.lid.split(':')[0]) || user : user, isLid ? 'lid' : 's.whatsapp.net', device);
+                if (additionalAttributes?.['category'] !== 'peer') {
+                    devices.length = 0;
+                    const senderIdentity = isLid && meLid
+                        ? (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(meLid)?.user, 'lid', undefined)
+                        : (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(meId)?.user, 's.whatsapp.net', undefined);
+                    const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false);
+                    devices.push(...sessionDevices);
+                    logger.debug({
+                        deviceCount: devices.length,
+                        devices: devices.map(d => `${d.user}:${d.device}@${(0, WABinary_1.jidDecode)(d.jid)?.server}`)
+                    }, 'Device enumeration complete with unified addressing');
+                }
+                const allRecipients = [];
+                const meRecipients = [];
+                const otherRecipients = [];
+                const { user: mePnUser } = (0, WABinary_1.jidDecode)(meId);
+                const { user: meLidUser } = meLid ? (0, WABinary_1.jidDecode)(meLid) : { user: null };
+                for (const { user, jid } of devices) {
+                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
+                    if (isExactSenderDevice) {
+                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device');
+                        continue;
+                    }
+                    const isMe = user === mePnUser || user === meLidUser;
                     if (isMe) {
-                        meJids.push(jid);
+                        meRecipients.push(jid);
                     }
                     else {
-                        otherJids.push(jid);
+                        otherRecipients.push(jid);
                     }
-                    allJids.push(jid);
+                    allRecipients.push(jid);
                 }
-                await assertSessions(allJids, false);
+                await assertSessions(allRecipients);
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
-                    createParticipantNodes(meJids, meMsg, extraAttrs),
-                    createParticipantNodes(otherJids, message, extraAttrs)
+                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
+                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
                 ]);
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
+                if (meRecipients.length > 0 || otherRecipients.length > 0) {
+                    extraAttrs['phash'] = (0, Utils_1.generateParticipantHashV2)([...meRecipients, ...otherRecipients]);
+                }
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
+            if (isRetryResend) {
+                const isParticipantLid = (0, WABinary_1.isLidUser)(participant.jid);
+                const isMe = (0, WABinary_1.areJidsSameUser)(participant.jid, isParticipantLid ? meLid : meId);
+                const encodedMessageToSend = isMe
+                    ? (0, Utils_1.encodeWAMessage)({
+                        deviceSentMessage: {
+                            destinationJid,
+                            message
+                        }
+                    })
+                    : (0, Utils_1.encodeWAMessage)(message);
+                const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
+                    data: encodedMessageToSend,
+                    jid: participant.jid
+                });
+                binaryNodeContent.push({
+                    tag: 'enc',
+                    attrs: {
+                        v: '2',
+                        type,
+                        count: participant.count.toString()
+                    },
+                    content: encryptedContent
+                });
+            }
             if (participants.length) {
-                if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) === 'peer') {
-                    const peerNode = (_j = (_h = participants[0]) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j[0];
+                if (additionalAttributes?.['category'] === 'peer') {
+                    const peerNode = participants[0]?.content?.[0];
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode); // push only enc
+                        binaryNodeContent.push(peerNode);
                     }
                 }
                 else {
@@ -465,14 +568,12 @@ const makeMessagesSocket = (config) => {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    type: isNewsletter ? getTypeMessage(message) : 'text',
+                    to: destinationJid,
+                    type: getTypeMessage(message),
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
             };
-            // if the participant to send to is explicitly specified (generally retry recp)
-            // ensure the message is only sent to that person
-            // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
                 if ((0, WABinary_1.isJidGroup)(destinationJid)) {
                     stanza.attrs.to = destinationJid;
@@ -497,14 +598,47 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            if (additionalNodes && additionalNodes.length > 0) {
-                stanza.content.push(...additionalNodes);
+            const contactTcTokenData = !isGroup && !isRetryResend && !isStatus ? await authState.keys.get('tctoken', [destinationJid]) : {};
+            const tcTokenBuffer = contactTcTokenData[destinationJid]?.token;
+            if (tcTokenBuffer) {
+                stanza.content.push({
+                    tag: 'tctoken',
+                    attrs: {},
+                    content: tcTokenBuffer
+                });
             }
-            const messages = (0, Utils_1.normalizeMessageContent)(message);
-            const buttonType = getButtonType(messages);
-            if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && buttonType) {
-                const bizNode = getButtonArgs(messages);
-                stanza.content.push(bizNode);
+            if (isGroup && regexGroupOld.test(jid) && !message.reactionMessage) {
+                stanza.content.push({
+                    tag: 'multicast',
+                    attrs: {}
+                });
+            }
+            if (pollMessage || messages.eventMessage) {
+                stanza.content.push({
+                    tag: 'meta',
+                    attrs: messages.eventMessage ? {
+                        event_type: 'creation'
+                    } : isNewsletter ? {
+                        polltype: 'creation',
+                        contenttype: pollMessage?.pollContentType === 2 ? 'image' : 'text'
+                    } : {
+                        polltype: 'creation'
+                    }
+                });
+            }
+            if (!isNewsletter && buttonType) {
+                const buttonsNode = getButtonArgs(messages);
+                const filteredButtons = (0, WABinary_1.getBinaryFilteredButtons)(additionalNodes ? additionalNodes : []);
+                if (filteredButtons) {
+                    stanza.content.push(...additionalNodes);
+                    didPushAdditional = true;
+                }
+                else {
+                    stanza.content.push(buttonsNode);
+                }
+            }
+            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
             }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
@@ -512,28 +646,17 @@ const makeMessagesSocket = (config) => {
         return msgId;
     };
     const getTypeMessage = (msg) => {
-        if (msg.viewOnceMessage) {
-            return getTypeMessage(msg.viewOnceMessage.message);
-        }
-        else if (msg.viewOnceMessageV2) {
-            return getTypeMessage(msg.viewOnceMessageV2.message);
-        }
-        else if (msg.viewOnceMessageV2Extension) {
-            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
-        }
-        else if (msg.ephemeralMessage) {
-            return getTypeMessage(msg.ephemeralMessage.message);
-        }
-        else if (msg.documentWithCaptionMessage) {
-            return getTypeMessage(msg.documentWithCaptionMessage.message);
+        const message = (0, Utils_1.normalizeMessageContent)(msg);
+        if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
+            return 'poll';
         }
-        else if (msg.reactionMessage) {
+        else if (message.reactionMessage) {
             return 'reaction';
         }
-        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
-            return 'poll';
+        else if (message.eventMessage) {
+            return 'event';
         }
-        else if (getMediaType(msg)) {
+        else if (getMediaType(message)) {
             return 'media';
         }
         else {
@@ -544,27 +667,39 @@ const makeMessagesSocket = (config) => {
         if (message.imageMessage) {
             return 'image';
         }
+        else if (message.stickerMessage) {
+            return message.stickerMessage.isLottie ? '1p_sticker' : message.stickerMessage.isAvatar ? 'avatar_sticker' : 'sticker';
+        }
         else if (message.videoMessage) {
             return message.videoMessage.gifPlayback ? 'gif' : 'video';
         }
         else if (message.audioMessage) {
             return message.audioMessage.ptt ? 'ptt' : 'audio';
         }
+        else if (message.ptvMessage) {
+            return 'ptv';
+        }
+        else if (message.albumMessage) {
+            return 'collection';
+        }
         else if (message.contactMessage) {
             return 'vcard';
         }
         else if (message.documentMessage) {
             return 'document';
         }
+        else if (message.stickerPackMessage) {
+            return 'sticker_pack';
+        }
         else if (message.contactsArrayMessage) {
             return 'contact_array';
         }
+        else if (message.locationMessage) {
+            return 'location';
+        }
         else if (message.liveLocationMessage) {
             return 'livelocation';
         }
-        else if (message.stickerMessage) {
-            return 'sticker';
-        }
         else if (message.listMessage) {
             return 'list';
         }
@@ -583,7 +718,13 @@ const makeMessagesSocket = (config) => {
         else if (message.interactiveResponseMessage) {
             return 'native_flow_response';
         }
-        else if (message.groupInviteMessage) {
+        else if (/https:\/\/wa\.me\/c\/\d+/.test(message.extendedTextMessage?.text)) {
+            return 'cataloglink';
+        }
+        else if (/https:\/\/wa\.me\/p\/\d+\/\d+/.test(message.extendedTextMessage?.text)) {
+            return 'productlink';
+        }
+        else if (message.extendedTextMessage?.matchedText || message.groupInviteMessage) {
             return 'url';
         }
     };
@@ -599,9 +740,8 @@ const makeMessagesSocket = (config) => {
         }
     };
     const getButtonArgs = (message) => {
-        var _a, _b;
         const nativeFlow = message.interactiveMessage?.nativeFlowMessage;
-        const firstButtonName = (_b = (_a = nativeFlow === null || nativeFlow === void 0 ? void 0 : nativeFlow.buttons) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.name;
+        const firstButtonName = nativeFlow?.buttons?.[0]?.name;
         const nativeFlowSpecials = [
             'mpm', 'cta_catalog', 'send_location',
             'call_permission_request', 'wa_payment_transaction_details',
@@ -615,8 +755,8 @@ const makeMessagesSocket = (config) => {
                 }
             };
         }
-        if (nativeFlow && nativeFlowSpecials.includes(firstButtonName)) {
-            // Only works for WhatsApp Original, not WhatsApp Business
+        else if (nativeFlow && nativeFlowSpecials.includes(firstButtonName)) {
+            /** Only works for WhatsApp Original, not WhatsApp Business **/
             return {
                 tag: 'biz',
                 attrs: {
@@ -646,8 +786,8 @@ const makeMessagesSocket = (config) => {
                     }]
             };
         }
-        if (nativeFlow || message.buttonsMessage) {
-            // It works for WhatsApp original and WhatsApp business
+        else if (nativeFlow || message.buttonsMessage) {
+            /** It works for whatsapp original and whatsapp business **/
             return {
                 tag: 'biz',
                 attrs: {
@@ -677,7 +817,7 @@ const makeMessagesSocket = (config) => {
                     }]
             };
         }
-        if (message.listMessage) {
+        else if (message.listMessage) {
             return {
                 tag: 'biz',
                 attrs: {
@@ -700,14 +840,16 @@ const makeMessagesSocket = (config) => {
                     }]
             };
         }
-        return {
-            tag: 'biz',
-            attrs: {
-                actual_actors: '2',
-                host_storage: '2',
-                privacy_mode_ts: (0, Utils_1.unixTimestampSeconds)().toString()
-            }
-        };
+        else {
+            return {
+                tag: 'biz',
+                attrs: {
+                    actual_actors: '2',
+                    host_storage: '2',
+                    privacy_mode_ts: (0, Utils_1.unixTimestampSeconds)().toString()
+                }
+            };
+        }
     };
     const updateMemberLabel = (jid, memberLabel) => relayMessage(jid, {
         protocolMessage: {
@@ -756,6 +898,30 @@ const makeMessagesSocket = (config) => {
         return result;
     };
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
+    const sendStatusMentions = async (content, jids) => {
+        const msg = await (0, Utils_1.generateWAMessage)(WABinary_1.S_WHATSAPP_NET, content, {
+            logger,
+            userJid: authState.creds.me.id,
+            getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
+                thumbnailWidth: linkPreviewImageThumbnailWidth,
+                fetchOpts: {
+                    timeout: 3000,
+                    ...axiosOptions || {}
+                },
+                logger,
+                uploadImage: generateHighQualityLinkPreview
+                    ? waUploadToServer
+                    : undefined
+            }),
+            getProfilePicUrl: profilePictureUrl,
+            upload: waUploadToServer,
+            mediaCache: config.mediaCache,
+            options: config.options
+        });
+        return relayMessage('status@broadcast', msg.message, {
+            statusJidList: jids
+        });
+    };
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
@@ -773,6 +939,8 @@ const makeMessagesSocket = (config) => {
         sendPeerDataOperationMessage,
         updateMemberLabel,
         messageRetryManager,
+        profilePictureUrl,
+        sendStatusMentions,
         updateMediaMessage: async (message) => {
             const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;

package/lib/WABinary/generic-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBinaryNodeMessages = exports.reduceBinaryNodeToDictionary = exports.assertNodeErrorFree = exports.getBinaryNodeChildUInt = exports.getBinaryNodeChildString = exports.getBinaryNodeChildBuffer = exports.getBinaryNodeChild = exports.getAllBinaryNodeChildren = exports.getBinaryNodeChildren = void 0;
+exports.getBinaryFilteredBizBot = exports.getBinaryFilteredButtons = exports.getBinaryNodeMessages = exports.reduceBinaryNodeToDictionary = exports.assertNodeErrorFree = exports.getBinaryNodeChildUInt = exports.getBinaryNodeChildString = exports.getBinaryNodeChildBuffer = exports.getBinaryNodeChild = exports.getAllBinaryNodeChildren = exports.getBinaryNodeChildren = void 0;
 exports.binaryNodeToString = binaryNodeToString;
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
@@ -79,6 +79,26 @@ const getBinaryNodeMessages = ({ content }) => {
     return msgs;
 };
 exports.getBinaryNodeMessages = getBinaryNodeMessages;
+const getBinaryFilteredButtons = (nodeContent) => {
+    if (!Array.isArray(nodeContent)) {
+        return false;
+    }
+    return nodeContent.some(a => {
+        var _a, _b, _c;
+        return ['native_flow'].includes((_c = (_b = (_a = a === null || a === void 0 ? void 0 : a.content) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c[0].tag) ||
+            ['interactive', 'buttons', 'list'].includes((_d = a === null || a === void 0 ? void 0 : a.content) === null || _d === void 0 ? void 0 : _d[0].tag) ||
+            ['hsm', 'biz'].includes(a === null || a === void 0 ? void 0 : a.tag);
+        var _d;
+    });
+};
+exports.getBinaryFilteredButtons = getBinaryFilteredButtons;
+const getBinaryFilteredBizBot = (nodeContent) => {
+    if (!Array.isArray(nodeContent)) {
+        return false;
+    }
+    return nodeContent.some(b => (['bot'].includes(b === null || b === void 0 ? void 0 : b.tag) && (b === null || b === void 0 ? void 0 : b.attrs.biz_bot) === '1'));
+};
+exports.getBinaryFilteredBizBot = getBinaryFilteredBizBot;
 function bufferToUInt(e, t) {
     let a = 0;
     for (let i = 0; i < t; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemo-dev/yebail",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "publishConfig": {
     "access": "public"
   },