gifted-baileys 1.5.4 → 1.5.6

package/{lib → src}/Socket/messages-send.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,27 +17,25 @@ const boom_1 = require("@hapi/boom");
 const node_cache_1 = __importDefault(require("node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
-const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
 const link_preview_1 = require("../Utils/link-preview");
 const WABinary_1 = require("../WABinary");
-const WAUSync_1 = require("../WAUSync");
 const newsletter_1 = require("./newsletter");
 var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, } = config;
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
-    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, generateMessageTag, sendNode, groupMetadata, groupQuery, newsletterWMexQuery, groupToggleEphemeral } = sock;
+    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, generateMessageTag, sendNode, groupMetadata, groupToggleEphemeral } = sock;
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
         useClones: false
     });
     let mediaConn;
-    const refreshMediaConn = async (forceGet = false) => {
-        const media = await mediaConn;
+    const refreshMediaConn = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (forceGet = false) {
+        const media = yield mediaConn;
         if (!media || forceGet || (new Date().getTime() - media.fetchDate.getTime()) > media.ttl * 1000) {
-            mediaConn = (async () => {
-                const result = await query({
+            mediaConn = (() => __awaiter(void 0, void 0, void 0, function* () {
+                const result = yield query({
                     tag: 'iq',
                     attrs: {
                         type: 'set',
@@ -49,15 +56,15 @@ const makeMessagesSocket = (config) => {
                 };
                 logger.debug('fetched media conn');
                 return node;
-            })();
+            }))();
         }
         return mediaConn;
-    };
+    });
     /**
      * generic send receipt function
      * used for receipts of phone call, read, delivery etc.
      * */
-    const sendReceipt = async (jid, participant, messageIds, type) => {
+    const sendReceipt = (jid, participant, messageIds, type) => __awaiter(void 0, void 0, void 0, function* () {
         const node = {
             tag: 'receipt',
             attrs: {
@@ -95,110 +102,93 @@ const makeMessagesSocket = (config) => {
             ];
         }
         logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages');
-        await sendNode(node);
-    };
+        yield sendNode(node);
+    });
     /** Correctly bulk send receipts to multiple chats, participants */
-    const sendReceipts = async (keys, type) => {
+    const sendReceipts = (keys, type) => __awaiter(void 0, void 0, void 0, function* () {
         const recps = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys);
         for (const { jid, participant, messageIds } of recps) {
-            await sendReceipt(jid, participant, messageIds, type);
+            yield sendReceipt(jid, participant, messageIds, type);
         }
-    };
+    });
     /** Bulk read messages. Keys can be from different chats & participants */
-    const readMessages = async (keys) => {
-        const privacySettings = await fetchPrivacySettings();
+    const readMessages = (keys) => __awaiter(void 0, void 0, void 0, function* () {
+        const privacySettings = yield fetchPrivacySettings();
         // based on privacy settings, we have to change the read type
         const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
-        await sendReceipts(keys, readType);
-    };
-    const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
-        var _a, _b, _c, _d;
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
-        if ((0, WABinary_1.isJidNewsLetter)(jid)) {
-            const node = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-                input: {
-                    key: jid,
-                    type: "JID",
-                    'view_role': 'GUEST'
-                },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
-            });
-            const result = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
-            const metadataPath = JSON.parse(result).data[Types_1.XWAPaths.NEWSLETTER];
-            const pictype = type === 'image' ? 'picture' : 'preview';
-            const directPath = (_c = metadataPath === null || metadataPath === void 0 ? void 0 : metadataPath.thread_metadata[pictype]) === null || _c === void 0 ? void 0 : _c.direct_path;
-            return directPath ? (0, Utils_1.getUrlFromDirectPath)(directPath) : null;
-        }
-        else {
-            const result = await query({
-                tag: 'iq',
-                attrs: {
-                    target: jid,
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    type: 'get',
-                    xmlns: 'w:profile:picture'
-                },
-                content: [
-                    { tag: 'picture', attrs: { type, query: 'url' } }
-                ]
-            }, timeoutMs);
-            const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
-            return (_d = child === null || child === void 0 ? void 0 : child.attrs) === null || _d === void 0 ? void 0 : _d.url;
-        }
-    };
+        yield sendReceipts(keys, readType);
+    });
     /** Fetch all the devices we've to send a message to */
-    const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
+    const getUSyncDevices = (jids, useCache, ignoreZeroDevices) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const deviceResults = [];
         if (!useCache) {
             logger.debug('not using cache for devices');
         }
-        const toFetch = [];
+        const users = [];
         jids = Array.from(new Set(jids));
         for (let jid of jids) {
             const user = (_a = (0, WABinary_1.jidDecode)(jid)) === null || _a === void 0 ? void 0 : _a.user;
             jid = (0, WABinary_1.jidNormalizedUser)(jid);
-            if (useCache) {
-                const devices = userDevicesCache.get(user);
-                if (devices) {
-                    deviceResults.push(...devices);
-                    logger.trace({ user }, 'using cache for devices');
-                }
-                else {
-                    toFetch.push(jid);
-                }
+            const devices = userDevicesCache.get(user);
+            if (devices && useCache) {
+                deviceResults.push(...devices);
+                logger.trace({ user }, 'using cache for devices');
             }
             else {
-                toFetch.push(jid);
+                users.push({ tag: 'user', attrs: { jid } });
             }
         }
-        if (!toFetch.length) {
+        if (!users.length) {
             return deviceResults;
         }
-        const query = new WAUSync_1.USyncQuery()
-            .withContext('message')
-            .withDeviceProtocol();
-        for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(query);
-        if (result) {
-            const extracted = (0, Utils_1.extractDeviceJids)(result === null || result === void 0 ? void 0 : result.list, authState.creds.me.id, ignoreZeroDevices);
-            const deviceMap = {};
-            for (const item of extracted) {
-                deviceMap[item.user] = deviceMap[item.user] || [];
-                deviceMap[item.user].push(item);
-                deviceResults.push(item);
-            }
-            for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key]);
-            }
+        const iq = {
+            tag: 'iq',
+            attrs: {
+                to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'usync',
+            },
+            content: [
+                {
+                    tag: 'usync',
+                    attrs: {
+                        sid: generateMessageTag(),
+                        mode: 'query',
+                        last: 'true',
+                        index: '0',
+                        context: 'message',
+                    },
+                    content: [
+                        {
+                            tag: 'query',
+                            attrs: {},
+                            content: [
+                                {
+                                    tag: 'devices',
+                                    attrs: { version: '2' }
+                                }
+                            ]
+                        },
+                        { tag: 'list', attrs: {}, content: users }
+                    ]
+                },
+            ],
+        };
+        const result = yield query(iq);
+        const extracted = (0, Utils_1.extractDeviceJids)(result, authState.creds.me.id, ignoreZeroDevices);
+        const deviceMap = {};
+        for (const item of extracted) {
+            deviceMap[item.user] = deviceMap[item.user] || [];
+            deviceMap[item.user].push(item);
+            deviceResults.push(item);
+        }
+        for (const key in deviceMap) {
+            userDevicesCache.set(key, deviceMap[key]);
         }
         return deviceResults;
-    };
-    const assertSessions = async (jids, force) => {
+    });
+    const assertSessions = (jids, force) => __awaiter(void 0, void 0, void 0, function* () {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
         if (force) {
@@ -207,7 +197,7 @@ const makeMessagesSocket = (config) => {
         else {
             const addrs = jids.map(jid => (signalRepository
                 .jidToSignalProtocolAddress(jid)));
-            const sessions = await authState.keys.get('session', addrs);
+            const sessions = yield authState.keys.get('session', addrs);
             for (const jid of jids) {
                 const signalId = signalRepository
                     .jidToSignalProtocolAddress(jid);
@@ -218,7 +208,7 @@ const makeMessagesSocket = (config) => {
         }
         if (jidsRequiringFetch.length) {
             logger.debug({ jidsRequiringFetch }, 'fetching sessions');
-            const result = await query({
+            const result = yield query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'encrypt',
@@ -236,39 +226,17 @@ const makeMessagesSocket = (config) => {
                     }
                 ]
             });
-            await (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
+            yield (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
             didFetchNewSession = true;
         }
         return didFetchNewSession;
-    };
-    const sendPeerDataOperationMessage = async (pdoMessage) => {
-        var _a;
-        //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
-        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
-            throw new boom_1.Boom('Not authenticated');
-        }
-        const protocolMessage = {
-            protocolMessage: {
-                peerDataOperationRequestMessage: pdoMessage,
-                type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
-            }
-        };
-        const meJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
-        const msgId = await relayMessage(meJid, protocolMessage, {
-            additionalAttributes: {
-                category: 'peer',
-                // eslint-disable-next-line camelcase
-                push_priority: 'high_force',
-            },
-        });
-        return msgId;
-    };
-    const createParticipantNodes = async (jids, message, extraAttrs) => {
-        const patched = await patchMessageBeforeSending(message, jids);
+    });
+    const createParticipantNodes = (jids, message, extraAttrs) => __awaiter(void 0, void 0, void 0, function* () {
+        const patched = yield patchMessageBeforeSending(message, jids);
         const bytes = (0, Utils_1.encodeWAMessage)(patched);
         let shouldIncludeDeviceIdentity = false;
-        const nodes = await Promise.all(jids.map(async (jid) => {
-            const { type, ciphertext } = await signalRepository
+        const nodes = yield Promise.all(jids.map((jid) => __awaiter(void 0, void 0, void 0, function* () {
+            const { type, ciphertext } = yield signalRepository
                 .encryptMessage({ jid, data: bytes });
             if (type === 'pkmsg') {
                 shouldIncludeDeviceIdentity = true;
@@ -278,19 +246,15 @@ const makeMessagesSocket = (config) => {
                 attrs: { jid },
                 content: [{
                         tag: 'enc',
-                        attrs: {
-                            v: '2',
-                            type,
-                            ...extraAttrs || {}
-                        },
+                        attrs: Object.assign({ v: '2', type }, extraAttrs || {}),
                         content: ciphertext
                     }]
             };
             return node;
-        }));
+        })));
         return { nodes, shouldIncludeDeviceIdentity };
-    }; //apela
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }) => {
+    }); //apela
+    const relayMessage = (jid_1, message_1, _a) => __awaiter(void 0, [jid_1, message_1, _a], void 0, function* (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }) {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
         const { user, server } = (0, WABinary_1.jidDecode)(jid);
@@ -298,7 +262,6 @@ const makeMessagesSocket = (config) => {
         const isGroup = server === 'g.us';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
-        const isPrivate = server === 's.whatsapp.net';
         const isNewsletter = server === 'newsletter';
         msgId = msgId || (0, Utils_1.generateMessageID)();
         useUserDevicesCache = useUserDevicesCache !== false;
@@ -317,45 +280,45 @@ const makeMessagesSocket = (config) => {
             // 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 = Object.assign(Object.assign({}, additionalAttributes), { 'device_fanout': 'false' });
             }
             const { user, device } = (0, WABinary_1.jidDecode)(participant.jid);
             devices.push({ user, device });
         }
-        await authState.keys.transaction(async () => {
+        yield authState.keys.transaction(() => __awaiter(void 0, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f;
             const mediaType = getMediaType(message);
             if (isGroup || isStatus) {
-                const [groupData, senderKeyMap] = await Promise.all([
-                    (async () => {
-                        let groupData = cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined;
+                const [groupData, senderKeyMap] = yield Promise.all([
+                    (() => __awaiter(void 0, void 0, void 0, function* () {
+                        let groupData = cachedGroupMetadata ? yield cachedGroupMetadata(jid) : undefined;
                         if (groupData) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
                         if (!groupData && !isStatus) {
-                            groupData = await groupMetadata(jid);
+                            groupData = yield groupMetadata(jid);
                         }
                         return groupData;
-                    })(),
-                    (async () => {
+                    }))(),
+                    (() => __awaiter(void 0, void 0, void 0, function* () {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid]);
+                            const result = yield authState.keys.get('sender-key-memory', [jid]);
                             return result[jid] || {};
                         }
                         return {};
-                    })()
+                    }))()
                 ]);
                 if (!participant) {
                     const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : [];
                     if (isStatus && statusJidList) {
                         participantsList.push(...statusJidList);
                     }
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
+                    const additionalDevices = yield getUSyncDevices(participantsList, !!useUserDevicesCache, false);
                     devices.push(...additionalDevices);
                 }
-                const patched = await patchMessageBeforeSending(message, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', d.device)));
+                const patched = yield patchMessageBeforeSending(message, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
                 const bytes = (0, Utils_1.encodeWAMessage)(patched);
-                const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
+                const { ciphertext, senderKeyDistributionMessage } = yield signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
                     meId,
@@ -380,8 +343,8 @@ const makeMessagesSocket = (config) => {
                             groupId: destinationJid
                         }
                     };
-                    await assertSessions(senderKeyJids, false);
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, mediaType ? { mediatype: mediaType } : undefined);
+                    yield assertSessions(senderKeyJids, false);
+                    const result = yield createParticipantNodes(senderKeyJids, senderKeyMsg, mediaType ? { mediatype: mediaType } : undefined);
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
@@ -390,7 +353,7 @@ const makeMessagesSocket = (config) => {
                     attrs: { v: '2', type: 'skmsg' },
                     content: ciphertext
                 });
-                await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
+                yield authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
             else if (isNewsletter) {
                 // Message edit
@@ -403,7 +366,7 @@ const makeMessagesSocket = (config) => {
                     msgId = (_d = message.protocolMessage.key) === null || _d === void 0 ? void 0 : _d.id;
                     message = {};
                 }
-                const patched = await patchMessageBeforeSending(message, []);
+                const patched = yield patchMessageBeforeSending(message, []);
                 const bytes = WAProto_1.proto.Message.encode(patched).finish();
                 binaryNodeContent.push({
                     tag: 'plaintext',
@@ -419,7 +382,7 @@ const makeMessagesSocket = (config) => {
                     if (meDevice !== undefined && meDevice !== 0) {
                         devices.push({ user: meUser });
                     }
-                    const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
+                    const additionalDevices = yield getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
                     devices.push(...additionalDevices);
                 }
                 const allJids = [];
@@ -427,7 +390,7 @@ const makeMessagesSocket = (config) => {
                 const otherJids = [];
                 for (const { user, device } of devices) {
                     const isMe = user === meUser;
-                    const jid = (0, WABinary_1.jidEncode)(isMe && isLid ? ((_f = (_e = authState.creds) === null || _e === void 0 ? void 0 : _e.me) === null || _f === void 0 ? void 0 : _f.lid.split(':')[0]) || user : user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', device);
+                    const jid = (0, WABinary_1.jidEncode)(isMe && isLid ? ((_f = (_e = authState.creds) === null || _e === void 0 ? void 0 : _e.me) === null || _f === void 0 ? void 0 : _f.lid.split(':')[0]) || user : user, isLid ? 'lid' : 's.whatsapp.net', device);
                     if (isMe) {
                         meJids.push(jid);
                     }
@@ -436,8 +399,8 @@ const makeMessagesSocket = (config) => {
                     }
                     allJids.push(jid);
                 }
-                await assertSessions(allJids, false);
-                const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
+                yield assertSessions(allJids, false);
+                const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = yield Promise.all([
                     createParticipantNodes(meJids, meMsg, mediaType ? { mediatype: mediaType } : undefined),
                     createParticipantNodes(otherJids, message, mediaType ? { mediatype: mediaType } : undefined)
                 ]);
@@ -454,11 +417,7 @@ const makeMessagesSocket = (config) => {
             }
             const stanza = {
                 tag: 'message',
-                attrs: {
-                    id: msgId,
-                    type: isNewsletter ? getTypeMessage(message) : 'text',
-                    ...(additionalAttributes || {})
-                },
+                attrs: Object.assign({ id: msgId, type: isNewsletter ? getTypeMessage(message) : 'text' }, (additionalAttributes || {})),
                 content: binaryNodeContent
             };
             // if the participant to send to is explicitly specified (generally retry recp)
@@ -491,92 +450,44 @@ const makeMessagesSocket = (config) => {
             if (additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
             }
-            const inMsg = (0, Utils_1.normalizeMessageContent)(message) || null;
-            const key = inMsg ? (0, Utils_1.getContentType)(inMsg) : null;
-            if (!isNewsletter && (key === 'interactiveMessage' || key === 'buttonsMessage')) {
-                const nativeNode = {
-                    tag: 'biz',
-                    attrs: {},
-                    content: [{
-                            tag: 'interactive',
-                            attrs: {
-                                type: 'native_flow',
-                                v: '1'
-                            },
-                            content: [{
-                                    tag: 'native_flow',
-                                    attrs: {
-                                        name: 'quick_reply'
-                                    }
-                                }]
-                        }]
-                };
-                const resultNativeNode = filterNativeNode(additionalNodes);
-                if (resultNativeNode && additionalNodes && additionalNodes.length > 0) {
-                    stanza.content.push(...resultNativeNode);
-                }
-                else {
-                    stanza.content.push(nativeNode);
-                }
-            }
-            if (isPrivate) {
-                const botNode = {
-                    tag: 'bot',
-                    attrs: { biz_bot: '1' }
-                };
-                const resultBotNode = filterBotNode(additionalNodes);
-                if (resultBotNode && additionalNodes && additionalNodes.length > 0) {
-                    stanza.content.push(...resultBotNode);
-                }
-                else {
-                    stanza.content.push(botNode);
+            else {
+                if (((0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidUser)(jid)) && ((message === null || message === void 0 ? void 0 : message.viewOnceMessage) ? message === null || message === void 0 ? void 0 : message.viewOnceMessage : (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2) ? message === null || message === void 0 ? void 0 : message.viewOnceMessageV2 : (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension) ? message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension : (message === null || message === void 0 ? void 0 : message.ephemeralMessage) ? message === null || message === void 0 ? void 0 : message.ephemeralMessage : (message === null || message === void 0 ? void 0 : message.templateMessage) ? message === null || message === void 0 ? void 0 : message.templateMessage : (message === null || message === void 0 ? void 0 : message.interactiveMessage) ? message === null || message === void 0 ? void 0 : message.interactiveMessage : message === null || message === void 0 ? void 0 : message.buttonsMessage)) {
+                    stanza.content.push({
+                        tag: 'biz',
+                        attrs: {},
+                        content: [{
+                                tag: 'interactive',
+                                attrs: {
+                                    type: 'native_flow',
+                                    v: '1'
+                                },
+                                content: [{
+                                        tag: 'native_flow',
+                                        attrs: { name: 'quick_reply' }
+                                    }]
+                            }]
+                    });
                 }
             }
-            if (message && message.listMessage) {
+            const buttonType = getButtonType(message);
+            if (buttonType) {
                 stanza.content.push({
                     tag: 'biz',
                     attrs: {},
                     content: [
                         {
-                            tag: 'list',
-                            attrs: getButtonArgs(message)
+                            tag: buttonType,
+                            attrs: getButtonArgs(message),
                         }
                     ]
                 });
                 logger.debug({ jid }, 'adding business node');
             }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
-            await sendNode(stanza);
-        });
+            yield sendNode(stanza);
+        }));
         return msgId;
-    };
-    const filterNativeNode = (nodeContent) => {
-        if (Array.isArray(nodeContent)) {
-            return nodeContent.filter((item) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
-                if (item.tag === 'biz' && ((_a = item === null || item === void 0 ? void 0 : item.content[0]) === null || _a === void 0 ? void 0 : _a.tag) === 'interactive' && ((_c = (_b = item === null || item === void 0 ? void 0 : item.content[0]) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.type) === 'native_flow' && ((_e = (_d = item === null || item === void 0 ? void 0 : item.content[0]) === null || _d === void 0 ? void 0 : _d.content[0]) === null || _e === void 0 ? void 0 : _e.tag) === 'native_flow' && ((_h = (_g = (_f = item === null || item === void 0 ? void 0 : item.content[0]) === null || _f === void 0 ? void 0 : _f.content[0]) === null || _g === void 0 ? void 0 : _g.attrs) === null || _h === void 0 ? void 0 : _h.name) === 'quick_reply') {
-                    return false;
-                }
-                return true;
-            });
-        }
-        else {
-            return nodeContent;
-        }
-    };
-    const filterBotNode = (nodeContent) => {
-        if (Array.isArray(nodeContent)) {
-            return nodeContent.filter((item) => {
-                if (item.tag === 'bot' && item.attrs.biz_bot === '1') {
-                    return false;
-                }
-                return true;
-            });
-        }
-        else {
-            return nodeContent;
-        }
-    };
+    });
     const getTypeMessage = (msg) => {
         if (msg.viewOnceMessage) {
             return getTypeMessage(msg.viewOnceMessage.message);
@@ -597,7 +508,7 @@ const makeMessagesSocket = (config) => {
             return 'reaction';
         }
         else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
-            return 'poll';
+            return 'reaction';
         }
         else if (getMediaType(msg)) {
             return 'media';
@@ -649,8 +560,22 @@ const makeMessagesSocket = (config) => {
         else if (message.interactiveResponseMessage) {
             return 'native_flow_response';
         }
-        else if (message.groupInviteMessage) {
-            return 'url';
+    };
+    const getButtonType = (message) => {
+        if (message.buttonsMessage) {
+            return 'buttons';
+        }
+        else if (message.buttonsResponseMessage) {
+            return 'buttons_response';
+        }
+        else if (message.interactiveResponseMessage) {
+            return 'interactive_response';
+        }
+        else if (message.listMessage) {
+            return 'list';
+        }
+        else if (message.listResponseMessage) {
+            return 'list_response';
         }
     };
     const getButtonArgs = (message) => {
@@ -669,9 +594,9 @@ const makeMessagesSocket = (config) => {
             return {};
         }
     };
-    const getPrivacyTokens = async (jids) => {
+    const getPrivacyTokens = (jids) => __awaiter(void 0, void 0, void 0, function* () {
         const t = (0, Utils_1.unixTimestampSeconds)().toString();
-        const result = await query({
+        const result = yield query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
@@ -694,12 +619,10 @@ const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    };
+    });
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
-    return {
-        ...sock,
-        getPrivacyTokens,
+    return Object.assign(Object.assign({}, sock), { getPrivacyTokens,
         assertSessions,
         relayMessage,
         sendReceipt,
@@ -708,18 +631,15 @@ const makeMessagesSocket = (config) => {
         readMessages,
         refreshMediaConn,
         getUSyncDevices,
-        sendPeerDataOperationMessage,
         createParticipantNodes,
-        profilePictureUrl,
         waUploadToServer,
-        fetchPrivacySettings,
-        updateMediaMessage: async (message) => {
+        fetchPrivacySettings, updateMediaMessage: (message) => __awaiter(void 0, void 0, void 0, function* () {
             const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
             const node = (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
             let error = undefined;
-            await Promise.all([
+            yield Promise.all([
                 sendNode(node),
                 waitForMsgMediaUpdate(update => {
                     const result = update.find(c => c.key.id === message.key.id);
@@ -730,7 +650,7 @@ const makeMessagesSocket = (config) => {
                         else {
                             try {
                                 const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
-                                if (media && media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
                                     const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result];
                                     throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: (0, Utils_1.getStatusCodeForMediaRetry)(media.result) || 404 });
                                 }
@@ -753,168 +673,8 @@ const makeMessagesSocket = (config) => {
                 { key: message.key, update: { message: message.message } }
             ]);
             return message;
-        },
-        sendStatusMentions: async (content, jids = []) => {
-            const userJid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
-            let allUsers = [];
-            for (const id of jids) {
-                const { user, server } = (0, WABinary_1.jidDecode)(id);
-                const isGroup = server === 'g.us';
-                const isPrivate = server === 's.whatsapp.net';
-                if (isGroup) {
-                    let userId = await groupMetadata(id);
-                    let participant = await userId.participants;
-                    let users = await Promise.all(participant.map(u => (0, WABinary_1.jidNormalizedUser)(u.id)));
-                    allUsers = [...allUsers, ...users];
-                }
-                else if (isPrivate) {
-                    let users = await Promise.all(jids.map(id => id.replace(/\b\d{18}@.{4}\b/g, '')));
-                    allUsers = [...allUsers, ...users];
-                }
-                if (!allUsers.find(user => user.includes(userJid))) {
-                    allUsers.push(userJid);
-                }
-            }
-            ;
-            const getRandomHexColor = () => {
-                return "#" + Math.floor(Math.random() * 16777215)
-                    .toString(16)
-                    .padStart(6, "0");
-            };
-            let mediaHandle;
-            let msg = await (0, Utils_1.generateWAMessage)(WABinary_1.STORIES_JID, content, {
-                logger,
-                userJid,
-                getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
-                    thumbnailWidth: linkPreviewImageThumbnailWidth,
-                    fetchOpts: {
-                        timeout: 3000,
-                        ...axiosOptions || {}
-                    },
-                    logger,
-                    uploadImage: generateHighQualityLinkPreview
-                        ? waUploadToServer
-                        : undefined
-                }),
-                upload: async (readStream, opts) => {
-                    const up = await waUploadToServer(readStream, { ...opts });
-                    mediaHandle = up.handle;
-                    return up;
-                },
-                mediaCache: config.mediaCache,
-                options: config.options,
-                backgroundColor: getRandomHexColor(),
-                font: Math.floor(Math.random() * 9),
-            });
-            await relayMessage(WABinary_1.STORIES_JID, msg.message, {
-                messageId: msg.key.id,
-                statusJidList: allUsers,
-                additionalNodes: [
-                    {
-                        tag: 'meta',
-                        attrs: {},
-                        content: [
-                            {
-                                tag: 'mentioned_users',
-                                attrs: {},
-                                content: jids.map(jid => ({
-                                    tag: 'to',
-                                    attrs: { jid },
-                                    content: undefined,
-                                })),
-                            },
-                        ],
-                    },
-                ],
-            });
-            jids.forEach(async (id) => {
-                id = (0, WABinary_1.jidNormalizedUser)(id);
-                const { user, server } = (0, WABinary_1.jidDecode)(id);
-                const isPrivate = server === 's.whatsapp.net';
-                let type = isPrivate
-                    ? 'statusMentionMessage'
-                    : 'groupStatusMentionMessage';
-                await relayMessage(id, {
-                    [type]: {
-                        message: {
-                            protocolMessage: {
-                                key: msg.key,
-                                type: 25,
-                            },
-                        },
-                    },
-                }, {});
-                await (0, Utils_1.delay)(2500);
-            });
-            return msg;
-        },
-        sendAlbumMessage: async (jid, medias, options = {}) => {
-            const userJid = authState.creds.me.id;
-            for (const media of medias) {
-                if (!media.image && !media.video)
-                    throw new TypeError(`medias[i] must have image or video property`);
-            }
-            if (medias.length < 2)
-                throw new RangeError("Minimum 2 media");
-            const time = options.delay || 500;
-            delete options.delay;
-            const album = await (0, Utils_1.generateWAMessageFromContent)(jid, {
-                albumMessage: {
-                    expectedImageCount: medias.filter(media => media.image).length,
-                    expectedVideoCount: medias.filter(media => media.video).length,
-                    ...options
-                }
-            }, { userJid, ...options });
-            await relayMessage(jid, album.message, { messageId: album.key.id });
-            let mediaHandle;
-            let msg;
-            for (const i in medias) {
-                const media = medias[i];
-                if (media.image) {
-                    msg = await (0, Utils_1.generateWAMessage)(jid, {
-                        image: media.image,
-                        ...media,
-                        ...options
-                    }, {
-                        userJid,
-                        upload: async (readStream, opts) => {
-                            const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsLetter)(jid) });
-                            mediaHandle = up.handle;
-                            return up;
-                        },
-                        ...options,
-                    });
-                }
-                else if (media.video) {
-                    msg = await (0, Utils_1.generateWAMessage)(jid, {
-                        video: media.video,
-                        ...media,
-                        ...options
-                    }, {
-                        userJid,
-                        upload: async (readStream, opts) => {
-                            const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsLetter)(jid) });
-                            mediaHandle = up.handle;
-                            return up;
-                        },
-                        ...options,
-                    });
-                }
-                if (msg) {
-                    msg.message.messageContextInfo = {
-                        messageAssociation: {
-                            associationType: 1,
-                            parentMessageKey: album.key
-                        }
-                    };
-                }
-                await relayMessage(jid, msg.message, { messageId: msg.key.id });
-                await (0, Utils_1.delay)(time);
-            }
-            return album;
-        },
-        sendMessage: async (jid, content, options = {}) => {
-            var _a, _b, _c;
+        }), sendMessage: (jid_1, content_1, ...args_1) => __awaiter(void 0, [jid_1, content_1, ...args_1], void 0, function* (jid, content, options = {}) {
+            var _a, _b;
             const userJid = authState.creds.me.id;
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
@@ -924,60 +684,32 @@ const makeMessagesSocket = (config) => {
                 const value = typeof disappearingMessagesInChat === 'boolean' ?
                     (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
                     disappearingMessagesInChat;
-                await groupToggleEphemeral(jid, value);
+                yield groupToggleEphemeral(jid, value);
             }
             else {
                 let mediaHandle;
-                const { server } = (0, WABinary_1.jidDecode)(jid);
-                const isGroup = server === 'g.us';
-                let eph;
-                if (isGroup) {
-                    const disappearingNode = await groupQuery(jid, 'get', [
-                        {
-                            tag: 'query',
-                            attrs: { request: 'interactive' }
-                        }
-                    ]);
-                    const group = (0, WABinary_1.getBinaryNodeChild)(disappearingNode, 'group');
-                    const expiration = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral');
-                    eph = (_a = expiration === null || expiration === void 0 ? void 0 : expiration.attrs) === null || _a === void 0 ? void 0 : _a.expiration;
-                }
-                const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
-                    logger,
-                    userJid,
-                    ephemeralExpiration: (options.ephemeralExpiration && options.ephemeralExpiration > 0) ? options.ephemeralExpiration : eph,
-                    getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
+                const fullMsg = yield (0, Utils_1.generateWAMessage)(jid, content, Object.assign({ logger,
+                    userJid, getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
-                        },
+                        fetchOpts: Object.assign({ timeout: 3000 }, axiosOptions || {}),
                         logger,
                         uploadImage: generateHighQualityLinkPreview
                             ? waUploadToServer
                             : undefined
-                    }),
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsLetter)(jid) });
+                    }), upload: (readStream, opts) => __awaiter(void 0, void 0, void 0, function* () {
+                        const up = yield waUploadToServer(readStream, Object.assign(Object.assign({}, opts), { newsletter: (0, WABinary_1.isJidNewsLetter)(jid) }));
                         mediaHandle = up.handle;
                         return up;
-                    },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    ...options,
-                });
-                const isAiMsg = 'ai' in content && !!content.ai;
-                const isPinMsg = 'pin' in content && !!content.pin;
-                const isKeepMsg = 'keep' in content && content.keep;
-                const isPollMsg = 'poll' in content && !!content.poll;
-                const isEditMsg = 'edit' in content && !!content.edit;
+                    }), mediaCache: config.mediaCache, options: config.options }, options));
                 const isDeleteMsg = 'delete' in content && !!content.delete;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isAiMsg = 'ai' in content && !!content.ai;
                 const additionalAttributes = {};
                 const additionalNodes = [];
                 // required for delete
                 if (isDeleteMsg) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (((0, WABinary_1.isJidGroup)((_b = content.delete) === null || _b === void 0 ? void 0 : _b.remoteJid) && !((_c = content.delete) === null || _c === void 0 ? void 0 : _c.fromMe)) || (0, WABinary_1.isJidNewsLetter)(jid)) {
+                    if (((0, WABinary_1.isJidGroup)((_a = content.delete) === null || _a === void 0 ? void 0 : _a.remoteJid) && !((_b = content.delete) === null || _b === void 0 ? void 0 : _b.fromMe)) || (0, WABinary_1.isJidNewsLetter)(jid)) {
                         additionalAttributes.edit = '8';
                     }
                     else {
@@ -987,19 +719,13 @@ const makeMessagesSocket = (config) => {
                 else if (isEditMsg) {
                     additionalAttributes.edit = (0, WABinary_1.isJidNewsLetter)(jid) ? '3' : '1';
                 }
-                else if (isPinMsg) {
-                    additionalAttributes.edit = '2';
-                }
                 else if (isAiMsg) {
                     additionalNodes.push({
                         attrs: {
                             biz_bot: '1'
                         },
-                        tag: 'bot'
+                        tag: "bot"
                     });
-                    if (options.additionalNodes) {
-                        additionalNodes.push(...options.additionalNodes);
-                    }
                 }
                 if (mediaHandle) {
                     additionalAttributes['media_id'] = mediaHandle;
@@ -1007,7 +733,7 @@ const makeMessagesSocket = (config) => {
                 if ('cachedGroupMetadata' in options) {
                     console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.');
                 }
-                await relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, cachedGroupMetadata: options.cachedGroupMetadata, additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes, additionalAttributes, statusJidList: options.statusJidList });
+                yield relayMessage(jid, fullMsg.message, { messageId: fullMsg.key.id, cachedGroupMetadata: options.cachedGroupMetadata, additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes, additionalAttributes, statusJidList: options.statusJidList });
                 if (config.emitOwnEvents) {
                     process.nextTick(() => {
                         processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
@@ -1015,7 +741,6 @@ const makeMessagesSocket = (config) => {
                 }
                 return fullMsg;
             }
-        }
-    };
+        }) });
 };
 exports.makeMessagesSocket = makeMessagesSocket;