@queenanya/baileys 9.2.4 → 9.4.1

package/lib/Utils/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/Utils/messages.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAS9C,OAAO,KAAK,EACX,sBAAsB,EACtB,iBAAiB,EAEjB,+BAA+B,EAC/B,wBAAwB,EACxB,mCAAmC,EACnC,kBAAkB,EAGlB,SAAS,EACT,gBAAgB,EAChB,YAAY,EAEZ,MAAM,UAAU,CAAA;AAKjB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAON,KAAK,oBAAoB,EACzB,MAAM,kBAAkB,CAAA;AAGzB,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,WAAW,IAAI,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAwClF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,uBAA+B,CAAA;AAE9E,eAAO,MAAM,6BAA6B,GACzC,MAAM,MAAM,EACZ,YAAY,wBAAwB,CAAC,YAAY,CAAC,EAClD,QAAQ,wBAAwB,CAAC,QAAQ,CAAC,sDAY1C,CAAA;AAiBD,eAAO,MAAM,qBAAqB,GACjC,SAAS,sBAAsB,EAC/B,SAAS,+BAA+B,2BAsMxC,CAAA;AAED,eAAO,MAAM,wCAAwC,GAAI,sBAAsB,MAAM,kBAapF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,GAAI,SAAS,SAAS,EAAE,eAAe,OAAO,mBA6BvF,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,WAAW,EAC1D,SAAS,iBAAiB,EAC1B,KAAK,CAAC,KACJ,OAAO,IAAI,YAAY,CAAC,iBAAiB,EAAE,CAAC,CAQ9C,CAAA;AAMD,eAAO,MAAM,wBAAwB,GACpC,SAAS,iBAAiB,EAC1B,SAAS,+BAA+B,2BAiQxC,CAAA;AAED,eAAO,MAAM,4BAA4B,GACxC,KAAK,MAAM,EACX,SAAS,gBAAgB,EACzB,SAAS,mCAAmC,KA8Ea,SACzD,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAU,KAAK,MAAM,EAAE,SAAS,iBAAiB,EAAE,SAAS,wBAAwB,uBAKjH,CAAA;AAED,qDAAqD;AACrD,eAAO,MAAM,cAAc,GAAI,SAAS,KAAK,CAAC,QAAQ,GAAG,SAAS,qCAMjE,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,gBAAgB,GAAG,IAAI,GAAG,SAAS,KAAG,gBAAgB,GAAG,SA8BzG,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,gBAAgB,GAAG,SAAS,GAAG,IAAI,KAAG,gBAAgB,GAAG,SAuCvG,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,IAAI,MAAM,sDASpB,CAAA;AAEhB,uCAAuC;AACvC,eAAO,MAAM,wBAAwB,GAAI,KAAK,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,SAAS,kBAAkB,SAQxG,CAAA;AAED,6CAA6C;AAC7C,eAAO,MAAM,yBAAyB,GAAI,KAAK,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,UAAU,KAAK,CAAC,SAAS,SAOrG,CAAA;AAED,gDAAgD;AAChD,eAAO,MAAM,2BAA2B,GAAI,KAAK,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,QAAQ,KAAK,CAAC,WAAW,SASzG,CAAA;AAED,mDAAmD;AACnD,eAAO,MAAM,8BAA8B,GAC1C,KAAK,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACtC,QAAQ,KAAK,CAAC,cAAc,SAQ5B,CAAA;AAED,KAAK,eAAe,GAAG;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC7C,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC,EACpE,IAAI,CAAC,EAAE,MAAM,qBAyCb;AAED,KAAK,mBAAmB,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;CACpB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAClD,EAAE,cAAc,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,EACrD,IAAI,CAAC,EAAE,MAAM,yBAoBb;AAED,+GAA+G;AAC/G,eAAO,MAAM,6BAA6B,GAAI,MAAM,YAAY,EAAE;SAC5B,MAAM;iBAAe,MAAM,GAAG,SAAS;gBAAc,MAAM,EAAE;GAiBlG,CAAA;AAED,KAAK,2BAA2B,GAAG;IAClC,eAAe,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACvD,MAAM,EAAE,OAAO,CAAA;CACf,CAAA;AAID;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAU,IAAI,SAAS,QAAQ,GAAG,QAAQ,EAC1E,SAAS,SAAS,EAClB,MAAM,IAAI,EACV,SAAS,oBAAoB,EAC7B,MAAM,2BAA2B,yEAyDjC,CAAA;AAED,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,GAAI,SAAS,KAAK,CAAC,QAAQ,GAAG,IAAI,GAAG,SAAS,6JAa5E,CAAA"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../src/Utils/messages.ts"],"names":[],"mappings":"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"}

package/lib/Utils/messages.js

@@ -3,6 +3,7 @@ import { randomBytes } from 'crypto';
 import { promises as fs } from 'fs';
 import {} from 'stream';
 import { proto } from '../../WAProto/index.js';
+import { buildAdminInviteMessage, buildCallMessage, buildPaymentInviteMessage, buildStickerPackMessage } from '../addons/from-messages.js';
 import { CALL_AUDIO_PREFIX, CALL_VIDEO_PREFIX, MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { WAMessageStatus, WAProto } from '../Types/index.js';
 import { isJidGroup, isJidNewsletter, isJidStatusBroadcast, jidNormalizedUser } from '../WABinary/index.js';
@@ -101,19 +102,22 @@ export const prepareWAMessageMedia = async (message, options) => {
         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 } = await options.upload(filePath, {
+        const { directPath, thumbnailDirectPath, thumbnailSha256 } = await options.upload(filePath, {
             fileEncSha256B64: fileSha256B64,
             mediaType: mediaType,
-            timeoutMs: options.mediaUploadTimeoutMs
+            timeoutMs: options.mediaUploadTimeoutMs,
+            newsletter: true
         });
         await fs.unlink(filePath);
         const obj = WAProto.Message.fromObject({
             // todo: add more support here
             [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-                url: mediaUrl,
+                // url intentionally omitted — newsletters use directPath only
                 directPath,
                 fileSha256,
                 fileLength,
+                thumbnailDirectPath,
+                thumbnailSha256: thumbnailSha256 ? Buffer.from(thumbnailSha256, 'base64') : undefined,
                 ...uploadData,
                 media: undefined
             })
@@ -133,7 +137,7 @@ export const prepareWAMessageMedia = async (message, options) => {
     }
     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;
+    const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true && typeof uploadData.waveform === 'undefined';
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
     const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(uploadData.media, options.mediaTypeOverride || mediaType, {
@@ -155,7 +159,7 @@ export const prepareWAMessageMedia = async (message, options) => {
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await generateThumbnail(originalFilePath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await generateThumbnail(originalFilePath, mediaType, { ...options, hdMode: !!message.hd });
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
@@ -386,6 +390,29 @@ export const generateWAMessageContent = async (message, options) => {
                     type: proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT
                 };
                 break;
+            case 'list':
+                m.listResponseMessage = {
+                    title: message.buttonReply.title,
+                    description: message.buttonReply.description,
+                    singleSelectReply: {
+                        selectedRowId: message.buttonReply.rowId
+                    },
+                    listType: proto.Message.ListResponseMessage.ListType.SINGLE_SELECT
+                };
+                break;
+            case 'interactive':
+                m.interactiveResponseMessage = {
+                    body: {
+                        text: message.buttonReply.displayText,
+                        format: proto.Message.InteractiveResponseMessage.Body.Format.EXTENSIONS_1
+                    },
+                    nativeFlowResponseMessage: {
+                        name: message.buttonReply.nativeFlows?.name,
+                        paramsJson: message.buttonReply.nativeFlows?.paramsJson,
+                        version: message.buttonReply.nativeFlows?.version
+                    }
+                };
+                break;
         }
     }
     else if (hasOptionalProperty(message, 'ptv') && message.ptv) {
@@ -436,10 +463,13 @@ export const generateWAMessageContent = async (message, options) => {
                 statusCode: 400
             });
         }
-        m.messageContextInfo = {
-            // encKey
-            messageSecret: message.poll.messageSecret || randomBytes(32)
-        };
+        // messageSecret must NOT be set for newsletter polls —
+        // newsletters handle encryption differently and a secret causes send failures
+        if (!options.jid || !isJidNewsletter(options.jid)) {
+            const providedSecret = message.poll.messageSecret;
+            const messageSecret = providedSecret instanceof Uint8Array && providedSecret.length === 32 ? providedSecret : randomBytes(32);
+            m.messageContextInfo = { messageSecret };
+        }
         const pollCreationMessage = {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
@@ -460,6 +490,31 @@ export const generateWAMessageContent = async (message, options) => {
             }
         }
     }
+    else if ('adminInvite' in message && !!message.adminInvite) {
+        // addons/from-messages.ts → buildAdminInviteMessage
+        m.newsletterAdminInviteMessage = await buildAdminInviteMessage(message.adminInvite, message.contextInfo, options);
+    }
+    else if ('order' in message && !!message.order) {
+        // order → OrderMessage (from addons)
+        m.orderMessage = WAProto.Message.OrderMessage.fromObject(message.order);
+    }
+    else if ('keep' in message && !!message.keep) {
+        // keep → KeepInChatMessage (from addons)
+        const k = message.keep;
+        m.keepInChatMessage = {
+            key: k.key,
+            keepType: k.type ?? 1,
+            timestampMs: k.time ?? Date.now()
+        };
+    }
+    else if ('call' in message && !!message.call) {
+        // addons/from-messages.ts → buildCallMessage
+        m.scheduledCallCreationMessage = buildCallMessage(message.call);
+    }
+    else if ('paymentInvite' in message && !!message.paymentInvite) {
+        // addons/from-messages.ts → buildPaymentInviteMessage
+        m.paymentInviteMessage = buildPaymentInviteMessage(message.paymentInvite);
+    }
     else if (hasNonNullishProperty(message, 'sharePhoneNumber')) {
         m.protocolMessage = {
             type: proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
@@ -479,21 +534,377 @@ export const generateWAMessageContent = async (message, options) => {
             }
         };
     }
+    else if ('productList' in message && !!message.productList) {
+        // productList handled below after this block — just skip media
+    }
+    else if ('album' in message && !!message.album) {
+        // album handled in sendMessage — just set albumMessage header
+        const albumOpts = message.album;
+        m.albumMessage = {
+            expectedImageCount: albumOpts.expectedImageCount,
+            expectedVideoCount: albumOpts.expectedVideoCount
+        };
+    }
+    else if ('stickerPack' in message && !!message.stickerPack) {
+        // addons/from-messages.ts → buildStickerPackMessage
+        m.stickerPackMessage = await buildStickerPackMessage(message.stickerPack, options);
+    }
     else {
         m = await prepareWAMessageMedia(message, options);
     }
+    // ── productList → ListMessage with products ────────────────────────────────
+    if ('productList' in message && !!message.productList) {
+        const thumbnail = message.thumbnail
+            ? await generateThumbnail(message.thumbnail, 'image', {})
+            : null;
+        const listMessage = {
+            title: message.title,
+            buttonText: message.buttonText,
+            footerText: message.footer,
+            description: message.text,
+            productListInfo: {
+                productSections: message.productList,
+                headerImage: {
+                    productId: message.productList[0]?.products?.[0]?.productId,
+                    jpegThumbnail: thumbnail?.thumbnail ?? null
+                },
+                businessOwnerJid: message.businessOwnerJid
+            },
+            listType: proto.Message.ListMessage.ListType.PRODUCT_LIST
+        };
+        listMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { listMessage };
+    }
+    // ── sections → ListMessage (standalone if, runs independently like fork) ──
+    if ('sections' in message && !!message.sections) {
+        const listMessage = {
+            title: message.title,
+            buttonText: message.buttonText,
+            footerText: message.footer,
+            description: message.text,
+            sections: message.sections,
+            listType: proto.Message.ListMessage.ListType.SINGLE_SELECT
+        };
+        listMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { listMessage };
+    }
+    // ── buttons → buttonsMessage ──────────────────────────────────────────────
+    else if ('buttons' in message && !!message.buttons) {
+        const buttonsMessage = {
+            buttons: message.buttons.map((b) => ({
+                ...b,
+                type: proto.Message.ButtonsMessage.Button.Type.RESPONSE
+            }))
+        };
+        if ('text' in message) {
+            buttonsMessage.contentText = message.text;
+            buttonsMessage.headerType = proto.Message.ButtonsMessage.HeaderType.EMPTY;
+        }
+        else {
+            if ('caption' in message) {
+                buttonsMessage.contentText = message.caption;
+            }
+            const mediaType = Object.keys(m)[0]?.replace('Message', '').toUpperCase();
+            if (mediaType && mediaType in proto.Message.ButtonsMessage.HeaderType) {
+                buttonsMessage.headerType =
+                    proto.Message.ButtonsMessage.HeaderType[mediaType];
+            }
+            Object.assign(buttonsMessage, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            buttonsMessage.footerText = message.footer;
+        }
+        if ('title' in message && !!message.title) {
+            buttonsMessage.text = message.title;
+            buttonsMessage.headerType = proto.Message.ButtonsMessage.HeaderType.TEXT;
+        }
+        buttonsMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { buttonsMessage };
+    }
+    // ── templateButtons → TemplateMessage ─────────────────────────────────────
+    else if ('templateButtons' in message && !!message.templateButtons) {
+        const hydratedTemplate = {
+            hydratedButtons: message.templateButtons
+        };
+        if ('text' in message) {
+            hydratedTemplate.hydratedContentText = message.text;
+        }
+        else if ('caption' in message) {
+            hydratedTemplate.hydratedContentText = message.caption;
+            Object.assign(hydratedTemplate, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            hydratedTemplate.hydratedFooterText = message.footer;
+        }
+        ;
+        hydratedTemplate.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { templateMessage: { hydratedTemplate } };
+    }
+    // ── interactiveButtons → InteractiveMessage native flow (Android + iOS) ──
+    else if ('interactiveButtons' in message && !!message.interactiveButtons) {
+        const interactiveMessage = {
+            // FIX Bug 2: messageParamsJson: '' is required — without it iOS doesn't render buttons
+            nativeFlowMessage: { buttons: message.interactiveButtons, messageParamsJson: '' }
+        };
+        if ('text' in message) {
+            interactiveMessage.body = { text: message.text };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: false
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = { text: message.caption ?? '' };
+            // FIX Bug 1: Object.assign(interactiveMessage, m) was mutating interactiveMessage
+            // AND spreading the whole corrupted object into header — completely broken.
+            // Correct fix: extract only the media fields from m and place them in header.
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: !!(m.imageMessage || m.videoMessage || m.documentMessage),
+                imageMessage: m.imageMessage ?? undefined,
+                videoMessage: m.videoMessage ?? undefined,
+                documentMessage: m.documentMessage ?? undefined
+            };
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = { text: message.footer };
+        }
+        interactiveMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { interactiveMessage };
+    }
+    // ── shop → InteractiveMessage (shopStorefrontMessage) ─────────────────────
+    else if ('shop' in message && !!message.shop) {
+        const interactiveMessage = {
+            shopStorefrontMessage: {
+                surface: message.shop.surface,
+                id: message.shop.id
+            }
+        };
+        if ('text' in message) {
+            interactiveMessage.body = { text: message.text };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: false
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = { text: message.caption ?? '' };
+            // FIX Bug 1: same Object.assign corruption as interactiveButtons — fixed
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: !!(m.imageMessage || m.videoMessage || m.documentMessage),
+                imageMessage: m.imageMessage ?? undefined,
+                videoMessage: m.videoMessage ?? undefined,
+                documentMessage: m.documentMessage ?? undefined
+            };
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = { text: message.footer };
+        }
+        interactiveMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { interactiveMessage };
+    }
+    // ── collection → InteractiveMessage (collectionMessage) ───────────────────
+    else if ('collection' in message && !!message.collection) {
+        const interactiveMessage = {
+            collectionMessage: {
+                bizJid: message.collection.bizJid,
+                id: message.collection.id,
+                messageVersion: message.collection.version ?? message.collection.messageVersion
+            }
+        };
+        if ('text' in message) {
+            interactiveMessage.body = { text: message.text };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: false
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = { text: message.caption ?? '' };
+            // FIX Bug 1: same Object.assign corruption — fixed
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: !!(m.imageMessage || m.videoMessage || m.documentMessage),
+                imageMessage: m.imageMessage ?? undefined,
+                videoMessage: m.videoMessage ?? undefined,
+                documentMessage: m.documentMessage ?? undefined
+            };
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = { text: message.footer };
+        }
+        interactiveMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        m = { interactiveMessage };
+    }
+    // ── cards → InteractiveMessage (carouselMessage, wrapped in viewOnce) ──────
+    else if ('cards' in message && !!message.cards) {
+        const normalizeMedia = (media) => {
+            if (!media)
+                return undefined;
+            if (Buffer.isBuffer(media))
+                return media;
+            if (typeof media === 'string')
+                return { url: media };
+            return media;
+        };
+        const slides = await Promise.all(message.cards.map(async (slide) => {
+            const { image, video, document: doc, product, title, body, footer, buttons } = slide;
+            let header = {};
+            if (product) {
+                const { imageMessage } = await prepareWAMessageMedia({ image: normalizeMedia(product.productImage) }, options);
+                header.productMessage = { product: { ...product, productImage: imageMessage } };
+            }
+            else if (image) {
+                const prepared = await prepareWAMessageMedia({ image: normalizeMedia(image) }, options);
+                if (prepared.imageMessage)
+                    prepared.imageMessage.viewOnce = true;
+                header = prepared;
+            }
+            else if (video) {
+                const prepared = await prepareWAMessageMedia({ video: normalizeMedia(video) }, options);
+                if (prepared.videoMessage) {
+                    prepared.videoMessage.viewOnce = true;
+                    prepared.videoMessage.gifPlayback = false;
+                }
+                header = prepared;
+            }
+            else if (doc) {
+                const prepared = await prepareWAMessageMedia({
+                    document: normalizeMedia(doc),
+                    mimetype: slide.mimetype || 'application/octet-stream',
+                    fileName: slide.fileName
+                }, options);
+                header = prepared;
+            }
+            const headerProps = {
+                title,
+                hasMediaAttachment: !!(header.imageMessage ||
+                    header.videoMessage ||
+                    header.documentMessage ||
+                    header.productMessage),
+                ...header
+            };
+            return WAProto.Message.InteractiveMessage.create({
+                header: WAProto.Message.InteractiveMessage.Header.create(headerProps),
+                body: WAProto.Message.InteractiveMessage.Body.create({ text: body }),
+                footer: WAProto.Message.InteractiveMessage.Footer.create({ text: footer }),
+                nativeFlowMessage: WAProto.Message.InteractiveMessage.NativeFlowMessage.create({
+                    buttons: buttons ?? []
+                })
+            });
+        }));
+        const interactiveMessage = {
+            carouselMessage: WAProto.Message.InteractiveMessage.CarouselMessage.create({ cards: slides })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = WAProto.Message.InteractiveMessage.Body.create({
+                text: message.text ?? ''
+            });
+            interactiveMessage.header = WAProto.Message.InteractiveMessage.Header.create({
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: false
+            });
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = WAProto.Message.InteractiveMessage.Footer.create({
+                text: message.footer ?? ''
+            });
+        }
+        interactiveMessage.contextInfo = {
+            ...(message.contextInfo || {}),
+            ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}),
+            ...(message.mentionAll ? { nonJidMentions: 1 } : {})
+        };
+        // Wrap in viewOnceMessage matching innovators pattern for correct WA rendering
+        m = { interactiveMessage };
+    }
     if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if (hasOptionalProperty(message, 'mentions') && message.mentions?.length) {
+    // ── viewOnceExt → viewOnceMessageV2Extension ──────────────────────────────
+    if (hasOptionalProperty(message, 'viewOnceExt') && !!message.viewOnceExt) {
+        m = { viewOnceMessageV2Extension: { message: m } };
+    }
+    // ── groupStatus → groupStatusMessageV2 ────────────────────────────────────
+    if (hasOptionalProperty(message, 'groupStatus') && !!message.groupStatus) {
         const messageType = Object.keys(m)[0];
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const key = m[messageType];
-        if ('contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo.mentionedJid = message.mentions;
+        if (key && 'contextInfo' in key && !!key.contextInfo) {
+            key.contextInfo.isGroupStatus = message.groupStatus;
+        }
+        else if (key) {
+            key.contextInfo = { isGroupStatus: message.groupStatus };
+        }
+        m = { groupStatusMessageV2: { message: m } };
+    }
+    // ── interactiveAsTemplate → templateMessage.interactiveMessageTemplate ────
+    // FIX Bug 4: was `else if` — so it was silently skipped whenever groupStatus was set.
+    // Must be an independent `if` so both can apply independently.
+    if (hasOptionalProperty(message, 'interactiveAsTemplate') && !!message.interactiveAsTemplate) {
+        if (!m.interactiveMessage) {
+            throw new Boom('Invalid message type for template', { statusCode: 400 });
+        }
+        m = {
+            templateMessage: {
+                interactiveMessageTemplate: m.interactiveMessage,
+                templateId: message.id || `template-${Date.now()}`
+            }
+        };
+    }
+    if ((hasOptionalProperty(message, 'mentions') && message.mentions?.length) ||
+        (hasOptionalProperty(message, 'mentionAll') && message.mentionAll)) {
+        const messageType = Object.keys(m)[0];
+        const key = m[messageType];
+        if (key && 'contextInfo' in key) {
+            key.contextInfo = key.contextInfo || {};
+            if (message.mentions?.length) {
+                key.contextInfo.mentionedJid = message.mentions;
+            }
+            if (message.mentionAll) {
+                key.contextInfo.nonJidMentions = 1;
+            }
         }
         else if (key) {
             key.contextInfo = {
-                mentionedJid: message.mentions
+                mentionedJid: message.mentions,
+                nonJidMentions: message.mentionAll ? 1 : 0
             };
         }
     }
@@ -517,6 +928,15 @@ export const generateWAMessageContent = async (message, options) => {
             key.contextInfo = message.contextInfo;
         }
     }
+    if (hasOptionalProperty(message, 'albumParentKey') && !!message.albumParentKey) {
+        m.messageContextInfo = {
+            ...m.messageContextInfo,
+            messageAssociation: {
+                associationType: WAProto.MessageAssociation.AssociationType.MEDIA_ALBUM,
+                parentMessageKey: message.albumParentKey
+            }
+        };
+    }
     if (shouldIncludeReportingToken(m)) {
         m.messageContextInfo = m.messageContextInfo || {};
         if (!m.messageContextInfo.messageSecret) {