@dyyxyzz/baileys-mod 6.0.46 → 6.0.48

package/lib/Socket/messages-send.js

@@ -18,76 +18,6 @@ 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,
@@ -361,8 +291,7 @@ const makeMessagesSocket = (config) => {
             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;
@@ -446,6 +375,15 @@ const makeMessagesSocket = (config) => {
                         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)
                 }
@@ -505,32 +443,10 @@ const makeMessagesSocket = (config) => {
 
                 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,
+                    attrs: extraAttrs ? extraAttrs : {},
                     content: bytes
                 })
             }
@@ -601,7 +517,6 @@ 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
@@ -621,7 +536,6 @@ const makeMessagesSocket = (config) => {
             else {
                 stanza.attrs.to = destinationJid;
             }
-            
             if (shouldIncludeDeviceIdentity) {
                 stanza.content.push({
                     tag: 'device-identity',
@@ -631,7 +545,7 @@ const makeMessagesSocket = (config) => {
                 logger.debug({ jid }, 'adding device identity');
             }
      
-            if (AI && isPrivate && !didPushAdditional) {
+            if (AI && isPrivate) {
                 const botNode = {
                     tag: 'bot', 
                     attrs: {
@@ -639,43 +553,31 @@ const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
 
-                if (filteredBizBot && additionalNodes) {
+                if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
                     didPushAdditional = true
                 }
+
                 else {
-                    stanza.content.push(botNode)
-                    didPushAdditional = true
+                    stanza.content.push(botNode) 
                 }
             }
             
             if(!isNewsletter && buttonType && !isStatus) {             
-    const content = getAdditionalNode(buttonType)
-    const filteredNode = getBinaryNodeFilter(additionalNodes)
-
-    if (filteredNode && additionalNodes) {
-        stanza.content.push(...additionalNodes)
-        didPushAdditional = true
-    } 
-    else if (content && content.length > 0 && !didPushAdditional) {
-        stanza.content.push(...content)
-        didPushAdditional = true
-    }
-    logger.debug({ jid }, 'adding business node')
-}
-            
-            // KHUSUS NEWSLETTER: Tambah button node
-            if (isNewsletter && buttonType && !didPushAdditional) {
-                const content = getAdditionalNode(buttonType)
+                const content = WABinary_1.getAdditionalNode(buttonType)
+                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
 
-                if (content && content.length > 0) {
-                    stanza.content.push(...content)
+                if (filteredNode) {
                     didPushAdditional = true
-                    logger.debug({ jid, buttonType }, 'adding button node to newsletter')
+                    stanza.content.push(...additionalNodes)
+                } 
+                else {
+                    stanza.content.push(...content)
                 }
-            }
+                logger.debug({ jid }, 'adding business node')
+            }         
 
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
@@ -701,10 +603,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'
         }       
@@ -774,12 +676,6 @@ const makeMessagesSocket = (config) => {
         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'
         }
@@ -795,14 +691,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({
@@ -829,11 +724,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,
@@ -901,7 +794,6 @@ 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
@@ -912,112 +804,107 @@ const makeMessagesSocket = (config) => {
 
                 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.46",
+    "version": "6.0.48",
     "description": "WhatsApp API Modification",
     "keywords": [
         "whatsapp",