@jkt48connect-corp/baileys 7.3.2 → 7.3.4

package/lib/Socket/messages-send.d.ts

@@ -1,31 +1,35 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto';
-import { AnyMessageContent, MediaConnInfo, MessageReceiptType, MessageRelayOptions, MiscMessageGenerationOptions, SocketConfig, WAMessageKey } from '../Types';
+import { AnyMessageContent, Media, MediaConnInfo, MessageReceiptType, MessageRelayOptions, MiscMessageGenerationOptions, QueryIds, SocketConfig, WAMessageKey } from '../Types';
 import { BinaryNode, JidWithDevice } from '../WABinary';
+import { USyncQuery } from '../WAUSync';
 export declare const makeMessagesSocket: (config: SocketConfig) => {
     getPrivacyTokens: (jids: string[]) => Promise<BinaryNode>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
-    relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
+    relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: WAMessageKey[], type: MessageReceiptType) => Promise<void>;
     getButtonArgs: (message: proto.IMessage) => BinaryNode['attrs'];
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<MediaConnInfo>;
-    waUploadToServer: import("../Types").WAMediaUploadFunction;
-    fetchPrivacySettings: (force?: boolean) => Promise<{
-        [_: string]: string;
-    }>;
     getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<JidWithDevice[]>;
+    sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     createParticipantNodes: (jids: string[], message: proto.IMessage, extraAttrs?: BinaryNode['attrs']) => Promise<{
         nodes: BinaryNode[];
         shouldIncludeDeviceIdentity: boolean;
     }>;
+    profilePictureUrl: (jid: string, type?: 'preview' | 'image', timeoutMs?: number) => Promise<string | null | undefined>;
+    waUploadToServer: import("../Types").WAMediaUploadFunction;
+    fetchPrivacySettings: (force?: boolean) => Promise<{
+        [_: string]: string;
+    }>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
     sendStatusMentions: (content: AnyMessageContent, jids?: string[]) => Promise<proto.WebMessageInfo>;
     sendAlbumMessage: (jid: string, medias: Media[], options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
+    newsletterQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<BinaryNode>;
+    newsletterWMexQuery: (jid: string | undefined, queryId: QueryIds, content?: object | undefined) => Promise<BinaryNode>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -38,15 +42,17 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     newsletterFollow: (jid: string) => Promise<void>;
     newsletterUnmute: (jid: string) => Promise<void>;
     newsletterMute: (jid: string) => Promise<void>;
+    newsletterAction: (jid: string, type: "mute" | "follow" | "unfollow" | "unmute") => Promise<void>;
     newsletterCreate: (name: string, description: string) => Promise<import("../Types").NewsletterMetadata>;
     newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("../Types").NewsletterViewRole | undefined) => Promise<import("../Types").NewsletterMetadata>;
     newsletterAdminCount: (jid: string) => Promise<number>;
     newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
     newsletterDemote: (jid: string, user: string) => Promise<void>;
     newsletterDelete: (jid: string) => Promise<void>;
-    newsletterReactMessage: (jid: string, server_id: string, code?: string | undefined) => Promise<void>;
+    newsletterReactMessage: (jid: string, serverId: string, code?: string | undefined) => Promise<void>;
     newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number | undefined, since?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<BinaryNode>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -67,8 +73,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     groupInviteCode: (jid: string) => Promise<string | undefined>;
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
-    groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | WAMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<string>;
+    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<string>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
     groupSettingUpdate: (jid: string, setting: "announcement" | "locked" | "not_announcement" | "unlocked") => Promise<void>;
@@ -77,35 +82,27 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     groupFetchAllParticipating: () => Promise<{
         [_: string]: import("../Types").GroupMetadata;
     }>;
+    interactiveQuery: (userNodes: BinaryNode[], queryNode: BinaryNode) => Promise<BinaryNode[]>;
     processingMutex: {
         mutex<T>(code: () => T | Promise<T>): Promise<T>;
     };
     upsertMessage: (msg: proto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
     appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
+    fetchUserLid: (jid: string) => Promise<string | undefined>;
     sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string | undefined) => Promise<void>;
     presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>;
-    profilePictureUrl: (jid: string, type?: "image" | "preview", timeoutMs?: number | undefined) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
-        exists: boolean;
         jid: string;
-    }[]>;
+        exists: unknown;
+    }[] | undefined>;
     fetchBlocklist: () => Promise<string[]>;
-    fetchDisappearingDuration: (...jids: string[]) => Promise<{
-        user: string;
-        duration: number;
-        setAt: Date;
-    }[]>;
-    fetchStatus: (...jids: string[]) => Promise<{
-        user: string;
-        status: string | null;
-        setAt: Date;
-    }[]>;
+    fetchStatus: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
+    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
     updateBlockStatus: (jid: string, action: "block" | "unblock") => Promise<void>;
