@dyyxyzz/baileys-mod 6.0.42 → 6.0.44

package/lib/Socket/messages-send.js

@@ -17,6 +17,76 @@ const newsletter_1 = require("./newsletter");
 const WAUSync_1 = require("../WAUSync")
 const kikyy = require('./dugong');
 var ListType = WAProto_1.proto.Message.ListMessage.ListType;
+
+// TAMBAHAN BARU: Helper functions untuk button di newsletter
+const getAdditionalNode = (buttonType) => {
+    const nodes = []
+    
+    switch(buttonType) {
+        case 'list':
+            nodes.push({
+                tag: 'biz',
+                attrs: {},
+                content: [{
+                    tag: 'list_message',
+                    attrs: { v: '2' }
+                }]
+            })
+            break
+            
+        case 'buttons':
+            nodes.push({
+                tag: 'biz',
+                attrs: {},
+                content: [{
+                    tag: 'buttons_message',
+                    attrs: { v: '2' }
+                }]
+            })
+            break
+            
+        case 'interactive':
+        case 'native_flow':
+            nodes.push({
+                tag: 'biz',
+                attrs: {},
+                content: [{
+                    tag: 'native_flow',
+                    attrs: { v: '3' }
+                }]
+            })
+            break
+            
+        case 'review_and_pay':
+        case 'review_order':
+        case 'payment_info':
+        case 'payment_status':
+        case 'payment_method':
+            nodes.push({
+                tag: 'biz',
+                attrs: {},
+                content: [{
+                    tag: 'payment',
+                    attrs: { v: '2' }
+                }]
+            })
+            break
+    }
+    
+    return nodes
+}
+
+const getBinaryNodeFilter = (nodes) => {
+    if (!nodes || !Array.isArray(nodes) || nodes.length === 0) return false
+    
+    return nodes.some(node => 
+        node.tag === 'biz' || 
+        node.tag === 'bot' ||
+        node.tag === 'native_flow' ||
+        node.tag === 'payment'
+    )
+}
+
 const makeMessagesSocket = (config) => {
     const {
         logger,
@@ -428,27 +498,65 @@ const makeMessagesSocket = (config) => {
                 await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
             }
             else if (isNewsletter) {
-                // Message edit
-                if (message.protocolMessage?.editedMessage) {
-                    msgId = message.protocolMessage.key?.id
-                    message = message.protocolMessage.editedMessage
-                }
+    // 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 = {}
-                }
+    // 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)
+    const patched = await patchMessageBeforeSending(message, [])
+    const bytes = Utils_1.encodeNewsletterMessage(patched)
+    
+    // Detect button type dan media type
+    const buttonType = getButtonType(patched)
+    const mediaType = getMediaType(patched)
+    
+    // Set extraAttrs untuk newsletter
+    if (mediaType) {
+        extraAttrs['mediatype'] = mediaType
+    }
+    
+    if (patched.pinInChatMessage || patched.keepInChatMessage || 
+        patched.reactionMessage || patched.protocolMessage?.editedMessage) {
+        extraAttrs['decrypt-fail'] = 'hide'
+    }
+    
+    if (patched.interactiveResponseMessage?.nativeFlowResponseMessage) {
+        extraAttrs['native_flow_name'] = patched.interactiveResponseMessage?.nativeFlowResponseMessage.name
+    }
+    
+    if (patched.interactiveMessage?.nativeFlowMessage) {
+        extraAttrs['native_flow_name'] = patched.interactiveMessage?.nativeFlowMessage?.name || 'flow'
+    }
 
-                binaryNodeContent.push({
-                    tag: 'plaintext',
-                    attrs: extraAttrs ? extraAttrs : {},
-                    content: bytes
-                })
-            }
+    binaryNodeContent.push({
+        tag: 'plaintext',
+        attrs: extraAttrs,
+        content: bytes
+    })
+    
+    // TAMBAHAN: Push button nodes untuk newsletter
+    if (buttonType && !didPushAdditional) {
+        const content = getAdditionalNode(buttonType)
+        const filteredNode = getBinaryNodeFilter(additionalNodes || [])
+
+        if (filteredNode && additionalNodes) {
+            binaryNodeContent.push(...additionalNodes)
+            didPushAdditional = true
+        } else if (content && content.length > 0) {
+            binaryNodeContent.push(...content)
+            didPushAdditional = true
+        }
+        
+        logger.debug({ jid, buttonType }, 'adding button node to newsletter')
+    }
+}
             else {
                 const { user: meUser } = WABinary_1.jidDecode(meId);
                 if (!participant) {
@@ -516,9 +624,24 @@ 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 (isNewsletter && !didPushAdditional) {
+    const buttonType = getButtonType(messages)
+    
+    if (buttonType) {
+        const content = WABinary_1.getAdditionalNode(buttonType)
+        const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes || [])
+
+        if (filteredNode && additionalNodes) {
+            stanza.content.push(...additionalNodes)
+            didPushAdditional = true
+        } else if (content && content.length > 0) {
+            stanza.content.push(...content)
+            didPushAdditional = true
+        }
+        
+        logger.debug({ jid, buttonType }, 'adding button node to newsletter')
+    }
+}
             if (participant) {
                 if (WABinary_1.isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid;
@@ -669,34 +792,40 @@ const makeMessagesSocket = (config) => {
     }
  
     const getButtonType = (message) => {
-        if (message.listMessage) {
-            return 'list'
-        }
-        else if (message.buttonsMessage) {
-            return 'buttons'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
-            return 'review_and_pay'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_order') {
-            return 'review_order'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_info') {
-            return 'payment_info'
-        }
-        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_status') {
-            return 'payment_status'
-        }
-        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'
-        }
+    if (message.listMessage) {
+        return 'list'
+    }
+    else if (message.buttonsMessage) {
+        return 'buttons'
+    }
+    else if (message.viewOnceMessage?.message?.interactiveMessage) {
+        return 'interactive'
+    }
+    else if (message.viewOnceMessageV2?.message?.interactiveMessage) {
+        return 'interactive'
+    }
+    else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_and_pay') {
+        return 'review_and_pay'
+    }
+    else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'review_order') {
+        return 'review_order'
+    }
+    else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_info') {
+        return 'payment_info'
+    }
+    else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_status') {
+        return 'payment_status'
+    }
+    else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
+        return 'payment_method'
+    }
+    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({

package/package.json

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