ishumdz-bail 1.0.18 → 1.0.19

package/README.md

@@ -416,15 +416,18 @@ await sock.sendMessage(jid, {
 
 ## 🔘 Horizontal Buttons (Interactive Messages)
 
-> ⚡ **Fixed in this fork:** classic text-only `buttonsMessage` is rejected by new WhatsApp
-> clients ("Your version of WhatsApp doesn't support it"). The `buttons` API now sends
-> **native flow (interactiveMessage)** buttons that render on **all modern clients** —
-> normal messages, images, videos and GIFs. Location keeps the classic map-card style.
+> ⚡ **How it renders:** the `buttons` API sends the **classic ButtonsMessage** — the
+> only format WhatsApp renders as a true **horizontal button row**. Modern clients
+> render it when the message has a **header** (image / video / GIF / location map-card).
+> A **location header needs no media upload** — coordinates alone give the big map
+> card + horizontal row, and a **custom image or GIF** works with one media upload.
+> Set `{ nativeFlow: true }` for vertical native-flow quick_reply buttons instead.
 
-### Text + Horizontal Buttons
+### Text + Horizontal Buttons (location header = zero uploads)
 
 ```javascript
 await sock.sendMessage(jid, {
+    location: { degreesLatitude: 9.9312, degreesLongitude: 76.2673 }, // simple map card
     text: 'Pong 9 Ms ⚡\nDeveloper: ISHAN-X × LOVELY',
     footer: 'ISHAN-X MD PRO',
     buttons: [
@@ -434,10 +437,10 @@ await sock.sendMessage(jid, {
 })
 ```
 
-### Image / Video / GIF + Buttons
+### Custom Pic / GIF + Horizontal Buttons
 
 ```javascript
-// Image header
+// Image header (one media upload, then horizontal row)
 await sock.sendMessage(jid, {
     image: { url: './banner.jpg' },
     caption: 'Welcome!',
@@ -448,7 +451,7 @@ await sock.sendMessage(jid, {
     ]
 })
 
-// GIF header (animated, loops like a GIF)
+// Animated GIF header
 await sock.sendMessage(jid, {
     gif: { url: './animation.gif' },
     caption: 'Live preview!',
@@ -464,7 +467,7 @@ await sock.sendMessage(jid, {
 })
 ```
 
-### Location Map-Card + Buttons (classic style, still renders on new clients)
+### Location Map-Card + Buttons (custom name/address)
 
 ```javascript
 await sock.sendMessage(jid, {
@@ -476,10 +479,24 @@ await sock.sendMessage(jid, {
         // jpegThumbnail: buffer — custom map image (optional)
     },
     text: 'Pong 9 Ms ⚡',
-    buttons: [
-        { buttonText: { displayText: 'menu' },  buttonId: 'menu',  type: 1 },
-        { buttonText: { displayText: 'owner' }, buttonId: 'owner', type: 1 }
-    ]
+    buttons: [ /* ... */ ]
+})
+```
+
+### Text-only (TEXT header, best-effort) & native flow escape hatch
+
+```javascript
+// text-only: TEXT headerType — some clients still show the row vertically;
+// for a guaranteed horizontal row attach image/gif/location as above.
+await sock.sendMessage(jid, {
+    text: 'Pong 9 Ms ⚡', footer: 'ISHAN-X',
+    buttons: [ { buttonText: { displayText: 'menu' }, buttonId: 'menu', type: 1 } ]
+})
+
+// vertical native-flow quick_reply buttons (renders on all modern clients)
+await sock.sendMessage(jid, {
+    text: 'Menu?', nativeFlow: true,
+    buttons: [ { buttonText: { displayText: 'menu' }, buttonId: 'menu', type: 1 } ]
 })
 ```
 

package/lib/Utils/messages.js

@@ -517,6 +517,13 @@ const applyContextInfoAndMentions = (interactiveMessage, message) => {
 		}
 	}
 }
+// PATCH: 1x1 transparent PNG — text-only buttons attach this as an invisible
+// IMAGE header so modern clients render the horizontal row (classic requires
+// a header), with no map card and no "version doesn't support it" error.
+const BUTTONS_INVISIBLE_PNG = () => Buffer.from(
+	'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=',
+	'base64'
+)
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
     let m = {};