-    updateCallPrivacy: (value: import("../Types").WAPrivacyCallValue) => Promise<void>;
     updateLastSeenPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateOnlinePrivacy: (value: import("../Types").WAPrivacyOnlineValue) => Promise<void>;
     updateProfilePicturePrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
@@ -125,6 +122,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
         id: string;
         fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
+    executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
     ws: any;
     ev: import("../Types").BaileysEventEmitter & {
@@ -151,8 +149,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    getPairingCode: (phoneNumber: string) => Promise<string>;
-    interaktiveMeta: (phoneNumber: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };

package/lib/Socket/messages-send.js

@@ -8,17 +8,19 @@ 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, groupToggleEphemeral } = sock;
+    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, generateMessageTag, sendNode, groupMetadata, groupQuery, newsletterWMexQuery, groupToggleEphemeral } = sock;
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
     });
     let mediaConn;
@@ -109,6 +111,43 @@ const makeMessagesSocket = (config) => {
         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;
+        }
+    };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
         var _a;
@@ -116,66 +155,46 @@ const makeMessagesSocket = (config) => {
         if (!useCache) {
             logger.debug('not using cache for devices');
         }
-        const users = [];
+        const toFetch = [];
         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);
-            const devices = userDevicesCache.get(user);
-            if (devices && useCache) {
-                deviceResults.push(...devices);
-                logger.trace({ user }, 'using cache for devices');
+            if (useCache) {
+                const devices = userDevicesCache.get(user);
+                if (devices) {
+                    deviceResults.push(...devices);
+                    logger.trace({ user }, 'using cache for devices');
+                }
+                else {
+                    toFetch.push(jid);
+                }
             }
             else {
-                users.push({ tag: 'user', attrs: { jid } });
+                toFetch.push(jid);
             }
         }
-        if (!users.length) {
+        if (!toFetch.length) {
             return deviceResults;
         }
-        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 = await 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]);
+        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]);
+            }
         }
         return deviceResults;
     };
@@ -222,6 +241,28 @@ const makeMessagesSocket = (config) => {
         }
         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 bytes = (0, Utils_1.encodeWAMessage)(patched);
