@nuiisweety/baileys 0.1.14 → 0.1.16

package/lib/Utils/messages.js

@@ -545,37 +545,6 @@ const prepareNativeFlowButtons = (message) => {
             else if (hasOptionalProperty(button, 'sections') && !!button.sections) {
                 return { name: 'single_select', buttonParamsJson: JSON.stringify({ title: buttonText || '📋 Select', sections: button.sections, icon: buttonIcon }) };
             }
-            else if (hasOptionalProperty(button, 'catalog') && !!button.catalog) {
-                return { name: 'cta_catalog', buttonParamsJson: JSON.stringify({ display_text: buttonText || '🛍️ Catalog', business_phone_number: button.catalog, icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'reminder') && button.reminder === true) {
-                return { name: 'cta_reminder', buttonParamsJson: JSON.stringify({ display_text: buttonText || '⏰ Remind Me', icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'cancelReminder') && button.cancelReminder === true) {
-                return { name: 'cta_cancel_reminder', buttonParamsJson: JSON.stringify({ display_text: buttonText || '❌ Cancel Reminder', icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'address') && button.address === true) {
-                return { name: 'address_message', buttonParamsJson: JSON.stringify({ display_text: buttonText || '📍 Share Address', icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'location') && button.location === true) {
-                return { name: 'send_location', buttonParamsJson: JSON.stringify({ display_text: buttonText || '📍 Send Location', icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'webview') && !!button.webview) {
-                return { name: 'open_webview', buttonParamsJson: JSON.stringify({ title: buttonText || '🌐 Open', link: { in_app_webview: button.inAppWebview !== false, url: button.webview }, icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'productId') && !!button.productId) {
-                return { name: 'mpm', buttonParamsJson: JSON.stringify({ display_text: buttonText || '🛒 View Product', product_id: button.productId, icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'transactionId') && !!button.transactionId) {
-                return { name: 'wa_payment_transaction_details', buttonParamsJson: JSON.stringify({ display_text: buttonText || '💳 Payment Details', transaction_id: button.transactionId, icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'catalogProduct') && !!button.catalogProduct) {
-                return { name: 'automated_greeting_message_view_catalog', buttonParamsJson: JSON.stringify({ display_text: buttonText || '🛍️ View Catalog', business_phone_number: button.catalogProduct.bizPhone, catalog_product_id: button.catalogProduct.productId, icon: buttonIcon }) };
-            }
-            else if (hasOptionalProperty(button, 'flow') && !!button.flow) {
-                const f = button.flow;
-                return { name: 'galaxy_message', buttonParamsJson: JSON.stringify({ mode: f.mode || 'published', flow_message_version: f.flowMessageVersion || '3', flow_token: f.flowToken, flow_id: f.flowId, flow_cta: buttonText || f.flowCta || '▶️ Open Flow', flow_action: f.flowAction || 'navigate', flow_action_payload: f.flowActionPayload, flow_metadata: f.flowMetadata, icon: buttonIcon }) };
-            }
             return button;
         }),
         messageParamsJson: JSON.stringify(messageParamsJson),
@@ -950,80 +919,6 @@ export const generateWAMessageContent = async (message, options) => {
             }
         };
     }
-    else if (hasNonNullishProperty(message, 'orderStatus')) {
-        const os = message.orderStatus;
-        if (!os.image) {
-            throw new Boom('"image" wajib diisi untuk orderStatus', { statusCode: 400 });
-        }
-        let imageInput = os.image;
-        if (typeof imageInput === 'string' && !imageInput.startsWith('http://') && !imageInput.startsWith('https://')) {
-            imageInput = await fs.readFile(imageInput);
-        }
-        const media = await prepareWAMessageMedia({ image: imageInput }, options);
-        m = {
-            viewOnceMessage: {
-                message: {
-                    messageContextInfo: {
-                        deviceListMetadata: {},
-                        deviceListMetadataVersion: 2
-                    },
-                    interactiveMessage: proto.Message.InteractiveMessage.create({
-                        header: {
-                            title: os.title || 'Status Pesanan',
-                            hasMediaAttachment: true,
-                            ...media
-                        },
-                        body: { text: os.text || 'Silakan cek status pesanan Anda.' },
-                        footer: { text: os.footer || '' },
-                        nativeFlowMessage: {
-                            buttons: [{
-                                name: 'order_status',
-                                buttonParamsJson: JSON.stringify({
-                                    reference_id: os.referenceId || 'ORDER-001',
-                                    order: {
-                                        status: os.status || 'PROCESSING',
-                                        subtotal: {
-                                            value: os.subtotalValue || 0,
-                                            offset: os.subtotalOffset || 100
-                                        },
-                                        tax: {
-                                            value: os.taxValue || 0,
-                                            offset: os.taxOffset || 100
-                                        },
-                                        currency: os.currency || 'IDR'
-                                    }
-                                })
-                            }]
-                        }
-                    })
-                }
-            }
-        };
-    }
-    else if (hasNonNullishProperty(message, 'productList')) {
-        let thumbnail = null;
-        if (message.thumbnail) {
-            const { imageMessage } = await prepareWAMessageMedia({ image: message.thumbnail }, options);
-            thumbnail = imageMessage;
-        }
-        m = {
-            listMessage: {
-                title: message.title,
-                buttonText: message.buttonText || 'Lihat Produk',
-                footerText: message.footer,
-                description: message.text,
-                productListInfo: {
-                    productSections: message.productList,
-                    headerImage: {
-                        productId: message.productList?.[0]?.products?.[0]?.productId,
-                        jpegThumbnail: thumbnail?.jpegThumbnail || null
-                    },
-                    businessOwnerJid: message.businessOwnerJid
-                },
-                listType: proto.Message.ListMessage.ListType.PRODUCT_LIST
-            }
-        };
-    }
     else if (hasNonNullishProperty(message, 'buttonsMessage')) {
         // Direct buttonsMessage passthrough — supports headerType 6 (locationMessage), etc.
         const btnMsg = { ...message.buttonsMessage };
@@ -1276,74 +1171,6 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m = { interactiveMessage };
     }
-    else if (hasNonNullishProperty(message, 'shop')) {
-        const interactiveMessage = {
-            shopStorefrontMessage: {
-                surface: message.shop.surface || 1,
-                id: message.shop.id,
-                messageVersion: 1
-            }
-        };
-        if (hasOptionalProperty(message, 'caption')) {
-            // Media header mode — m already contains mediaMessage from chain 1 else block
-            const mediaKey = Object.keys(m)[0]; // e.g. 'videoMessage', 'imageMessage'
-            interactiveMessage.header = {
-                title: message.title || '',
-                subtitle: message.subtitle || '',
-                hasMediaAttachment: true,
-                [mediaKey]: m[mediaKey]
-            };
-            interactiveMessage.body = { text: message.caption };
-        }
-        else if (hasOptionalProperty(message, 'text')) {
-            interactiveMessage.body = { text: message.text };
-            if (hasOptionalProperty(message, 'title')) {
-                interactiveMessage.header = {
-                    title: message.title,
-                    subtitle: message.subtitle || null,
-                    hasMediaAttachment: false
-                };
-            }
-        }
-        if (hasOptionalProperty(message, 'footer')) {
-            interactiveMessage.footer = { text: message.footer };
-        }
-        m = { interactiveMessage };
-    }
-    else if (hasNonNullishProperty(message, 'collection')) {
-        const interactiveMessage = {
-            collectionMessage: {
-                bizJid: message.collection.bizJid,
-                id: message.collection.id,
-                messageVersion: message.collection.version || 1
-            }
-        };
-        if (hasOptionalProperty(message, 'caption')) {
-            // Media header mode
-            const mediaKey = Object.keys(m)[0];
-            interactiveMessage.header = {
-                title: message.title || '',
-                subtitle: message.subtitle || '',
-                hasMediaAttachment: true,
-                [mediaKey]: m[mediaKey]
-            };
-            interactiveMessage.body = { text: message.caption };
-        }
-        else if (hasOptionalProperty(message, 'text')) {
-            interactiveMessage.body = { text: message.text };
-            if (hasOptionalProperty(message, 'title')) {
-                interactiveMessage.header = {
-                    title: message.title,
-                    subtitle: message.subtitle || null,
-                    hasMediaAttachment: false
-                };
-            }
-        }
-        if (hasOptionalProperty(message, 'footer')) {
-            interactiveMessage.footer = { text: message.footer };
-        }
-        m = { interactiveMessage };
-    }
     else if (hasNonNullishProperty(message, 'requestPaymentFrom')) {
         const requestPaymentMessage = {
             amount: {

package/lib/Utils/rich-message-utils.js

@@ -676,7 +676,7 @@ const makeProductSection = (data) => {
     return {
         sub: {
             messageType: RichSubMessageType.TEXT,
-            messageText: '[ CANNOT_LOAD_PRODUCT ]'
+            messageText: ''
         },
         section: isMultiple
             ? {
@@ -721,7 +721,7 @@ const makePostSection = (data) => {
     return {
         sub: {
             messageType: RichSubMessageType.TEXT,
-            messageText: '[ CANNOT_LOAD_POST ]'
+            messageText: ''
         },
         section: {
             view_model: {
@@ -825,7 +825,6 @@ export const prepareRichResponseMessage = (content) => {
     /* ── mode flat (convenience fields) ── */
     } else {
         if (headerText)    submessages.push(makeTextSub(headerText));
-        if (contentText)   submessages.push(makeTextSub(contentText));
 
         if (code)          submessages.push(makeCodeSub(code, language || 'javascript'));
         if (table)         submessages.push(makeTableSub(table, title, noHeading));
@@ -843,6 +842,7 @@ export const prepareRichResponseMessage = (content) => {
         if (source)       { if (!extraSections) extraSections = []; extraSections.push(makeSourceSection(source)); }
         if (richProduct)  pushRich(makeProductSection(richProduct));
         if (richPost)     pushRich(makePostSection(richPost));
+        if (contentText)   submessages.push(makeTextSub(contentText)); // ← setelah produk/post, tampil di bawah card
         if (tip)          pushRich(makeTipSub(tip));
         if (suggest)      { if (!extraSections) extraSections = []; extraSections.push(makeSuggestSection(suggest)); }
 

package/lib/Utils/rich-message-utils.js.original

@@ -598,8 +598,13 @@ const makeVideoSub = (videoUrl) => {
     });
     return {
         sub: {
-            messageType: RichSubMessageType.TEXT,
-            messageText: '[ CANNOT_LOAD_VIDEO ]'
+            messageType: RichSubMessageType.DYNAMIC,
+            dynamicMetadata: {
+                type: 1,
+                version: 1,
+                url: parsed[0]?.url || '',
+                loopCount: 0
+            }
         },
         sections: parsed.map(({ url, duration }) => ({
             view_model: {
@@ -873,10 +878,17 @@ export const prepareRichResponseMessage = (content) => {
     }
 
     /* build unifiedResponse JSON — gabungkan sections dari submessages + extraSections */
-    const baseUnified = toUnified(submessages);
+    // Pisahkan footerSubs (teks setelah media) agar selalu muncul SETELAH extraSections (video/image)
+    const footerSubMessages = footerText ? [makeTextSub(footerText)] : [];
+    // Hapus footerText dari submessages jika sudah ada (sudah di-push sebelumnya)
+    const mainSubmessages = footerText
+        ? submessages.filter(s => !(s.messageType === RichSubMessageType.TEXT && s.messageText === footerText))
+        : submessages;
+    const baseUnified = toUnified(mainSubmessages);
+    const footerSections = footerSubMessages.map(buildUnifiedSection);
     const unified = extraSections && extraSections.length > 0
-        ? { ...baseUnified, sections: [...baseUnified.sections, ...extraSections] }
-        : baseUnified;
+        ? { ...baseUnified, sections: [...baseUnified.sections, ...extraSections, ...footerSections] }
+        : { ...baseUnified, sections: [...baseUnified.sections, ...footerSections] };
 
     const richResponseMessage = proto.AIRichResponseMessage.create({
         submessages,
@@ -887,7 +899,6 @@ export const prepareRichResponseMessage = (content) => {
         contextInfo: {
             isForwarded: true,
             forwardingScore: 1,
-            forwardedAiBotMessageInfo: { botJid: '867051314767696@bot' },
             forwardOrigin: 4
         }
     });
@@ -955,7 +966,6 @@ const buildRichContextInfo = (quoted) => {
     const ctxInfo = {
         isForwarded: true,
         forwardingScore: 1,
-        forwardedAiBotMessageInfo: { botJid: '867051314767696@bot' },
         forwardOrigin: 4,
     };
     if (quoted?.key) {
@@ -1104,7 +1114,7 @@ export const captureUnifiedResponse = (msg) => {
 // ── Link ──────────────────────────────────────────────────
 
 export const generateLinkContent = (text, links, quoted, options = {}) => {
-    const { footer, botJid = '867051314767696@bot', forwardingScore = 3, citations = [], proofs = [] } = options;
+    const { footer, forwardingScore = 3, citations = [], proofs = [] } = options;
     const subs = [];
     const fullText = footer ? `${text}${footer}` : text;
     subs.push({ messageType: RichSubMessageType.TEXT, messageText: fullText });
@@ -1120,7 +1130,6 @@ export const generateLinkContent = (text, links, quoted, options = {}) => {
     const base64Data = Buffer.from(JSON.stringify({ response_id: randomUUID(), sections })).toString('base64');
     const ctxInfo = buildRichContextInfo(quoted);
     ctxInfo.forwardingScore = forwardingScore;
-    ctxInfo.forwardedAiBotMessageInfo = { botJid };
     ctxInfo.botMessageSharingInfo = { forwardScore: forwardingScore };
     const messageContextInfo = { messageSecret: randomBytes(32) };
     if (citations.length > 0 || proofs.length > 0) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nuiisweety/baileys",
   "type": "module",
-  "version": "0.1.14",
-  "description": "A WebSockets library for interacting with WhatsApp Web — forked STRICTLY from @whiskeysockets/baileys only, NOT from any other baileys fork. Modified by NuiiSweety.",
+  "version": "0.1.16",
+  "description": "A WebSockets library for interacting with WhatsApp Web — forked STRICTLY from @whiskeysockets/baileys only, NOT from any other baileys fork. Modified by NuiiS4TORU.",
   "keywords": [
     "whatsapp",
     "automation"
@@ -12,7 +12,7 @@
     "url": "git@github.com:WhiskeySockets/Baileys.git"
   },
   "license": "MIT",
-  "author": "NuiiSweety (based on WhiskeySockets/Baileys)",
+  "author": "NuiiS4TORU (based on WhiskeySockets/Baileys)",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [