@heavstaltech/baileys 2.3.4 → 3.2.4

package/lib/Socket/messages-send.js

@@ -1,36 +1,45 @@
-"use strict";
+"use strict"; 
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+}; 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesSocket = void 0;
 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 axios_1 = require("axios")
+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");
+const WAUSync_1 = require("../WAUSync")
+const kikyy = require('./dugong');
 var ListType = WAProto_1.proto.Message.ListMessage.ListType;
 const makeMessagesSocket = (config) => {
-    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, } = 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 patchMessageRequiresBeforeSending = (msg, recipientJids) => {
-        var _a, _b;
-        if ((_b = (_a = msg === null || msg === void 0 ? void 0 : msg.deviceSentMessage) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.listMessage) {
-            msg = JSON.parse(JSON.stringify(msg));
-            msg.deviceSentMessage.message.listMessage.listType = WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT;
-        }
-        if (msg === null || msg === void 0 ? void 0 : msg.listMessage) {
-            msg = JSON.parse(JSON.stringify(msg));
-            msg.listMessage.listType = WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT;
-        }
-        return msg;
-    };
+    const {
+        ev, 
+        authState, 
+        processingMutex, 
+        signalRepository, 
+        upsertMessage,
+        query,
+        fetchPrivacySettings,
+        generateMessageTag,
+        sendNode, 
+        groupMetadata,
+        groupToggleEphemeral,
+        executeUSyncQuery
+    } = sock;
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
@@ -49,9 +58,9 @@ const makeMessagesSocket = (config) => {
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 });
-                const mediaConnNode = (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn');
+                const mediaConnNode = WABinary_1.getBinaryNodeChild(result, 'media_conn');
                 const node = {
-                    hosts: (0, WABinary_1.getBinaryNodeChildren)(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: WABinary_1.getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
                         maxContentLengthBytes: +attrs.maxContentLengthBytes,
                     })),
@@ -80,7 +89,7 @@ const makeMessagesSocket = (config) => {
         if (isReadReceipt) {
             node.attrs.t = (0, Utils_1.unixTimestampSeconds)().toString();
         }
-        if (type === 'sender' && (0, WABinary_1.isJidUser)(jid)) {
+        if (type === 'sender' && WABinary_1.isJidUser(jid)) {
             node.attrs.recipient = jid;
             node.attrs.to = participant;
         }
@@ -91,7 +100,7 @@ const makeMessagesSocket = (config) => {
             }
         }
         if (type) {
-            node.attrs.type = (0, WABinary_1.isJidNewsLetter)(jid) ? 'read-self' : type;
+            node.attrs.type = WABinary_1.isJidNewsLetter(jid) ? 'read-self' : type;
         }
         const remainingMessageIds = messageIds.slice(1);
         if (remainingMessageIds.length) {
@@ -123,93 +132,72 @@ 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;
-        const deviceResults = [];
+        const deviceResults = []
+
         if (!useCache) {
-            logger.debug('not using cache for devices');
+            logger.debug('not using cache for devices')
         }
-        const toFetch = [];
-        jids = Array.from(new Set(jids));
+
+        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 user = WABinary_1.jidDecode(jid)?.user
+
+            jid = WABinary_1.jidNormalizedUser(jid)
+
             if (useCache) {
-                const devices = userDevicesCache.get(user);
+                const devices = userDevicesCache.get(user)
+
                 if (devices) {
-                    deviceResults.push(...devices);
-                    logger.trace({ user }, 'using cache for devices');
+                    deviceResults.push(...devices)
+                    logger.trace({ user }, 'using cache for devices')
                 }
+
                 else {
-                    toFetch.push(jid);
+                    toFetch.push(jid)
                 }
             }
+
             else {
-                toFetch.push(jid);
+                toFetch.push(jid)
             }
         }
+
         if (!toFetch.length) {
-            return deviceResults;
+            return deviceResults
         }
+
         const query = new WAUSync_1.USyncQuery()
             .withContext('message')
-            .withDeviceProtocol();
+            .withDeviceProtocol()
+
         for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid));
+            query.withUser(new WAUSync_1.USyncUser().withId(jid))
         }
-        const result = await sock.executeUSyncQuery(query);
+
+        const result = await 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 = {};
+            const extracted = Utils_1.extractDeviceJids(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);
+                deviceMap[item.user] = deviceMap[item.user] || []
+                deviceMap[item.user].push(item)
+                deviceResults.push(item)
             }
+
             for (const key in deviceMap) {
-                userDevicesCache.set(key, deviceMap[key]);
+                userDevicesCache.set(key, deviceMap[key])
             }
         }
-        return deviceResults;
-    };
+
+        return deviceResults
+    }
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
@@ -253,19 +241,20 @@ 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');
+        if (!authState.creds.me?.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 meJid = WABinary_1.jidNormalizedUser(authState.creds.me.id);
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
@@ -276,9 +265,8 @@ const makeMessagesSocket = (config) => {
         return msgId;
     };
     const createParticipantNodes = async (jids, message, extraAttrs) => {
-        let patched = await patchMessageBeforeSending(message, jids);
-        const requiredPatched = patchMessageRequiresBeforeSending(patched, jids);
-        const bytes = (0, Utils_1.encodeWAMessage)(requiredPatched);
+        const patched = await 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
@@ -303,21 +291,22 @@ const makeMessagesSocket = (config) => {
         }));
         return { nodes, shouldIncludeDeviceIdentity };
     }; //apela
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = true }) => {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
-        const { user, server } = (0, WABinary_1.jidDecode)(jid);
+        let didPushAdditional = false
+        const { user, server } = WABinary_1.jidDecode(jid);
         const statusJid = 'status@broadcast';
         const isGroup = server === 'g.us';
         const isStatus = jid === statusJid;
         const isLid = server === 'lid';
-        const isPrivate = server === 's.whatsapp.net';
+        const isPrivate = server === 's.whatsapp.net'
         const isNewsletter = server === 'newsletter';
-        msgId = msgId || (await config.generateMessageID() ?? (0, Utils_1.generateMessageID)());
+        msgId = msgId || (0, Utils_1.generateMessageID)();
         useUserDevicesCache = useUserDevicesCache !== false;
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
+        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) ? WABinary_1.jidEncode(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
         const binaryNodeContent = [];
         const devices = [];
         const meMsg = {
@@ -326,7 +315,9 @@ const makeMessagesSocket = (config) => {
                 message
             }
         };
-        const extraAttrs = {};
+        const extraAttrs = {}
+        const messages = Utils_1.normalizeMessageContent(message)  
+        const buttonType = getButtonType(messages);
         if (participant) {
             // when the retry request is not for a group
             // only send to the specific device that asked for a retry
@@ -334,58 +325,80 @@ const makeMessagesSocket = (config) => {
             if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
-            const { user, device } = (0, WABinary_1.jidDecode)(participant.jid);
+            const { user, device } = WABinary_1.jidDecode(participant.jid);
             devices.push({ user, device });
         }
         await authState.keys.transaction(async () => {
-            var _a, _b, _c, _d, _e, _f;
-            const mediaType = getMediaType(message);
+            const mediaType = getMediaType(messages);
+            
             if (mediaType) {
-                extraAttrs['mediatype'] = mediaType;
+                extraAttrs['mediatype'] = mediaType
             }
-            if ((_a = (0, Utils_1.normalizeMessageContent)(message)) === null || _a === void 0 ? void 0 : _a.pinInChatMessage) {
-                extraAttrs['decrypt-fail'] = 'hide';
+            
+            if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) {
+                extraAttrs['decrypt-fail'] = 'hide'
+            } 
+            
+            if (messages.interactiveResponseMessage?.nativeFlowResponseMessage) {
+                extraAttrs['native_flow_name'] = messages.interactiveResponseMessage?.nativeFlowResponseMessage.name
             }
+            
             if (isGroup || isStatus) {
                 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)) {
+                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
+                        if (groupData) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
-                        if (!groupData && !isStatus) {
-                            groupData = await groupMetadata(jid);
+
+                        else if (!isStatus) {
+                            groupData = await groupMetadata(jid)
                         }
+                        
                         return groupData;
                     })(),
                     (async () => {
                         if (!participant && !isStatus) {
-                            const result = await authState.keys.get('sender-key-memory', [jid]);
-                            return result[jid] || {};
+                            const result = await authState.keys.get('sender-key-memory', [jid])
+                            return result[jid] || {}
                         }
-                        return {};
-                    })()
+
+                        return {}
+
+                    })()         
                 ]);
                 if (!participant) {
-                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : [];
+                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
+
                     if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList);
+                        participantsList.push(...statusJidList)
                     }
-                    const additionalDevices = await 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 requiredPatched = patchMessageRequiresBeforeSending(patched, devices.map(d => (0, WABinary_1.jidEncode)(d.user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net', d.device)));
-                const bytes = (0, Utils_1.encodeWAMessage)(requiredPatched);
+
+                 //   if (!isStatus) {
+                 //       const expiration = await getEphemeralGroup(jid)
+                 //       additionalAttributes = {
+                 //           ...additionalAttributes, 
+                 //           addressing_mode: 'pn',
+                 //           ...expiration ? { expiration: expiration.toString() } : null
+                 //       }
+                 //   }
+
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
+                    devices.push(...additionalDevices)
+                }
+                
+                const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
+                const bytes = Utils_1.encodeWAMessage(patched);
+                
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
                     meId,
                 });
                 const senderKeyJids = [];
-                // ensure a connection is established with every device
+                
                 for (const { user, device } of devices) {
-                    const jid = (0, WABinary_1.jidEncode)(user, isLid ? 'lid' : 's.whatsapp.net', device);
+                    const jid = 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
@@ -403,107 +416,115 @@ const makeMessagesSocket = (config) => {
                         }
                     };
                     await assertSessions(senderKeyJids, false);
-                    const result = await createParticipantNodes(senderKeyJids, senderKeyMsg, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs);
+                    const result = await createParticipantNodes(senderKeyJids, 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 ((_a = message.protocolMessage) === null || _a === void 0 ? void 0 : _a.editedMessage) {
-                    msgId = (_b = message.protocolMessage.key) === null || _b === void 0 ? void 0 : _b.id;
-                    message = message.protocolMessage.editedMessage;
+                if (message.protocolMessage?.editedMessage) {
+                    msgId = message.protocolMessage.key?.id
+                    message = message.protocolMessage.editedMessage
                 }
+
                 // Message delete
-                if (((_c = message.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = (_d = message.protocolMessage.key) === null || _d === void 0 ? void 0 : _d.id;
-                    message = {};
-                }
-                const patched = await patchMessageBeforeSending(message, []);
-                const bytes = WAProto_1.proto.Message.encode(patched).finish();
+                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = message.protocolMessage.key?.id
+                    message = {}
+                }
+
+                const patched = await patchMessageBeforeSending(message, [])
+                const bytes = Utils_1.encodeNewsletterMessage(patched)
+
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: mediaType ? { mediatype: mediaType } : {},
+                    attrs: extraAttrs ? extraAttrs : {},
                     content: bytes
-                });
+                })
             }
             else {
-                const { user: meUser, device: meDevice } = (0, WABinary_1.jidDecode)(meId);
+                const { user: meUser } = WABinary_1.jidDecode(meId);
                 if (!participant) {
-                    devices.push({ user });
-                    // do not send message to self if the device is 0 (mobile)
-                    if (meDevice !== undefined && meDevice !== 0) {
-                        devices.push({ user: meUser });
+                    devices.push({ user })
+                    if (user !== meUser) {
+                        devices.push({ user: meUser })
                     }
-                    const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
-                    if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) !== 'peer') {
-                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true);
-                        devices.push(...additionalDevices);
+
+                    if (additionalAttributes?.['category'] !== 'peer') {
+                        const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
+
+                        devices.push(...additionalDevices)
                     }
-                    devices.push(...additionalDevices);
                 }
                 const allJids = [];
                 const meJids = [];
                 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 isMe = user === meUser
+                    const jid = WABinary_1.jidEncode(isMe && isLid ? authState.creds?.me?.lid?.split(':')[0] || user : user, isLid ? 'lid' : 's.whatsapp.net', device)
+
                     if (isMe) {
-                        meJids.push(jid);
+                        meJids.push(jid)
                     }
+
                     else {
-                        otherJids.push(jid);
+                        otherJids.push(jid)
                     }
-                    allJids.push(jid);
+
+                    allJids.push(jid)
                 }
                 await assertSessions(allJids, false);
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
-                    createParticipantNodes(meJids, meMsg, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs),
-                    createParticipantNodes(otherJids, message, mediaType ? { ...extraAttrs, mediatype: mediaType } : extraAttrs)
-                ]);
+                    createParticipantNodes(meJids, meMsg, extraAttrs),
+                    createParticipantNodes(otherJids, message, extraAttrs)
+                ])
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
             if (participants.length) {
-                if ((additionalAttributes === null || additionalAttributes === void 0 ? void 0 : additionalAttributes['category']) === 'peer') {
-                    const peerNode = (_e = (_d = participants[0]) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e[0];
+                if (additionalAttributes?.['category'] === 'peer') {
+                    const peerNode = participants[0]?.content?.[0]
+
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode); // push only enc
+                        binaryNodeContent.push(peerNode) // push only enc
                     }
                 }
+
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
                         attrs: {},
                         content: participants
-                    });
+                    })
                 }
             }