@@ -255,9 +296,9 @@ const makeMessagesSocket = (config) => {
         const { user, server } = (0, WABinary_1.jidDecode)(jid);
         const statusJid = 'status@broadcast';
         const isGroup = server === 'g.us';
-        const isPrivate = server === 's.whatsapp.net';
         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;
@@ -282,7 +323,7 @@ const makeMessagesSocket = (config) => {
             devices.push({ user, device });
         }
         await authState.keys.transaction(async () => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+            var _a, _b, _c, _d, _e, _f;
             const mediaType = getMediaType(message);
             if (isGroup || isStatus) {
                 const [groupData, senderKeyMap] = await Promise.all([
@@ -447,94 +488,95 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            
-            if (!isNewsletter) {
-                if (message?.interactiveMessage?.nativeFlowMessage || message?.buttonsMessage) {
-                    if (!stanza.content || !Array.isArray(stanza.content)) {
-                        stanza.content = [];
-                    }
-                    if (message?.interactiveMessage?.nativeFlowMessage?.buttons && message.interactiveMessage.nativeFlowMessage.buttons.length > 0 && message.interactiveMessage.nativeFlowMessage.buttons[0]?.name === "review_and_pay") {
-                        stanza.content.push({
-                            tag: 'biz',
+            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: {
-                                native_flow_name: 'order_details'
-                            }
-                        })
-                    } else {
-                        stanza.content.push({
-                            tag: 'biz',
-                            attrs: {},
+                                type: 'native_flow',
+                                v: '1'
+                            },
                             content: [{
-                                tag: 'interactive',
-                                attrs: {
-                                    type: 'native_flow',
-                                    v: '1'
-                                },
-                                content: [{
                                     tag: 'native_flow',
-                                    attrs: { name: 'quick_reply' }
+                                    attrs: {
+                                        name: 'quick_reply'
+                                    }
                                 }]
-                            }]
-                        })
-                    }
+                        }]
+                };
+                const resultNativeNode = filterNativeNode(additionalNodes);
+                if (resultNativeNode && additionalNodes && additionalNodes.length > 0) {
+                    stanza.content.push(...resultNativeNode);
                 }
-                
-                if (message?.listMessage) {
-                    if (!stanza.content || !Array.isArray(stanza.content)) {
-                        stanza.content = [];
-                    }
-                    stanza.content.push({
-                        tag: "biz",
-                        attrs: {},
-                        content: [
-                            {
-                                tag: "list",
-                                attrs: {
-                                    v: "2",
-                                    type: "product_list"
-                                }
-                            }
-                        ]
-                    })
+                else {
+                    stanza.content.push(nativeNode);
                 }
-                
-                /*if (message?.templateMessage) {
-                    if (!stanza.content || !Array.isArray(stanza.content)) {
-                        stanza.content = [];
-                    }
-                    stanza.content.push({
-                        tag: "hsm",
-                        attrs: {
-                            category: '',
-                            tag: 'AUTHENTICATION'
-                        }
-                    }, {
-                        tag: 'biz',
-                        attrs: {}
-                    })
-                }*/
             }
-            
-            if (additionalNodes && additionalNodes.length > 0) {
-                if (!stanza.content || !Array.isArray(stanza.content)) {
-                    stanza.content = [];
+            if (isPrivate) {
+                const botNode = {
+                    tag: 'bot',
+                    attrs: { biz_bot: '1' }
+                };
+                const resultBotNode = filterBotNode(additionalNodes);
+                if (resultBotNode && additionalNodes && additionalNodes.length > 0) {
+                    stanza.content.push(...resultBotNode);
                 }
-                stanza.content.push(...additionalNodes);
-            }
-            
-            if (isPrivate && !additionalNodes) {
-                if (!stanza.content || !Array.isArray(stanza.content)) {
-                    stanza.content = [];
+                else {
+                    stanza.content.push(botNode);
                 }
-                    const botsChat = [ { attrs: { biz_bot: '1' }, tag: 'bot' }]
-                    stanza.content.push(...botsChat);
             }
-            
+            if (message && message.listMessage) {
+                stanza.content.push({
+                    tag: 'biz',
+                    attrs: {},
+                    content: [
+                        {
+                            tag: 'list',
+                            attrs: getButtonArgs(message)
+                        }
+                    ]
+                });
+                logger.debug({ jid }, 'adding business node');
+            }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await 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);
@@ -611,23 +653,6 @@ const makeMessagesSocket = (config) => {
             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) => {
         if (message.templateMessage) {
             // TODO: Add attributes
@@ -683,7 +708,9 @@ const makeMessagesSocket = (config) => {
         readMessages,
         refreshMediaConn,
         getUSyncDevices,
+        sendPeerDataOperationMessage,
         createParticipantNodes,
+        profilePictureUrl,
         waUploadToServer,
         fetchPrivacySettings,
         updateMediaMessage: async (message) => {
@@ -703,7 +730,7 @@ const makeMessagesSocket = (config) => {
                         else {
                             try {
                                 const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
-                                if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                if (media && 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 });
                                 }
@@ -887,7 +914,7 @@ const makeMessagesSocket = (config) => {
             return album;
         },
         sendMessage: async (jid, content, options = {}) => {
-            var _a, _b;
+            var _a, _b, _c;
             const userJid = authState.creds.me.id;
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
@@ -901,9 +928,24 @@ const makeMessagesSocket = (config) => {
             }
             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, {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
                         fetchOpts: {
@@ -930,16 +972,12 @@ const makeMessagesSocket = (config) => {
                 const isPollMsg = 'poll' in content && !!content.poll;
                 const isEditMsg = 'edit' in content && !!content.edit;
                 const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isButtonsMsg = 'buttons' in content && !!content.buttons;
-                const isListMsg = 'sections' in content && !!content.sections;
-                const isTemplateButtons = 'templateButtons' in content && !!content.templateButtons;
-                const isInteractiveButtons = 'interactiveButtons' in content && !!content.interactiveButtons;
                 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)((_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)) {
+                    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)) {
                         additionalAttributes.edit = '8';
                     }
                     else {
@@ -952,27 +990,16 @@ const makeMessagesSocket = (config) => {
                 else if (isPinMsg) {
                     additionalAttributes.edit = '2';
                 }
-                else if (isKeepMsg) {
-                    additionalAttributes.edit = '6';
-                }
-                else if (isButtonsMsg) {
-                }
-                else if (isListMsg) {
-                }
-                else if (isTemplateButtons) {
-                }
-                else if (isInteractiveButtons) {
-                }
                 else if (isAiMsg) {
                     additionalNodes.push({
                         attrs: {
                             biz_bot: '1'
                         },
-                        tag: "bot"
-                    }, {
-                        attrs: {},
-                        tag: "biz"
+                        tag: 'bot'
                     });
+                    if (options.additionalNodes) {
+                        additionalNodes.push(...options.additionalNodes);
+                    }
                 }
                 if (mediaHandle) {
                     additionalAttributes['media_id'] = mediaHandle;

package/lib/Socket/newsletter.d.ts

@@ -14,7 +14,7 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     newsletterUnmute: (jid: string) => Promise<void>;
     newsletterMute: (jid: string) => Promise<void>;
     newsletterAction: (jid: string, type: "follow" | "unfollow" | "mute" | "unmute") => Promise<void>;
-    newsletterCreate: (name: string, description: string, reaction_codes: string) => Promise<NewsletterMetadata>;
+    newsletterCreate: (name: string, description: string) => Promise<NewsletterMetadata>;
     newsletterMetadata: (type: "invite" | "jid", key: string, role?: NewsletterViewRole) => Promise<NewsletterMetadata>;
     newsletterAdminCount: (jid: string) => Promise<number>;
     /**user is Lid, not Jid */
@@ -125,7 +125,7 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };