@dyyxyzz/baileys-mod 6.0.41 → 6.0.43

package/lib/Socket/messages-send.js

@@ -8,6 +8,7 @@ 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 axios_1 = require("axios")
 const Types_1 = require("../Types")
 const Utils_1 = require("../Utils");
 const link_preview_1 = require("../Utils/link-preview");
@@ -15,9 +16,7 @@ const WABinary_1 = require("../WABinary");
 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,
@@ -26,7 +25,6 @@ const makeMessagesSocket = (config) => {
         options: axiosOptions,
         patchMessageBeforeSending
     } = config;
-    
     const sock = (0, newsletter_1.makeNewsletterSocket)(config);
     const {
         ev, 
@@ -42,14 +40,11 @@ const makeMessagesSocket = (config) => {
         groupToggleEphemeral,
         executeUSyncQuery
     } = sock;
-    
     const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
     });
-    
     let mediaConn;
-    
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn;
         if (!media || forceGet || (new Date().getTime() - media.fetchDate.getTime()) > media.ttl * 1000) {
@@ -79,7 +74,10 @@ const makeMessagesSocket = (config) => {
         }
         return mediaConn;
     };
-
+    /**
+     * generic send receipt function
+     * used for receipts of phone call, read, delivery etc.
+     * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
         const node = {
             tag: 'receipt',
@@ -120,69 +118,86 @@ const makeMessagesSocket = (config) => {
         logger.debug({ attrs: node.attrs, messageIds }, 'sending receipt for messages');
         await sendNode(node);
     };
-
+    /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
         const recps = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys);
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type);
         }
     };
-
+    /** Bulk read messages. Keys can be from different chats & participants */
     const readMessages = async (keys) => {
         const privacySettings = await fetchPrivacySettings();
+        // based on privacy settings, we have to change the read type
         const readType = privacySettings.readreceipts === 'all' ? 'read' : 'read-self';
         await sendReceipts(keys, readType);
     };
-
+    /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
         const deviceResults = []
+
         if (!useCache) {
             logger.debug('not using cache for devices')
         }
+
         const toFetch = []
+
         jids = Array.from(new Set(jids))
+
         for (let jid of jids) {
             const user = WABinary_1.jidDecode(jid)?.user
+
             jid = WABinary_1.jidNormalizedUser(jid)
+
             if (useCache) {
                 const devices = userDevicesCache.get(user)
+
                 if (devices) {
                     deviceResults.push(...devices)
                     logger.trace({ user }, 'using cache for devices')
                 }
+
                 else {
                     toFetch.push(jid)
                 }
             }
+
             else {
                 toFetch.push(jid)
             }
         }
+
         if (!toFetch.length) {
             return deviceResults
         }
+
         const query = new WAUSync_1.USyncQuery()
             .withContext('message')
             .withDeviceProtocol()
+
         for (const jid of toFetch) {
             query.withUser(new WAUSync_1.USyncUser().withId(jid))
         }
+
         const result = await executeUSyncQuery(query)
+
         if (result) {
             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)
             }
+
             for (const key in deviceMap) {
                 userDevicesCache.set(key, deviceMap[key])
             }
         }
+
         return deviceResults
     }
-
     const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
         let jidsRequiringFetch = [];
@@ -190,10 +205,12 @@ const makeMessagesSocket = (config) => {
             jidsRequiringFetch = jids;
         }
         else {
-            const addrs = jids.map(jid => (signalRepository.jidToSignalProtocolAddress(jid)));
+            const addrs = jids.map(jid => (signalRepository
+                .jidToSignalProtocolAddress(jid)));
             const sessions = await authState.keys.get('session', addrs);
             for (const jid of jids) {
-                const signalId = signalRepository.jidToSignalProtocolAddress(jid);
+                const signalId = signalRepository
+                    .jidToSignalProtocolAddress(jid);
                 if (!sessions[signalId]) {
                     jidsRequiringFetch.push(jid);
                 }
@@ -224,11 +241,13 @@ const makeMessagesSocket = (config) => {
         }
         return didFetchNewSession;
     };
-
+    
+ 
     const sendPeerDataOperationMessage = async (pdoMessage) => {
         if (!authState.creds.me?.id) {
             throw new boom_1.Boom('Not authenticated')
         }
+        
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
@@ -239,18 +258,19 @@ const makeMessagesSocket = (config) => {
         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);
         let shouldIncludeDeviceIdentity = false;
         const nodes = await Promise.all(jids.map(async (jid) => {
-            const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes });
+            const { type, ciphertext } = await signalRepository
+                .encryptMessage({ jid, data: bytes });
             if (type === 'pkmsg') {
                 shouldIncludeDeviceIdentity = true;
             }
@@ -258,20 +278,19 @@ const makeMessagesSocket = (config) => {
                 tag: 'to',
                 attrs: { jid },
                 content: [{
-                    tag: 'enc',
-                    attrs: {
-                        v: '2',
-                        type,
-                        ...extraAttrs || {}
-                    },
-                    content: ciphertext
-                }]
+                        tag: 'enc',
+                        attrs: {
+                            v: '2',
+                            type,
+                            ...extraAttrs || {}
+                        },
+                        content: ciphertext
+                    }]
             };
             return node;
         }));
         return { nodes, shouldIncludeDeviceIdentity };
-    };
-
+    }; //apela
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = false }) => {
         const meId = authState.creds.me.id;
         let shouldIncludeDeviceIdentity = false;
@@ -299,15 +318,16 @@ const makeMessagesSocket = (config) => {
         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
+            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
             const { user, device } = WABinary_1.jidDecode(participant.jid);
             devices.push({ user, device });
         }
-        
         await authState.keys.transaction(async () => {
             const mediaType = getMediaType(messages);
             
@@ -330,9 +350,11 @@ const makeMessagesSocket = (config) => {
                         if (groupData) {
                             logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
                         }
+
                         else if (!isStatus) {
                             groupData = await groupMetadata(jid)
                         }
+                        
                         return groupData;
                     })(),
                     (async () => {
@@ -340,15 +362,27 @@ const makeMessagesSocket = (config) => {
                             const result = await authState.keys.get('sender-key-memory', [jid])
                             return result[jid] || {}
                         }
+
                         return {}
+
                     })()         
                 ]);
-                
                 if (!participant) {
                     const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
+
                     if (isStatus && statusJidList) {
                         participantsList.push(...statusJidList)
                     }
+
+                 //   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)
                 }
@@ -361,16 +395,18 @@ const makeMessagesSocket = (config) => {
                     data: bytes,
                     meId,
                 });
-                
                 const senderKeyJids = [];
+                
                 for (const { user, device } of devices) {
                     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
                         senderKeyMap[jid] = true;
                     }
                 }
-                
+                // if there are some participants with whom the session has not been established
+                // if there are, we re-send the senderkey
                 if (senderKeyJids.length) {
                     logger.debug({ senderKeyJids }, 'sending new sender key');
                     const senderKeyMsg = {
@@ -384,7 +420,6 @@ const makeMessagesSocket = (config) => {
                     shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
                     participants.push(...result.nodes);
                 }
-                
                 binaryNodeContent.push({
                     tag: 'enc',
                     attrs: { v: '2', type: 'skmsg', ...extraAttrs },
@@ -393,37 +428,60 @@ const makeMessagesSocket = (config) => {
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
             else if (isNewsletter) {
-                if (message.protocolMessage?.editedMessage) {
-                    msgId = message.protocolMessage.key?.id
-                    message = message.protocolMessage.editedMessage
-                }
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-                    msgId = message.protocolMessage.key?.id
-                    message = {}
-                }
-                
-                // 🔥 FIX: Deteksi button di newsletter SEBELUM encoding
-                const hasButtonParams = buttonType || 
-                    messages.interactiveMessage?.nativeFlowMessage || 
-                    messages.buttonsMessage ||
-                    messages.listMessage;
-                
-                // Patch message dengan button support
-                const patched = await patchMessageBeforeSending(message, [])
-                const bytes = Utils_1.encodeNewsletterMessage(patched)
-                
-                // Push plaintext content
-                binaryNodeContent.push({
-                    tag: 'plaintext',
-                    attrs: extraAttrs ? extraAttrs : {},
-                    content: bytes
-                })
-                
-                // 🔥 CRITICAL: Tambahin button node untuk newsletter
-                if (hasButtonParams) {
-                    logger.debug({ jid, buttonType }, 'adding button node for newsletter')
-                }
-            }
+    // Message edit
+    if (message.protocolMessage?.editedMessage) {
+        msgId = message.protocolMessage.key?.id
+        message = message.protocolMessage.editedMessage
+    }
+
+    // Message delete
+    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)
+    
+    // Tambahkan logic untuk detect button type
+    const buttonType = getButtonType(patched)
+    const mediaType = getMediaType(patched)
+    
+    // Set media type di extraAttrs kalo ada
+    if (mediaType) {
+        extraAttrs['mediatype'] = mediaType
+    }
+    
+    // Set decrypt-fail untuk message tertentu
+    if (patched.pinInChatMessage || patched.keepInChatMessage || 
+        patched.reactionMessage || patched.protocolMessage?.editedMessage) {
+        extraAttrs['decrypt-fail'] = 'hide'
+    }
+    
+    // Tambah native flow name kalo ada
+    if (patched.interactiveResponseMessage?.nativeFlowResponseMessage) {
+        extraAttrs['native_flow_name'] = patched.interactiveResponseMessage?.nativeFlowResponseMessage.name
+    }
+
+    binaryNodeContent.push({
+        tag: 'plaintext',
+        attrs: extraAttrs,
+        content: bytes
+    })
+    
+    if (buttonType) {
+        const content = WABinary_1.getAdditionalNode(buttonType)
+        const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
+
+        if (filteredNode) {
+            didPushAdditional = true
+            stanza.content.push(...additionalNodes)
+        } else {
+            binaryNodeContent.push(...content)
+        }
+        logger.debug({ jid }, 'adding business node to newsletter')
+    }
+}
             else {
                 const { user: meUser } = WABinary_1.jidDecode(meId);
                 if (!participant) {
@@ -431,27 +489,30 @@ const makeMessagesSocket = (config) => {
                     if (user !== meUser) {
                         devices.push({ user: meUser })
                     }
+
                     if (additionalAttributes?.['category'] !== 'peer') {
                         const additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
+
                         devices.push(...additionalDevices)
                     }
                 }
-                
                 const allJids = [];
                 const meJids = [];
                 const otherJids = [];
                 for (const { user, device } of devices) {
                     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)
                     }
+
                     else {
                         otherJids.push(jid)
                     }
+
                     allJids.push(jid)
                 }
-                
                 await assertSessions(allJids, false);
                 const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
                     createParticipantNodes(meJids, meMsg, extraAttrs),
@@ -461,14 +522,15 @@ const makeMessagesSocket = (config) => {
                 participants.push(...otherNodes);
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
-            
             if (participants.length) {
                 if (additionalAttributes?.['category'] === 'peer') {
                     const peerNode = participants[0]?.content?.[0]
+
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode)
+                        binaryNodeContent.push(peerNode) // push only enc
                     }
                 }
+
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
@@ -487,7 +549,9 @@ const makeMessagesSocket = (config) => {
                 },
                 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 (WABinary_1.isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid;
@@ -504,7 +568,6 @@ const makeMessagesSocket = (config) => {
             else {
                 stanza.attrs.to = destinationJid;
             }
-            
             if (shouldIncludeDeviceIdentity) {
                 stanza.content.push({
                     tag: 'device-identity',
@@ -521,39 +584,31 @@ const makeMessagesSocket = (config) => {
                         biz_bot: '1'
                     }
                 }
+
                 const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+
                 if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
                     didPushAdditional = true
                 }
+
                 else {
                     stanza.content.push(botNode) 
                 }
             }
             
-            // 🔥 FIX UTAMA: Support button params untuk SEMUA tipe (termasuk channel/newsletter)
-            if (!isStatus) {
-                // Deteksi apakah ada button params dalam message
-                const hasButtonParams = buttonType || 
-                    messages.interactiveMessage?.nativeFlowMessage || 
-                    messages.buttonsMessage ||
-                    messages.listMessage;
-                
-                if (hasButtonParams) {
-                    // 🔥 CRITICAL FIX: Newsletter butuh business node meskipun plaintext
-                    const content = WABinary_1.getAdditionalNode(buttonType || 'interactive')
-                    const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
-
-                    if (filteredNode) {
-                        didPushAdditional = true
-                        stanza.content.push(...additionalNodes)
-                    } 
-                    else if (content && content.length > 0) {
-                        // Push business node bahkan untuk newsletter
-                        stanza.content.push(...content)
-                        logger.debug({ jid, buttonType, isNewsletter }, 'added business node for buttons')
-                    }
+            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(...content)
                 }
+                logger.debug({ jid }, 'adding business node')
             }         
 
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
@@ -580,10 +635,10 @@ const makeMessagesSocket = (config) => {
         }
 
         return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
+     //   return msgId;
     };
-
     const getTypeMessage = (msg) => {
-        const message = Utils_1.normalizeMessageContent(msg)  
+            const message = Utils_1.normalizeMessageContent(msg)  
         if (message.reactionMessage) {
             return 'reaction'
         }       
@@ -668,14 +723,13 @@ const makeMessagesSocket = (config) => {
         else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
             return 'payment_method'
         }
+        else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
+            return 'interactive'
+        }
         else if (message.interactiveMessage?.nativeFlowMessage) {
             return 'native_flow'
         }
-        else if (message.interactiveMessage) {
-            return 'interactive'
-        }
     }
-
     const getPrivacyTokens = async (jids) => {
         const t = Utils_1.unixTimestampSeconds().toString();
         const result = await query({
@@ -702,11 +756,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,
         getPrivacyTokens,
@@ -774,120 +826,118 @@ const makeMessagesSocket = (config) => {
             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 {
-                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 fullMsg = await Utils_1.generateWAMessage(jid, content, {
-                    logger,
-                    userJid,
-                    quoted,
-                    getUrlInfo: text => 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: WABinary_1.isJidNewsLetter(jid)
+                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()
                         });
-                        return up;
-                    },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    ...options
-                });
                 
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isEditMsg = 'edit' in content && !!content.edit;
-                const isAiMsg = 'ai' in content && !!content.ai;
+                    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()
+                        });
                 
-                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" 
-                    });
+                    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)
                 }