@@ -589,45 +596,46 @@ export const generateWAMessageContent = async (message, options) => {
         m = { interactiveMessage };
     }
 	else if ('buttonsMessage' in message && !!message.buttonsMessage) {
-		// PATCH: raw buttonsMessage — media/location headers keep classic pass-through
-		// (new WhatsApp clients still render those fine, e.g. location+menu cards).
-		// Text-only ButtonsMessage is rejected by new clients ("version doesn't
-		// support it"), so convert it to interactiveMessage (native flow
-		// quick_reply buttons) which renders on all modern clients.
-		const bMsg = message.buttonsMessage;
-		const hasMediaHeader = !!(bMsg.imageMessage || bMsg.videoMessage || bMsg.documentMessage || bMsg.locationMessage);
-		if (hasMediaHeader) {
-			m = { buttonsMessage: proto.Message.ButtonsMessage.create(bMsg) };
-		} else {
-			const flowButtons = (bMsg.buttons || []).map(btn => ({
-				name: 'quick_reply',
-				buttonParamsJson: JSON.stringify({
-					display_text: btn.buttonText?.displayText || btn.buttonText || '',
-					id: btn.buttonId || btn.buttonText?.displayText || ''
-				})
-			}));
-			const interactive = {
-				nativeFlowMessage: {
-					buttons: flowButtons,
-					messageParamsJson: '',
-					messageVersion: 1
-				},
-				body: { text: bMsg.contentText || bMsg.text || '' },
-				footer: bMsg.footerText ? { text: bMsg.footerText } : undefined
-			};
-			applyContextInfoAndMentions(interactive, { contextInfo: bMsg.contextInfo });
-			m = { interactiveMessage: interactive };
-		}
+		// PATCH: raw buttonsMessage — always classic pass-through. Modern clients
+		// render the horizontal row when a header exists (image/video/document/
+		// location) or when a thumbnail header is attached; text-only without any
+		// header is the "version doesn't support it" case. Add a header in that
+		// situation, or use the `buttons` API which auto-adds one.
+		m = { buttonsMessage: proto.Message.ButtonsMessage.create(message.buttonsMessage) };
 	}
 	else if ('buttons' in message && !!message.buttons) {
-        // PATCH: `buttons` API — text/caption/img/video builds interactiveMessage
-        // (native flow) so the horizontal button row renders on ALL modern
-        // WhatsApp clients (classic text-only buttonsMessage is rejected by new
-        // clients: "version doesn't support it").
-        // `location` keeps the classic map-card style (LOCATION header 6) —
-        // big map header + title + body + horizontal buttons below, still
-        // rendered by modern clients.
-        if ('location' in message && !!message.location) {
+        // PATCH: `buttons` API — HORIZONTAL button row via classic ButtonsMessage
+        // with a header (modern clients only render classic horizontal buttons
+        // when a header exists: image/video/gif/location, or an embedded
+        // thumbnail for text-only). Set { nativeFlow: true } to opt out and get
+        // vertical native-flow quick_reply buttons instead.
+        if (message.nativeFlow === true) {
+            const flowButtons = message.buttons.map(b => ({
+                name: 'quick_reply',
+                buttonParamsJson: JSON.stringify({
+                    display_text: b.buttonText?.displayText || b.displayText || b.text || '',
+                    id: b.buttonId || b.id || b.buttonText?.displayText || ''
+                })
+            }));
+            const interactiveMessage = {
+                nativeFlowMessage: {
+                    buttons: flowButtons,
+                    messageParamsJson: '',
+                    messageVersion: 1
+                }
+            };
+            if ('text' in message) {
+                interactiveMessage.body = { text: message.text };
+            } else if ('caption' in message) {
+                interactiveMessage.body = { text: message.caption };
+            }
+            if ('footer' in message && !!message.footer) {
+                interactiveMessage.footer = { text: message.footer };
+            }
+            applyContextInfoAndMentions(interactiveMessage, message);
+            m = { interactiveMessage };
+        }
+        else if ('location' in message && !!message.location) {
             const loc = message.location;
             const buttonsMessage = {
                 buttons: message.buttons.map(b => ({ ...b, type: proto.Message.ButtonsMessage.Button.Type.RESPONSE })),
@@ -653,62 +661,58 @@ export const generateWAMessageContent = async (message, options) => {
             m = { buttonsMessage: proto.Message.ButtonsMessage.create(buttonsMessage) };
         }
         else {
-            const flowButtons = message.buttons.map(b => ({
-                name: 'quick_reply',
-                buttonParamsJson: JSON.stringify({
-                    display_text: b.buttonText?.displayText || b.displayText || b.text || '',
-                    id: b.buttonId || b.id || b.buttonText?.displayText || ''
-                })
-            }));
-            const interactiveMessage = {
-                nativeFlowMessage: {
-                    buttons: flowButtons,
-                    messageParamsJson: '',
-                    messageVersion: 1
-                }
+            const buttonsMessage = {
+                buttons: message.buttons.map(b => ({ ...b, type: proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
             };
-            if ('text' in message) {
-                interactiveMessage.body = { text: message.text };
-            } else if ('caption' in message) {
-                interactiveMessage.body = { text: message.caption };
+            if ('footer' in message && !!message.footer) {
+                buttonsMessage.footerText = message.footer;
             }
-            if ('title' in message && !!message.title) {
-                interactiveMessage.header = {
-                    title: message.title,
-                    subtitle: message.subtitle || '',
-                    hasMediaAttachment: false
+            if (message.contextInfo || message.mentions) {
+                buttonsMessage.contextInfo = {
+                    ...(message.contextInfo || {}),
+                    ...(message.mentions ? { mentionedJid: message.mentions } : {})
                 };
             }
             if ('video' in message && !!message.video) {
                 const media = await prepareWAMessageMedia({ video: message.video }, options);
-                interactiveMessage.header = {
-                    ...(interactiveMessage.header || {}),
-                    videoMessage: media.videoMessage,
-                    hasMediaAttachment: true
-                };
-                if (message.gifPlayback) interactiveMessage.header.videoMessage.gifPlayback = true;
+                buttonsMessage.videoMessage = media.videoMessage;
+                if (message.gifPlayback) buttonsMessage.videoMessage.gifPlayback = true;
+                buttonsMessage.headerType = ButtonType.VIDEO;
             } else if ('gif' in message && !!message.gif) {
-                // PATCH: direct `gif` key — animated GIF header (video with gifPlayback)
                 const media = await prepareWAMessageMedia({ video: message.gif }, options);
-                interactiveMessage.header = {
-                    ...(interactiveMessage.header || {}),
-                    videoMessage: media.videoMessage,
-                    hasMediaAttachment: true
-                };
-                interactiveMessage.header.videoMessage.gifPlayback = true;
+                buttonsMessage.videoMessage = media.videoMessage;
+                buttonsMessage.videoMessage.gifPlayback = true;
+                buttonsMessage.headerType = ButtonType.VIDEO;
             } else if ('image' in message && !!message.image) {
                 const media = await prepareWAMessageMedia({ image: message.image }, options);
-                interactiveMessage.header = {
-                    ...(interactiveMessage.header || {}),
-                    imageMessage: media.imageMessage,
-                    hasMediaAttachment: true
-                };
+                buttonsMessage.imageMessage = media.imageMessage;
+                buttonsMessage.headerType = ButtonType.IMAGE;
+            } else {
+                if ('text' in message || 'caption' in message) {
+                    const body = message.text ?? message.caption;
+                    buttonsMessage.contentText = body;
+                    // PATCH: text-only — invisible 1x1 PNG header so the horizontal
+                    // row renders on modern clients without a map card and without
+                    // the "doesn't support it" error. Upload failure falls back to
+                    // the TEXT header (may render vertical, still no error).
+                    try {
+                        const media = await prepareWAMessageMedia({ image: BUTTONS_INVISIBLE_PNG() }, options);
+                        buttonsMessage.imageMessage = media.imageMessage;
+                        buttonsMessage.headerType = ButtonType.IMAGE;
+                    } catch {
+                        buttonsMessage.text = (message.title || String(body).split('\n')[0] || '').slice(0, 60);
+                        buttonsMessage.headerType = ButtonType.TEXT;
+                    }
+                } else {
+                    buttonsMessage.headerType = ButtonType.EMPTY;
+                }
             }
-            if ('footer' in message && !!message.footer) {
-                interactiveMessage.footer = { text: message.footer };
+            if ('text' in message && (buttonsMessage.videoMessage || buttonsMessage.imageMessage)) {
+                // media header already carries the caption
+                if (buttonsMessage.videoMessage && 'caption' in message) buttonsMessage.videoMessage.caption = message.caption;
+                if (buttonsMessage.imageMessage && 'caption' in message) buttonsMessage.imageMessage.caption = message.caption;
             }
-            applyContextInfoAndMentions(interactiveMessage, message);
-            m = { interactiveMessage };
+            m = { buttonsMessage: proto.Message.ButtonsMessage.create(buttonsMessage) };
         }
     }
     else if (hasNonNullishProperty(message, 'sections') || hasNonNullishProperty(message, 'productList')) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ishumdz-bail",
-    "version": "1.0.18",
+    "version": "1.0.19",
     "description": "WhatsApp API Modification By Lovely",
     "keywords": [
         "whatsapp",