ishumdz-bail 1.0.25 → 1.0.27

package/README.md

@@ -651,7 +651,7 @@ function resolveButtonResponse(msg) {
     const nf = msg.message?.interactiveResponseMessage?.nativeFlowResponseMessage
     if (nf?.paramsJson) {
         try {
-            const p = JSON.parse(native.paramsJson)
+            const p = JSON.parse(nf.paramsJson)
             return p.id || p.selectedId || p.selected_row_id || null
         } catch { /* ignore */ }
     }
@@ -695,6 +695,59 @@ Action buttons (`url` / `copy` / `call`) never send a reply — nothing to handl
 >   (`.menu` → custom image/GIF + buttons + highlighted menu sheet), plus a visual
 >   preview in [`banner-preview.html`](banner-preview.html).
 
+### Base Compatibility — cantarella / Case X Style Code (v1.0.27+)
+
+Code copied from other Baileys bases (cantarella-baileys, Case X Plugin YOUHU MD, etc.)
+runs without changes. Three shapes are accepted:
+
+**1) Raw `buttonsMessage` classic menu card — even the risky mix.** A raw classic
+message that mixes `nativeFlowInfo` (single_select sheet) or `cta_*` buttons with
+plain buttons is **auto-upgraded to a native-flow interactive card**, so it can never
+render the "version doesn't support it" bubble:
+
+```javascript
+// Case X / cantarella style — works as-is:
+await sock.sendMessage(jid, {
+    buttonsMessage: {
+        locationMessage: { degreesLatitude: 0, degreesLongitude: 0, name: 'Youhu base', address: '📍Today' },
+        contentText: menuText, footerText: footer, headerType: 6,
+        buttons: [
+            { buttonId: 'menu', buttonText: { displayText: '☰ menu' }, type: 1,
+              nativeFlowInfo: { name: 'single_select', paramsJson: JSON.stringify({
+                  title: 'Pilih Menu',
+                  sections: [{ title: 'base', highlight_label: '🔥', rows: [{ title: 'ping', description: 'live', id: '/ping' }] }]
+              }) } },
+            { buttonId: 'sc', buttonText: { displayText: '⌕ script' }, type: 1 }
+        ]
+    }
+})
+```
+
+**2) Raw `interactiveMessage` native-flow card — straight through `sendMessage`.**
+No `generateWAMessageFromContent` + `relayMessage` dance needed (though that still
+works too). `messageVersion` defaults to 1:
+
+```javascript
+await sock.sendMessage(jid, {
+    interactiveMessage: {
+        body: { text: 'Pairing code: 1234-5678' },
+        footer: { text: 'Tap to copy' },
+        header: { hasMediaAttachment: false },
+        nativeFlowMessage: {
+            buttons: [{ name: 'cta_copy', buttonParamsJson: JSON.stringify({ display_text: 'Copy', copy_code: '12345678' }) }]
+        }
+    }
+})
+
+// short form also accepted:
+await sock.sendMessage(jid, { interactiveMessage: { buttons: [{ name: 'quick_reply', buttonParamsJson: '{"display_text":"hi","id":"hi"}' }] } })
+```
+
+**3) Plain raw `buttonsMessage`** (no native-flow extras) stays classic and gets the
+automatic invisible-PNG header when you omit one. Flow params are accepted as
+`paramsJson` or `buttonParamsJson`, and `single_select` / `cta_url` / `cta_copy` /
+`cta_call` / `quick_reply` names are preserved as-is.
+
 ---
 
 ## 🚫 Ban Checker

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) {
@@ -651,20 +654,101 @@ export const generateWAMessageContent = async (message, options) => {
         applyContextInfoAndMentions(interactiveMessage, message);
         m = { interactiveMessage };
     }
+	else if ('interactiveMessage' in message && !!message.interactiveMessage) {
+		// PATCH (1.0.27): cantarella / Case X-style RAW interactiveMessage
+		// pass-through — send the card exactly like those bases do, but via a
+		// normal sendMessage call. Two accepted shapes:
+		//   { interactiveMessage: { body, footer, header, nativeFlowMessage: { buttons } } }
+		//   { interactiveMessage: { buttons } }                       (short form)
+		// messageVersion defaults to 1 (0 renders greyed-out placeholders).
+		let card = message.interactiveMessage;
+		if (card && !card.nativeFlowMessage && Array.isArray(card.buttons)) {
+			const { buttons, messageParamsJson, ...rest } = card;
+			card = { ...rest, nativeFlowMessage: { buttons, messageParamsJson: messageParamsJson || "" } };
+		}
+		if (card?.nativeFlowMessage && (card.nativeFlowMessage.messageVersion == null || card.nativeFlowMessage.messageVersion === 0)) {
+			card.nativeFlowMessage.messageVersion = 1;
+		}
+		if (card && !card.body && 'text' in message && !!message.text) {
+			card.body = { text: message.text };
+		}
+		m = { interactiveMessage: card };
+	}
 	else if ('buttonsMessage' in message && !!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.
+		// `buttons` API uses) and the row always renders.
 		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))
+		// PATCH (1.0.27): a raw classic message that MIXES native-flow extras
+		// (single_select nativeFlowInfo, cta_* buttons) into a ButtonsMessage is
+		// the Case X / cantarella menu-card pattern — on current clients it
+		// renders as "version doesn't support it" (real-device evidence). Convert
+		// the whole message to a native-flow interactive card that renders fully.
+		// Read the caller's ORIGINAL button objects — proto fromObject drops
+		// unknown fields (e.g. nativeFlowInfo.buttonParamsJson), and some bases
+		// (cantarella) put params there.
+		const inputButtons = Array.isArray(message.buttonsMessage.buttons) ? message.buttonsMessage.buttons : raw.buttons
+		const rawExtras = (inputButtons || []).filter(b =>
+			b?.nativeFlowInfo?.name || Number(b?.type) === proto.Message.ButtonsMessage.Button.Type.NATIVE_FLOW)
+		if (rawExtras.length) {
+			const rawLoc = raw.locationMessage
+			const flowButtons = inputButtons.map(b => {
+				const name = b?.nativeFlowInfo?.name
+				if (name === 'single_select') {
+					let params = b.nativeFlowInfo.paramsJson
+					try { params = JSON.stringify(JSON.parse(params)) } catch { params = typeof params === 'string' ? params : '{}' }
+					return { name: 'single_select', buttonParamsJson: params }
+				}
+				if (name) {
+					return { name, buttonParamsJson: b.nativeFlowInfo.buttonParamsJson || b.nativeFlowInfo.paramsJson || '{}' }
+				}
+				return {
+					name: 'quick_reply',
+					buttonParamsJson: JSON.stringify({
+						display_text: b.buttonText?.displayText || '',
+						id: b.buttonId || b.buttonText?.displayText || ''
+					})
+				}
+			})
+			const interactiveMessage = {
+				nativeFlowMessage: { buttons: flowButtons, messageParamsJson: '', messageVersion: 1 }
+			};				const bodyText = raw.contentText || (raw.imageMessage?.caption ?? raw.videoMessage?.caption ?? '') || ''
+				if (bodyText) interactiveMessage.body = { text: bodyText };
+			if (raw.footerText) interactiveMessage.footer = { text: raw.footerText };
+			const header = { title: raw.text || (interactiveMessage.body.text ? String(interactiveMessage.body.text).split('\n')[0].slice(0, 42) : '') || 'Menu', subtitle: '', hasMediaAttachment: false };
+			if (rawLoc) {
+				header.locationMessage = {
+					degreesLatitude: rawLoc.degreesLatitude ?? 0,
+					degreesLongitude: rawLoc.degreesLongitude ?? 0,
+					name: rawLoc.name ?? null,
+					address: rawLoc.address ?? null,
+					...(rawLoc.jpegThumbnail ? { jpegThumbnail: rawLoc.jpegThumbnail } : {})
+				};
+				header.hasMediaAttachment = true;
+			} else if (raw.imageMessage) {
+				header.imageMessage = raw.imageMessage;
+				header.hasMediaAttachment = true;
+			} else if (raw.videoMessage) {
+				header.videoMessage = raw.videoMessage;
+				header.hasMediaAttachment = true;
+			} else if (raw.documentMessage) {
+				header.documentMessage = raw.documentMessage;
+				header.hasMediaAttachment = true;
+			}
+			if (header.title || header.hasMediaAttachment) interactiveMessage.header = header;
+			if (raw.contextInfo?.mentionedJid?.length) {
+				interactiveMessage.contextInfo = { mentionedJid: raw.contextInfo.mentionedJid };
+			}
+			m = { interactiveMessage };
+		} else {
 		if (!hasHeader) {
 			try {
 				const media = await prepareWAMessageMedia({ image: BUTTONS_INVISIBLE_PNG() }, options)
@@ -673,6 +757,7 @@ export const generateWAMessageContent = async (message, options) => {
 			} 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
@@ -722,6 +807,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.25",
+    "version": "1.0.27",
     "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",