ishumdz-bail 1.0.24 → 1.0.26

package/lib/Utils/messages.js

@@ -586,7 +586,10 @@ export const generateWAMessageContent = async (message, options) => {
     if ('interactiveButtons' in message && !!message.interactiveButtons) {
         const nativeFlow = proto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
             buttons: message.interactiveButtons,
-            messageParamsJson: message.messageParams ?? "{}"
+            messageParamsJson: message.messageParams ?? "{}",
+            // PATCH (1.0.26): default messageVersion to 1 — version 0 renders as
+            // greyed-out, untappable placeholder buttons on current clients.
+            messageVersion: message.messageVersion ?? 1
         });
         let interactiveMessage = { nativeFlowMessage: nativeFlow };
         if ('text' in message) {
@@ -652,12 +655,27 @@ export const generateWAMessageContent = async (message, options) => {
         m = { interactiveMessage };
     }
 	else if ('buttonsMessage' in message && !!message.buttonsMessage) {
-		// 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) };
+		// PATCH: raw buttonsMessage — classic pass-through. Modern clients render
+		// the horizontal row only when a header exists (image/video/document/
+		// location). A text-only raw message WITHOUT any header is exactly the
+		// "version doesn't support it" case — so when the caller passed none, we
+		// attach the invisible 1x1 PNG image header automatically (same trick the
+		// `buttons` API uses) and the row always renders. This is unconditional:
+		// header-less raw messages can never produce the "not supported" bubble.
+		const raw = proto.Message.ButtonsMessage.fromObject(message.buttonsMessage)
+		// NOTE: fromObject turns missing fields into null (protobuf defaults), so
+		// a nullish headerType (= caller never set it) counts as "no header" too.
+		const hasHeader = !!(raw.imageMessage || raw.videoMessage || raw.documentMessage ||
+			raw.locationMessage ||
+			(raw.headerType != null && raw.headerType !== ButtonType.EMPTY && raw.headerType !== ButtonType.UNKNOWN))
+		if (!hasHeader) {
+			try {
+				const media = await prepareWAMessageMedia({ image: BUTTONS_INVISIBLE_PNG() }, options)
+				raw.imageMessage = media.imageMessage
+				raw.headerType = ButtonType.IMAGE
+			} catch { /* upload failed — send as-is */ }
+		}
+		m = { buttonsMessage: raw };
 	}
 	else if ('buttons' in message && !!message.buttons) {
         // PATCH: `buttons` API — HORIZONTAL button row via classic ButtonsMessage
@@ -707,6 +725,63 @@ export const generateWAMessageContent = async (message, options) => {
             applyContextInfoAndMentions(interactiveMessage, message);
             m = { interactiveMessage };
         }
+        else if (message.buttons.some(b => buildActionFlow(b) || buildButtonSections(b))) {
+            // PATCH (1.0.26): a classic ButtonsMessage that MIXES native-flow
+            // extras (rows/sections sheet, url/copy/call actions) with a media
+            // or location header renders as "version doesn't support it" on
+            // current clients (real-device evidence). So when any button
+            // carries an extra, the WHOLE message is upgraded to a native-flow
+            // interactive card — map/media header + body + footer + every
+            // button type (single_select, cta_url, quick_reply) — which modern
+            // clients render fully. Plain-only rows keep the classic
+            // horizontal ButtonsMessage (that path is proven to render).
+            const flowButtons = message.buttons.map(b => {
+                const action = buildActionFlow(b);
+                if (action) return { name: action.name, buttonParamsJson: JSON.stringify(action.params) };
+                const sections = buildButtonSections(b);
+                if (sections) return { name: 'single_select', buttonParamsJson: JSON.stringify({ title: b.buttonText?.displayText || b.displayText || 'Menu', sections }) };
+                return { 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 };
+            const header = {
+                title: message.title || (message.caption ? String(message.caption).split('\n')[0].slice(0, 42) : '') || 'Menu',
+                subtitle: message.subtitle || '',
+                hasMediaAttachment: false
+            };
+            if ('location' in message && !!message.location) {
+                const loc = message.location;
+                header.locationMessage = {
+                    degreesLatitude: loc.degreesLatitude ?? loc.latitude ?? 0,
+                    degreesLongitude: loc.degreesLongitude ?? loc.longitude ?? 0,
+                    name: loc.name ?? null,
+                    address: loc.address ?? null,
+                    ...(loc.jpegThumbnail ? { jpegThumbnail: loc.jpegThumbnail } : {})
+                };
+                header.hasMediaAttachment = true;
+            } else if ('video' in message && !!message.video) {
+                const media = await prepareWAMessageMedia({ video: message.video }, options);
+                header.videoMessage = media.videoMessage;
+                if (message.gifPlayback) header.videoMessage.gifPlayback = true;
+                header.hasMediaAttachment = true;
+            } else if ('gif' in message && !!message.gif) {
+                const media = await prepareWAMessageMedia({ video: message.gif }, options);
+                header.videoMessage = media.videoMessage;
+                header.videoMessage.gifPlayback = true;
+                header.hasMediaAttachment = true;
+            } else if ('image' in message && !!message.image) {
+                const media = await prepareWAMessageMedia({ image: message.image }, options);
+                header.imageMessage = media.imageMessage;
+                header.hasMediaAttachment = true;
+            }
+            if (header.title || header.hasMediaAttachment) interactiveMessage.header = header;
+            applyContextInfoAndMentions(interactiveMessage, message);
+            m = { interactiveMessage };
+        }
         else if ('location' in message && !!message.location) {
             const loc = message.location;
             const buttonsMessage = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ishumdz-bail",
-    "version": "1.0.24",
+    "version": "1.0.26",
     "description": "WhatsApp API Modification By Lovely",
     "keywords": [
         "whatsapp",
@@ -43,7 +43,7 @@
         "prepare": "",
         "preinstall": "node ./engine-requirements.js",
         "release": "release-it",
-        "test": "jest"
+        "test": "node --test \"test/**/*.test.mjs\""
     },
     "dependencies": {
         "@cacheable/node-cache": "^1.4.0",