ishumdz-bail 1.0.14 → 1.0.16

package/lib/Socket/messages-send.js

@@ -492,14 +492,22 @@ export const makeMessagesSocket = (config) => {
 	    		if (additionalNodes && additionalNodes.length > 0) {
 		    		binaryNodeContent.push(...additionalNodes)
 		    	}
-	    		// Lia@Changes 02-02-26 --- add extraAttrs (mediatype etc.) to plaintext node — required for media to be accepted in newsletters
-		    	binaryNodeContent.push({ tag: 'plaintext', attrs: extraAttrs, content: bytes })
+		    		// Channel updates MUST use an EMPTY plaintext attrs object and stanza
+		    		// type 'text' — verified against 120363427391054075@newsletter:
+		    		//   { mediatype: 'image' } + type 'image' -> silently dropped
+		    		//   { mediatype: 'image' } + type 'text'  -> dropped
+		    		//   {}                     + type 'image' -> dropped
+		    		//   {}                     + type 'text'  -> DELIVERED
+		    		// The real type lives inside the encoded newsletter protobuf
+		    		// (imageMessage / documentMessage / ...), so the stanza stays
+		    		// 'text' and no extra plaintext attrs are attached.
+		    		binaryNodeContent.push({ tag: 'plaintext', attrs: {}, content: bytes })
 		    	const stanza = {
 	    			tag: 'message',
 		    		attrs: {
 		    			to: jid,
 		    			id: msgId,
-		    			type: getMessageType(message),
+		    			type: 'text',
 		    			...(additionalAttributes || {})
 		    		},
 		    		content: binaryNodeContent

package/lib/Utils/messages.js

@@ -226,25 +226,57 @@ export const prepareWAMessageMedia = async (message, options) => {
     }
     const isNewsletter = !!options.jid && isJidNewsletter(options.jid);
     if (isNewsletter) {
+        // Channel media follows the @zanta/baileys proven method: the file is
+        // uploaded RAW (server-opaque, no mediaKey / AES handshake) and the
+        // message carries only url, directPath, fileSha256 and fileLength.
+        //
+        // The critical detail is that `newsletter: true` is deliberately NOT
+        // passed to options.upload(). Passing it selects
+        // NEWSLETTER_MEDIA_PATH_MAP (/newsletter/newsletter-audio, plus
+        // &server_thumb_gen=1), which returns a /m1/v/t24/... directPath that the
+        // channel client cannot use for playback — the post renders but never
+        // plays, or the client falls back to the "your version of WhatsApp
+        // doesn't support this update" placeholder. Omitting the flag keeps the
+        // standard MEDIA_PATH_MAP (/mms/audio) upload, which is what the working
+        // channel-media implementation actually does.
         logger?.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
         const { filePath, fileSha256, fileLength } = await getRawMediaUploadData(uploadData.media, options.mediaTypeOverride || mediaType, logger);
         const fileSha256B64 = fileSha256.toString('base64');
-        const { mediaUrl, directPath, thumbnailDirectPath, thumbnailSha256 } = await options.upload(filePath, {
+        const { mediaUrl, directPath } = await options.upload(filePath, {
             fileEncSha256B64: fileSha256B64,
             mediaType: mediaType,
-            timeoutMs: options.mediaUploadTimeoutMs,
-            newsletter: isNewsletter
+            // Channel media MUST go up on the newsletter path (/newsletter/newsletter-*).
+            // On the plain /mms/* path a channel post streams for playback but a
+            // full download comes back truncated — the channel media service only
+            // resolves newsletter-path directPaths. This is also what upstream
+            // ishumdz-bail does; the flag was the one thing lost in the port.
+            newsletter: true,
+            timeoutMs: options.mediaUploadTimeoutMs
         });
+        // Additive on top of the @zanta method: build the inline jpegThumbnail
+        // from the raw file we still have on disk. Channel clients render the
+        // bubble straight from this inline thumbnail, so skipping it makes an
+        // otherwise-valid image post look broken. Non-fatal — a failure here
+        // just means the client has to fetch the full image.
+        if ((mediaType === 'image' || mediaType === 'video') && typeof uploadData.jpegThumbnail === 'undefined') {
+            try {
+                const { thumbnail, originalImageDimensions } = await generateThumbnail(filePath, mediaType, options);
+                uploadData.jpegThumbnail = thumbnail;
+                if (!uploadData.width && originalImageDimensions) {
+                    uploadData.width = originalImageDimensions.width;
+                    uploadData.height = originalImageDimensions.height;
+                }
+            } catch (e) {
+                logger?.warn({ err: e?.message }, 'newsletter thumbnail generation failed');
+            }
+        }
         await fs.unlink(filePath);
         const obj = WAProto.Message.fromObject({
-            // todo: add more support here
             [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
                 url: mediaUrl,
                 directPath,
                 fileSha256,
                 fileLength,
-                thumbnailDirectPath,
-                thumbnailSha256,
                 ...uploadData,
                 media: undefined
             })
@@ -262,6 +294,7 @@ export const prepareWAMessageMedia = async (message, options) => {
         }
         return obj;
     }
+
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined';
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true && typeof uploadData.waveform === 'undefined';
@@ -555,6 +588,14 @@ export const generateWAMessageContent = async (message, options) => {
         applyContextInfoAndMentions(interactiveMessage, message);
         m = { interactiveMessage };
     }
+	else if ('buttonsMessage' in message && !!message.buttonsMessage) {
+		// PATCH: raw buttonsMessage pass-through — classic horizontal buttons (reference: Case X Plugin case.js).
+		// Fully-formed ButtonsMessage with any header (location/image/video/
+		// document), contentText, footerText, headerType and buttons[].
+		// type:1 buttons render in one horizontal row; nativeFlowInfo
+		// single_select opens a list sheet on tap.
+		m = { buttonsMessage: proto.Message.ButtonsMessage.create(message.buttonsMessage) };
+	}
 	else if ('buttons' in message && !!message.buttons) {
         const buttonsMessage = {
             buttons: message.buttons.map(b => ({ ...b, type: proto.Message.ButtonsMessage.Button.Type.RESPONSE }))

package/package.json

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