-                
-                await relayMessage(jid, fullMsg.message, {
-                    messageId: fullMsg.key.id,
-                    cachedGroupMetadata: options.cachedGroupMetadata,
-                    additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
-                    additionalAttributes,
-                    statusJidList: options.statusJidList,
-                    AI: isAiMsg
-                });
-                
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+            }
+            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                logger,
+                userJid,
+                quoted,
+                getUrlInfo: text => 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: WABinary_1.isJidNewsLetter(jid)
                     });
-                }
-                return fullMsg;
+                    return up;
+                },
+                mediaCache: config.mediaCache,
+                options: config.options,
+                ...options
+            });
+            
+            const isDeleteMsg = 'delete' in content && !!content.delete;
+            const isEditMsg = 'edit' in content && !!content.edit;
+            const isAiMsg = 'ai' in content && !!content.ai;
+            
+            const additionalAttributes = {};
+            const additionalNodes = [];
+
+            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" 
+                });
+            }
+            
+            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;
             }
         }
-    };
+    }
 };
-
 exports.makeMessagesSocket = makeMessagesSocket;
+

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dyyxyzz/baileys-mod",
-    "version": "6.0.41",
+    "version": "6.0.43",
     "description": "WhatsApp API Modification",
     "keywords": [
         "whatsapp",