+
             const stanza = {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    type: isNewsletter ? getTypeMessage(message) : 'text',
+                    type: getTypeMessage(messages), 
                     ...(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)) {
+                if (WABinary_1.isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid;
                     stanza.attrs.participant = participant.jid;
                 }
-                else if ((0, WABinary_1.areJidsSameUser)(participant.jid, meId)) {
+                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid;
                     stanza.attrs.recipient = destinationJid;
                 }
@@ -522,220 +543,162 @@ const makeMessagesSocket = (config) => {
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
-            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);
+     
+            if (AI && isPrivate) {
+                const botNode = {
+                    tag: 'bot', 
+                    attrs: {
+                        biz_bot: '1'
+                    }
                 }
-                else {
-                    stanza.content.push(nativeNode);
+
+                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+
+                if (filteredBizBot) {
+                    stanza.content.push(...additionalNodes) 
+                    didPushAdditional = true
                 }
-            }/*
-            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) 
                 }
+            }
+            
+            if(!isNewsletter && buttonType && !isStatus) {             
+                const content = WABinary_1.getAdditionalNode(buttonType)
+                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
+
+                if (filteredNode) {
+                    didPushAdditional = true
+                    stanza.content.push(...additionalNodes)
+                } 
                 else {
-                    stanza.content.push(botNode);
+                    stanza.content.push(...content)
                 }
-            }*
-            if (message && message.listMessage) {
-                stanza.content.push({
-                    tag: 'biz',
-                    attrs: {},
-                    content: [
-                        {
-                            tag: 'list',
-                            attrs: getButtonArgs(message)
-                        }
-                    ]
-                });
-                logger.debug({ jid }, 'adding business node');
-            }*/
-            const buttonType = getButtonType(message);
-            if (buttonType) {
-                stanza.content.push({
-                    tag: 'biz',
-                    attrs: {},
-                    content: [
-                        {
-                            tag: buttonType,
-                            attrs: getButtonArgs(message),
-                        }
-                    ]
-                });
-                logger.debug({ jid }, 'adding business node');
+                logger.debug({ jid }, 'adding business node')
+            }         
+
+            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
+                stanza.content.push(...additionalNodes);
             }
+            
             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;
-        }
+        
+        message = Types_1.WAProto.Message.fromObject(message)
+    
+        const messageJSON = {
+            key: {
+               remoteJid: jid,
+               fromMe: true,
+               id: msgId
+            },
+            message: message,
+            messageTimestamp: Utils_1.unixTimestampSeconds(new Date()),
+            messageStubParameters: [],
+            participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? meId : undefined,
+            status: Types_1.WAMessageStatus.PENDING
+        }
+
+        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
+     //   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);
-        }
-        else if (msg.reactionMessage) {
-            return 'reaction';
-        }
-        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
-            return 'poll';
-        }
-        else if (getMediaType(msg)) {
-            return 'media';
-        }
+            const message = Utils_1.normalizeMessageContent(msg)  
+        if (message.reactionMessage) {
+            return 'reaction'
+        }       
+        else if (getMediaType(message)) {
+            return 'media'
+        }        
         else {
-            return 'text';
+            return 'text'
         }
