@dyyxyzz/baileys-mod 6.0.44 → 6.0.45

package/lib/Socket/messages-send.js

@@ -1,3 +1,4 @@
+
 "use strict"; 
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -360,7 +361,8 @@ 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;
@@ -444,15 +446,6 @@ 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)
                 }
@@ -498,65 +491,49 @@ 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 delete
-    if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
-        msgId = message.protocolMessage.key?.id
-        message = {}
-    }
+                // Message edit
+                if (message.protocolMessage?.editedMessage) {
+                    msgId = message.protocolMessage.key?.id
+                    message = message.protocolMessage.editedMessage
+                }
 
-    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'
-    }
+                // Message delete
+                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = message.protocolMessage.key?.id
+                    message = {}
+                }
 
-    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 || [])
+                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'
+                }
 
-        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')
-    }
-}
+                binaryNodeContent.push({
+                    tag: 'plaintext',
+                    attrs: extraAttrs,
+                    content: bytes
+                })
+            }
             else {
                 const { user: meUser } = WABinary_1.jidDecode(meId);
                 if (!participant) {
@@ -624,24 +601,10 @@ const makeMessagesSocket = (config) => {
                 },
                 content: binaryNodeContent
             }
-            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 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;
@@ -658,6 +621,7 @@ const makeMessagesSocket = (config) => {
             else {
                 stanza.attrs.to = destinationJid;
             }
+            
             if (shouldIncludeDeviceIdentity) {
                 stanza.content.push({
                     tag: 'device-identity',
@@ -667,7 +631,7 @@ const makeMessagesSocket = (config) => {
                 logger.debug({ jid }, 'adding device identity');
             }
      
-            if (AI && isPrivate) {
+            if (AI && isPrivate && !didPushAdditional) {
                 const botNode = {
                     tag: 'bot', 
                     attrs: {
@@ -675,31 +639,43 @@ const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
 
-                if (filteredBizBot) {
+                if (filteredBizBot && additionalNodes) {
                     stanza.content.push(...additionalNodes) 
                     didPushAdditional = true
                 }
-
                 else {
-                    stanza.content.push(botNode) 
+                    stanza.content.push(botNode)
+                    didPushAdditional = true
                 }
             }
             
-            if(!isNewsletter && buttonType && !isStatus) {             
-                const content = WABinary_1.getAdditionalNode(buttonType)
-                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
+            if(!isNewsletter && buttonType && !isStatus && !didPushAdditional) {             
+                const content = getAdditionalNode(buttonType)
+                const filteredNode = getBinaryNodeFilter(additionalNodes)
 
-                if (filteredNode) {
-                    didPushAdditional = true
+                if (filteredNode && additionalNodes) {
                     stanza.content.push(...additionalNodes)
+                    didPushAdditional = true
                 } 
-                else {
+                else if (content && content.length > 0) {
                     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)
+
+                if (content && content.length > 0) {
+                    stanza.content.push(...content)
+                    didPushAdditional = true
+                    logger.debug({ jid, buttonType }, 'adding button node to newsletter')
+                }
+            }
 
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
@@ -725,10 +701,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'
         }       
@@ -792,40 +768,41 @@ const makeMessagesSocket = (config) => {
     }
  
     const getButtonType = (message) => {
-    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'
+        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({
@@ -852,9 +829,11 @@ 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,
@@ -922,6 +901,7 @@ 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
@@ -932,108 +912,112 @@ const makeMessagesSocket = (config) => {
 
                 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()
-                        });
+                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)
+                    }
+                }
                 
-                    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()
+                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)
                         });
-                    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 || {}
+                        return up;
                     },
-                    logger,
-                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                }),
-                upload: async (readStream, opts) => {
-                    const up = await waUploadToServer(readStream, {
-                        ...opts,
-                        newsletter: WABinary_1.isJidNewsLetter(jid)
-                    });
-                    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" 
+                    mediaCache: config.mediaCache,
+                    options: config.options,
+                    ...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 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,
+                    AI: isAiMsg
                 });
-            }
-            return fullMsg;
+                
+                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.44",
+    "version": "6.0.45",
     "description": "WhatsApp API Modification",
     "keywords": [
         "whatsapp",