-    };
+    }
+
     const getMediaType = (message) => {
         if (message.imageMessage) {
-            return 'image';
+            return 'image'
         }
         else if (message.videoMessage) {
-            return message.videoMessage.gifPlayback ? 'gif' : 'video';
+            return message.videoMessage.gifPlayback ? 'gif' : 'video'
         }
         else if (message.audioMessage) {
-            return message.audioMessage.ptt ? 'ptt' : 'audio';
+            return message.audioMessage.ptt ? 'ptt' : 'audio'
         }
         else if (message.contactMessage) {
-            return 'vcard';
+            return 'vcard'
         }
         else if (message.documentMessage) {
-            return 'document';
+            return 'document'
         }
         else if (message.contactsArrayMessage) {
-            return 'contact_array';
+            return 'contact_array'
         }
         else if (message.liveLocationMessage) {
-            return 'livelocation';
+            return 'livelocation'
         }
         else if (message.stickerMessage) {
-            return 'sticker';
+            return 'sticker'
         }
         else if (message.listMessage) {
-            return 'list';
+            return 'list'
         }
         else if (message.listResponseMessage) {
-            return 'list_response';
+            return 'list_response'
         }
         else if (message.buttonsResponseMessage) {
-            return 'buttons_response';
+            return 'buttons_response'
         }
         else if (message.orderMessage) {
-            return 'order';
+            return 'order'
         }
         else if (message.productMessage) {
-            return 'product';
+            return 'product'
         }
         else if (message.interactiveResponseMessage) {
-            return 'native_flow_response';
+            return 'native_flow_response'
         }
         else if (message.groupInviteMessage) {
-            return 'url';
+            return 'url'
         }
-    };
+        else if (/https:\/\/wa\.me\/p\/\d+\/\d+/.test(message.extendedTextMessage?.text)) {
+            return 'productlink'
+        }
+    }
+ 
     const getButtonType = (message) => {
-        if (message.buttonsMessage) {
-            return 'buttons';
+        if (message.listMessage) {
+            return 'list'
         }
-        else if (message.buttonsResponseMessage) {
-            return 'buttons_response';
+        else if (message.buttonsMessage) {
+            return 'buttons'
         }
-        else if (message.interactiveResponseMessage) {
-            return 'interactive_response';
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
+            return 'review_and_pay'
         }
-        else if (message.listMessage) {
-            return 'list';
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_order') {
+            return 'review_order'
         }
-        else if (message.listResponseMessage) {
-            return 'list_response';
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_info') {
+            return 'payment_info'
         }
-    };
-    const getButtonArgs = (message) => {
-        if (message.templateMessage) {
-            // TODO: Add attributes
-            return {};
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_status') {
+            return 'payment_status'
         }
-        else if (message.listMessage) {
-            const type = message.listMessage.listType;
-            if (!type) {
-                throw new boom_1.Boom('Expected list type inside message');
-            }
-            return { v: '2', type: ListType[type].toLowerCase() };
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
+            return 'payment_method'
         }
-        else {
-            return {};
+        else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
+            return 'interactive'
         }
-    };
+        else if (message.interactiveMessage?.nativeFlowMessage) {
+            return 'native_flow'
+        }
+    }
     const getPrivacyTokens = async (jids) => {
-        const t = (0, Utils_1.unixTimestampSeconds)().toString();
+        const t = Utils_1.unixTimestampSeconds().toString();
         const result = await query({
             tag: 'iq',
             attrs: {
@@ -750,7 +713,7 @@ const makeMessagesSocket = (config) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: (0, WABinary_1.jidNormalizedUser)(jid),
+                            jid: WABinary_1.jidNormalizedUser(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -759,8 +722,9 @@ const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    };
+    }  
     const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
+    const rahmi = new kikyy(Utils_1, waUploadToServer, relayMessage);
     const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
@@ -769,24 +733,23 @@ const makeMessagesSocket = (config) => {
         relayMessage,
         sendReceipt,
         sendReceipts,
-        getButtonArgs,
+        rahmi,
         readMessages,
         refreshMediaConn,
         getUSyncDevices,
-        sendPeerDataOperationMessage,
         createParticipantNodes,
-        profilePictureUrl,
         waUploadToServer,
+        sendPeerDataOperationMessage,
         fetchPrivacySettings,
         updateMediaMessage: async (message) => {
             const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
-            const node = await (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
+            const node = (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
             let error = undefined;
             await Promise.all([
                 sendNode(node),
-                waitForMsgMediaUpdate(async update => {
+                waitForMsgMediaUpdate(update => {
                     const result = update.find(c => c.key.id === message.key.id);
                     if (result) {
                         if (result.error) {
@@ -794,8 +757,8 @@ const makeMessagesSocket = (config) => {
                         }
                         else {
                             try {
-                                const media = await (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
-                                if (media && media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
+                                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 });
                                 }
@@ -815,273 +778,132 @@ const makeMessagesSocket = (config) => {
                 throw error;
             }
             ev.emit('messages.update', [
-                { key: message.key, update: { message: message.message } }
+                {
+                    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);
+        sendMessage: async (jid, content, options = {}) => {
+            const userJid = authState.creds.me.id;
+            delete options.ephemeralExpiration
+            const { filter = false, quoted } = options;
+            const getParticipantAttr = () => filter ? { participant: { jid } } : {};
+            const messageType = rahmi.detectType(content);
+            if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
+                typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
+                const { disappearingMessagesInChat } = content
+
+                const value = typeof disappearingMessagesInChat === 'boolean' ?
+                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
+                    disappearingMessagesInChat
+
+                await groupToggleEphemeral(jid, value)
+            }
+            
+            else {
+                let mediaHandle
+
+   
+            if (messageType) {
+                switch(messageType) {
+                    case 'PAYMENT':
+                        const paymentContent = await rahmi.handlePayment(content, quoted);
+                        return await relayMessage(jid, paymentContent, {
+                            messageId: Utils_1.generateMessageID(),
+                            ...getParticipantAttr()
+                        });
+                
+                    case 'PRODUCT':
+                        const productContent = await rahmi.handleProduct(content, jid, quoted);
+                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
+                        return await relayMessage(jid, productMsg.message, {
+                            messageId: productMsg.key.id,
+                            ...getParticipantAttr()
+                        });
+                
+                    case 'INTERACTIVE':
+                        const interactiveContent = await rahmi.handleInteractive(content, jid, quoted);
+                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
+                        return await relayMessage(jid, interactiveMsg.message, {
+                            messageId: interactiveMsg.key.id,
+                            ...getParticipantAttr()
+                        });
+                    case 'ALBUM':
+                        return await rahmi.handleAlbum(content, jid, quoted)
+                    case 'EVENT':
+                        return await rahmi.handleEvent(content, jid, quoted)
+                    case 'POLL_RESULT':
+                        return await rahmi.handlePollResult(content, jid, quoted)
+                    case 'GROUP_STORY':
+                        return await rahmi.handleGroupStory(content, jid, quoted)
                 }
             }
-            ;
-            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, {
+            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
                 logger,
                 userJid,
-                getUrlInfo: text => (0, link_preview_1.getUrlInfo)(text, {
+                quoted,
+                getUrlInfo: text => link_preview_1.getUrlInfo(text, {
                     thumbnailWidth: linkPreviewImageThumbnailWidth,
                     fetchOpts: {
                         timeout: 3000,
                         ...axiosOptions || {}
                     },
                     logger,
-                    uploadImage: generateHighQualityLinkPreview
-                        ? waUploadToServer
-                        : undefined
+                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
                 }),
                 upload: async (readStream, opts) => {
-                    const up = await waUploadToServer(readStream, { ...opts });
-                    mediaHandle = up.handle;
+                    const up = await waUploadToServer(readStream, {
+                        ...opts,
+                        newsletter: WABinary_1.isJidNewsLetter(jid)
+                    });
                     return up;
                 },
                 mediaCache: config.mediaCache,
                 options: config.options,
-                backgroundColor: getRandomHexColor(),
-                font: Math.floor(Math.random() * 9),
+                ...options
             });
-            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;
-            const userJid = authState.creds.me.id;
-            if (typeof content === 'object' &&
-                'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                (0, WABinary_1.isJidGroup)(jid)) {
-                const { disappearingMessagesInChat } = content;
-                const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-                    disappearingMessagesInChat;
-                await groupToggleEphemeral(jid, value);
+            
+            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 = [];
+
+            if (isDeleteMsg) {
+                const fromMe = content.delete?.fromMe;
+                const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
+                additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
+            } else if (isEditMsg) {
+                additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
+            } else if (isAiMsg) {
+                additionalNodes.push({
+                    attrs: { 
+                        biz_bot: '1' 
+                    }, tag: "bot" 
+                });
             }
-            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: {
-                            timeout: 3000,
-                            ...axiosOptions || {}
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview
-                            ? waUploadToServer
-                            : undefined
-                    }),
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, { ...opts, newsletter: (0, WABinary_1.isJidNewsLetter)(jid) });
-                        mediaHandle = up.handle;
-                        return up;
-                    },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    messageId: await config.generateMessageIDV2((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id) ?? (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
-                    ...options,
+            
+            await 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'));
                 });
-                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;
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                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)) {
-                        additionalAttributes.edit = '8';
-                    }
-                    else {
-                        additionalAttributes.edit = '7';
-                    }
-                }
-                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'
-                    });
-                    if (options.additionalNodes) {
-                        additionalNodes.push(...options.additionalNodes);
-                    }
-                }
-                if (mediaHandle) {
-                    additionalAttributes['media_id'] = mediaHandle;
-                }
-                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 });
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => (upsertMessage(fullMsg, 'append')));
-                    });
-                }
-                return fullMsg;
+            }
+            return fullMsg;
             }
         }
-    };
+    }
 };
 exports.makeMessagesSocket = makeMessagesSocket;