amiudmodz 6.1.7 → 6.1.8

package/lib/Utils/messages.js

@@ -2,16 +2,14 @@ import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
 import { promises as fs } from 'fs';
 import {} from 'stream';
-import { zip } from 'fflate';
 import { proto } from '../../WAProto/index.js';
-import { CALL_AUDIO_PREFIX, CALL_VIDEO_PREFIX, MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL, DONATE_URL, LIBRARY_NAME } from '../Defaults/index.js';
-import { AssociationType, ButtonHeaderType, ButtonType, CarouselCardType, ListType, ProtocolType, WAMessageStatus, WAProto } from '../Types/index.js';
-import { isJidGroup, isJidNewsletter, isJidStatusBroadcast, jidNormalizedUser, isPnUser, isLidUser } from '../WABinary/index.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';
 import { sha256 } from './crypto.js';
 import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './generics.js';
-import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getRawMediaUploadData, getImageProcessingLibrary, getStream, toBuffer, toOggOpus } from './messages-media.js';
+import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getRawMediaUploadData } from './messages-media.js';
 import { shouldIncludeReportingToken } from './reporting-utils.js';
-import { prepareRichResponseMessage } from './rich-message-utils.js';
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
     video: 'video/mp4',
@@ -76,36 +74,6 @@ export const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[mediaType];
-    if (!uploadData.annotations) {
-        uploadData.annotations = [
-            {
-                polygonVertices: [
-                    {
-                        x: 60.71664810180664,
-                        y: -36.39784622192383
-                    },
-                    {
-                        x: -16.710189819335938,
-                        y: 49.263675689697266
-                    },
-                    {
-                        x: -56.585853576660156,
-                        y: 37.85963439941406
-                    },
-                    {
-                        x: 20.840980529785156,
-                        y: -47.80188751220703
-                    }
-                ],
-                newsletter: {
-                    newsletterJid: '120363400725985615@newsletter',
-                    serverMessageId: 0,
-                    newsletterName: 'z4ph',
-                    contentType: 'UPDATE'
-                }
-            }
-        ];
-    }
     // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
         'url' in uploadData.media &&
@@ -163,23 +131,12 @@ export const prepareWAMessageMedia = async (message, options) => {
         }
         return obj;
     }
-    // Auto-convert audio to OGG Opus when voice: true is set
-    if (mediaType === 'audio' && uploadData.voice) {
-        logger?.debug('voice: true — auto-converting audio to OGG Opus');
-        const { stream: rawStream } = await getStream(uploadData.media);
-        uploadData.media = await toOggOpus(rawStream);
-        uploadData.ptt = true;
-        uploadData.mimetype = 'audio/ogg; codecs=opus';
-        logger?.debug('audio converted to OGG Opus');
-    }
     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';
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const media = uploadData.media;
-    uploadData.media = undefined;
-    const { mediaKey, encFilePath, originalFilePath, spilledPath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
@@ -230,9 +187,6 @@ export const prepareWAMessageMedia = async (message, options) => {
             if (originalFilePath) {
                 await fs.unlink(originalFilePath);
             }
-            if (spilledPath) {
-                await fs.unlink(spilledPath).catch(() => { });
-            }
             logger?.debug('removed tmp files');
         }
         catch (error) {
@@ -313,396 +267,24 @@ export const hasNonNullishProperty = (message, key) => {
         message[key] !== null &&
         message[key] !== undefined);
 };
-export const hasOptionalProperty = (obj, key) => {
+function hasOptionalProperty(obj, key) {
     return typeof obj === 'object' && obj !== null && key in obj && obj[key] !== null;
-};
-const CONCURRENCY_LIMIT = 10;
-const isAnimatedWebP = (buffer) => {
-    if (buffer.length < 12 ||
-        buffer[0] !== 0x52 ||
-        buffer[1] !== 0x49 ||
-        buffer[2] !== 0x46 ||
-        buffer[3] !== 0x46 ||
-        buffer[8] !== 0x57 ||
-        buffer[9] !== 0x45 ||
-        buffer[10] !== 0x42 ||
-        buffer[11] !== 0x50) {
-        return false;
-    }
-    let offset = 12;
-    while (offset < buffer.length - 8) {
-        const chunkFourCC = buffer.toString('ascii', offset, offset + 4);
-        const chunkSize = buffer.readUInt32LE(offset + 4);
-        if (chunkFourCC === 'VP8X') {
-            const flagsOffset = offset + 8;
-            if (flagsOffset < buffer.length) {
-                const flags = buffer[flagsOffset];
-                if (flags !== undefined && flags & 0x02) {
-                    return true;
-                }
-            }
-        }
-        else if (chunkFourCC === 'ANIM' || chunkFourCC === 'ANMF') {
-            return true;
-        }
-        offset += 8 + chunkSize + (chunkSize % 2);
-    }
-    return false;
-};
-const isWebPBuffer = (buffer) => {
-    return (buffer.length >= 12 &&
-        buffer[0] === 0x52 &&
-        buffer[1] === 0x49 &&
-        buffer[2] === 0x46 &&
-        buffer[3] === 0x46 &&
-        buffer[8] === 0x57 &&
-        buffer[9] === 0x45 &&
-        buffer[10] === 0x42 &&
-        buffer[11] === 0x50);
-};
-async function prepareProductMessage(message, options) {
-    if (!message.businessOwnerJid) {
-        throw new Boom('"businessOwnerJid" is missing from the content', { statusCode: 400 });
-    }
-    const { imageMessage } = await prepareWAMessageMedia({ image: message.image || message.product.productImage }, options);
-    const content = {
-        ...message,
-        product: {
-            currencyCode: 'IDR',
-            priceAmount1000: 1000,
-            title: LIBRARY_NAME,
-            ...message.product,
-            productImage: imageMessage
-        }
-    };
-    delete content.image;
-    return content;
 }
-async function prepareStickerPackMessage(message, options) {
-    const { cover, stickers = [], name = '📦 Sticker Pack', publisher = 'baileys', description = 'baileys' } = message;
-    if (stickers.length > 60) {
-        throw new Boom('Sticker pack exceeds the maximum limit of 60 stickers', { statusCode: 400 });
-    }
-    if (stickers.length === 0) {
-        throw new Boom('Sticker pack must contain at least one sticker', { statusCode: 400 });
-    }
-    if (!cover) {
-        throw new Boom('Sticker pack must contain a cover', { statusCode: 400 });
-    }
-    const logger = options.logger;
-    let cacheableKey = false;
-    if (Array.isArray(stickers) && stickers.length && options.mediaCache) {
-        const urls = [];
-        for (let i = 0; i < stickers.length; i++) {
-            const data = stickers[i].data;
-            if (typeof data === 'object' && data?.url) {
-                urls.push(data.url);
-            }
-        }
-        if (urls.length > 0) {
-            cacheableKey = 'sticker:' + urls.join('@');
-        }
-    }
-    if (cacheableKey) {
-        const mediaBuff = await options.mediaCache.get(cacheableKey);
-        if (mediaBuff) {
-            logger?.debug({ cacheableKey }, 'got media cache hit');
-            return proto.Message.StickerPackMessage.decode(mediaBuff);
-        }
-    }
-    const lib = await getImageProcessingLibrary();
-    const hasSharp = 'sharp' in lib && !!lib.sharp?.default;
-    const hasImage = 'image' in lib && !!lib.image?.Transformer;
-    const hasJimp = 'jimp' in lib && !!lib.jimp?.Jimp;
-    if (!hasSharp && !hasImage) {
-        throw new Boom('No image processing library (sharp or @napi-rs/image) available for converting sticker to WebP.');
-    }
-    const stickerPackIdValue = generateMessageIDV2();
-    const stickerData = {};
-    const stickerMetadata = new Array(stickers.length);
-    for (let i = 0; i < stickers.length; i += CONCURRENCY_LIMIT) {
-        const promises = [];
-        const chunkEnd = Math.min(i + CONCURRENCY_LIMIT, stickers.length);
-        for (let j = i; j < chunkEnd; j++) {
-            promises.push((async (index) => {
-                const sticker = stickers[index];
-                const { stream } = await getStream(sticker.data);
-                const buffer = await toBuffer(stream);
-                let webpBuffer;
-                let isAnimated = false;
-                if (isWebPBuffer(buffer)) {
-                    webpBuffer = buffer;
-                    isAnimated = isAnimatedWebP(buffer);
-                }
-                else if (hasSharp) {
-                    webpBuffer = await lib.sharp.default(buffer)
-                        .resize(512, 512, { fit: 'inside' })
-                        .webp({ quality: 80 })
-                        .toBuffer();
-                }
-                else {
-                    webpBuffer = await new lib.image.Transformer(buffer)
-                        .resize(512, 512)
-                        .webp(80);
-                }
-                if (webpBuffer.length > 1024 * 1024) {
-                    throw new Boom(`Sticker at index ${index} exceeds the 1MB size limit`, { statusCode: 400 });
-                }
-                const hash = sha256(webpBuffer).toString('base64').replace(/\//g, '-');
-                const fileName = `${hash}.webp`;
-                stickerData[fileName] = [new Uint8Array(webpBuffer), { level: 0 }];
-                stickerMetadata[index] = {
-                    fileName,
-                    mimetype: 'image/webp',
-                    isAnimated,
-                    emojis: sticker.emojis || ['✨'],
-                    accessibilityLabel: sticker.accessibilityLabel || '‎'
-                };
-            })(j));
-        }
-        await Promise.all(promises);
-    }
-    const trayIconFileName = `${stickerPackIdValue}.webp`;
-    const { stream: coverStream } = await getStream(cover);
-    const coverBuffer = await toBuffer(coverStream);
-    let coverWebpBuffer;
-    if (isWebPBuffer(coverBuffer)) {
-        coverWebpBuffer = coverBuffer;
-    }
-    else if (hasSharp) {
-        coverWebpBuffer = await lib.sharp.default(coverBuffer)
-            .resize(512, 512, { fit: 'inside' })
-            .webp({ quality: 80 })
-            .toBuffer();
-    }
-    else {
-        coverWebpBuffer = await new lib.image.Transformer(coverBuffer)
-            .resize(512, 512)
-            .webp(80);
-    }
-    stickerData[trayIconFileName] = [new Uint8Array(coverWebpBuffer), { level: 0 }];
-    const zipBuffer = await new Promise((resolve, reject) => {
-        zip(stickerData, (error, data) => error ? reject(error) : resolve(Buffer.from(data)));
-    });
-    const stickerPackUpload = await encryptedStream(zipBuffer, 'sticker-pack', {
-        logger,
-        opts: options.options
-    });
-    let stickerPackUploadResult;
-    try {
-        stickerPackUploadResult = await options.upload(stickerPackUpload.encFilePath, {
-            fileEncSha256B64: stickerPackUpload.fileEncSha256.toString('base64'),
-            mediaType: 'sticker-pack',
-            timeoutMs: options.mediaUploadTimeoutMs
-        });
-    }
-    finally {
-        fs.unlink(stickerPackUpload.encFilePath).catch(() => logger?.warn('failed to remove tmp file'));
-    }
-    const obj = {
-        name,
-        publisher,
-        stickerPackId: stickerPackIdValue,
-        packDescription: description,
-        stickerPackOrigin: proto.Message.StickerPackMessage.StickerPackOrigin.USER_CREATED,
-        stickerPackSize: zipBuffer.length,
-        stickers: stickerMetadata,
-        fileSha256: stickerPackUpload.fileSha256,
-        fileEncSha256: stickerPackUpload.fileEncSha256,
-        mediaKey: stickerPackUpload.mediaKey,
-        directPath: stickerPackUploadResult.directPath,
-        fileLength: stickerPackUpload.fileLength,
-        mediaKeyTimestamp: unixTimestampSeconds(),
-        trayIconFileName
-    };
-    try {
-        let thumbnailBuffer;
-        if (hasSharp) {
-            thumbnailBuffer = await lib.sharp.default(coverBuffer).resize(252, 252).jpeg().toBuffer();
-        }
-        else if (hasImage) {
-            thumbnailBuffer = await new lib.image.Transformer(coverBuffer).resize(252, 252).jpeg();
-        }
-        else if (hasJimp) {
-            const jimpImage = await lib.jimp.Jimp.read(coverBuffer);
-            thumbnailBuffer = await jimpImage.resize({ w: 252, h: 252 }).getBuffer('image/jpeg');
-        }
-        else {
-            throw new Error('No image processing library available for thumbnail generation');
-        }
-        if (!thumbnailBuffer || thumbnailBuffer.length === 0) {
-            throw new Error('Failed to generate thumbnail buffer');
-        }
-        const thumbUpload = await encryptedStream(thumbnailBuffer, 'thumbnail-sticker-pack', {
-            logger,
-            opts: options.options,
-            mediaKey: stickerPackUpload.mediaKey
-        });
-        let thumbUploadResult;
-        try {
-            thumbUploadResult = await options.upload(thumbUpload.encFilePath, {
-                fileEncSha256B64: thumbUpload.fileEncSha256.toString('base64'),
-                mediaType: 'thumbnail-sticker-pack',
-                timeoutMs: options.mediaUploadTimeoutMs
-            });
-        }
-        finally {
-            fs.unlink(thumbUpload.encFilePath).catch(() => logger?.warn('failed to remove tmp file'));
-        }
-        Object.assign(obj, {
-            thumbnailDirectPath: thumbUploadResult.directPath,
-            thumbnailSha256: thumbUpload.fileSha256,
-            thumbnailEncSha256: thumbUpload.fileEncSha256,
-            thumbnailHeight: 252,
-            thumbnailWidth: 252,
-            imageDataHash: sha256(thumbnailBuffer).toString('base64')
-        });
-    }
-    catch (error) {
-        logger?.warn(`Thumbnail generation failed: ${error}`);
-    }
-    if (cacheableKey) {
-        logger?.debug({ cacheableKey }, 'set cache (background)');
-        options.mediaCache.set(cacheableKey, WAProto.Message.StickerPackMessage.encode(obj).finish());
-    }
-    return WAProto.Message.StickerPackMessage.fromObject(obj);
-}
-function prepareNativeFlowButtons(message) {
-    const buttons = message.nativeFlow;
-    const isButtonsFieldArray = Array.isArray(buttons);
-    const correctedField = isButtonsFieldArray ? buttons : buttons.buttons;
-    const messageParamsJson = {};
-    if (hasOptionalProperty(message, 'offerText') && !!message.offerText) {
-        Object.assign(messageParamsJson, {
-            limited_time_offer: {
-                text: message.offerText || LIBRARY_NAME,
-                url: message.offerUrl || DONATE_URL,
-                copy_code: message.offerCode,
-                expiration_time: message.offerExpiration
-            }
-        });
-    }
-    if (hasOptionalProperty(message, 'optionText') && !!message.optionText) {
-        Object.assign(messageParamsJson, {
-            bottom_sheet: {
-                in_thread_buttons_limit: 1,
-                divider_indices: Array.from({ length: correctedField.length }, (_, index) => index),
-                list_title: message.optionTitle || '📄 Select Options',
-                button_title: message.optionText
-            }
-        });
-    }
-    return {
-        buttons: correctedField.map((button) => {
-            const buttonText = button.text || button.buttonText;
-            const buttonIcon = button.icon?.toUpperCase();
-            if (hasOptionalProperty(button, 'id') && !!button.id) {
-                return {
-                    name: 'quick_reply',
-                    buttonParamsJson: JSON.stringify({
-                        display_text: buttonText || '👉🏻 Click',
-                        id: button.id,
-                        icon: buttonIcon
-                    })
-                };
-            }
-            else if (hasOptionalProperty(button, 'copy') && !!button.copy) {
-                return {
-                    name: 'cta_copy',
-                    buttonParamsJson: JSON.stringify({
-                        display_text: buttonText || '📋 Copy',
-                        copy_code: button.copy,
-                        icon: buttonIcon
-                    })
-                };
-            }
-            else if (hasOptionalProperty(button, 'url') && !!button.url) {
-                return {
-                    name: 'cta_url',
-                    buttonParamsJson: JSON.stringify({
-                        display_text: buttonText || '🌐 Visit',
-                        url: button.url,
-                        merchant_url: button.url,
-                        webview_interaction: button.useWebview,
-                        icon: buttonIcon
-                    })
-                };
-            }
-            else if (hasOptionalProperty(button, 'call') && !!button.call) {
-                return {
-                    name: 'cta_call',
-                    buttonParamsJson: JSON.stringify({
-                        display_text: buttonText || '📞 Call',
-                        phone_number: button.call,
-                        icon: buttonIcon
-                    })
-                };
-            }
-            else if (hasOptionalProperty(button, 'sections') && !!button.sections) {
-                return {
-                    name: 'single_select',
-                    buttonParamsJson: JSON.stringify({
-                        title: buttonText || '📋 Select',
-                        sections: button.sections,
-                        icon: buttonIcon
-                    })
-                };
-            }
-            return button;
-        }),
-        messageParamsJson: JSON.stringify(messageParamsJson),
-        messageVersion: 3
-    };
-}
-export const hasValidAlbumMedia = (message) => {
-    return message.imageMessage || message.videoMessage;
-};
-export const hasValidInteractiveHeader = (message) => {
-    return (message.imageMessage ||
-        message.videoMessage ||
-        message.documentMessage ||
-        message.productMessage ||
-        message.locationMessage);
-};
-export const hasValidCarouselHeader = (message) => {
-    return message.imageMessage || message.videoMessage || message.productMessage;
-};
-const hasProp = (obj, key) => {
-    return obj && typeof obj === 'object' && key in obj && obj[key] !== null && obj[key] !== undefined;
-};
-const hasOptProp = (obj, key) => {
-    return obj && typeof obj === 'object' && key in obj && obj[key] !== null;
-};
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
-    const msg = message;
     let m = {};
-    if (hasProp(msg, 'raw')) {
-        delete msg.raw;
-        return msg;
-    }
-    else if (hasProp(msg, 'code') ||
-        hasProp(msg, 'links') ||
-        hasProp(msg, 'table') ||
-        hasProp(msg, 'richResponse') ||
-        hasProp(msg, 'contentText') ||
-        hasProp(msg, 'aiDisclaimer') ||
-        (hasOptProp(msg, 'ai') && !!msg.ai)) {
-        m = prepareRichResponseMessage(msg);
-    }
-    else if (hasProp(msg, 'text')) {
-        const extContent = { text: msg.text };
-        let urlInfo = msg.linkPreview;
+    if (hasNonNullishProperty(message, 'text')) {
+        const extContent = { text: message.text };
+        let urlInfo = message.linkPreview;
         if (typeof urlInfo === 'undefined') {
-            urlInfo = await generateLinkPreviewIfRequired(msg.text, options.getUrlInfo, options.logger);
+            urlInfo = await generateLinkPreviewIfRequired(message.text, options.getUrlInfo, options.logger);
         }
         if (urlInfo) {
             extContent.matchedText = urlInfo['matched-text'];
             extContent.jpegThumbnail = urlInfo.jpegThumbnail;
             extContent.description = urlInfo.description;
             extContent.title = urlInfo.title;
-            extContent.previewType = urlInfo.previewType ?? 0;
-            extContent.linkPreviewMetadata = urlInfo.linkPreviewMetadata;
+            extContent.previewType = 0;
             const img = urlInfo.highQualityThumbnail;
             if (img) {
                 extContent.thumbnailDirectPath = img.directPath;
@@ -714,19 +296,6 @@ export const generateWAMessageContent = async (message, options) => {
                 extContent.thumbnailEncSha256 = img.fileEncSha256;
             }
         }
-        const faviconData = msg.favicon;
-        if (faviconData && typeof options.upload === 'function') {
-            const { imageMessage } = await prepareWAMessageMedia({ image: faviconData }, options);
-            extContent.faviconMMSMetadata = {
-                thumbnailDirectPath: imageMessage.directPath,
-                mediaKey: imageMessage.mediaKey,
-                mediaKeyTimestamp: imageMessage.mediaKeyTimestamp,
-                thumbnailWidth: 32,
-                thumbnailHeight: 32,
-                thumbnailSha256: imageMessage.fileSha256,
-                thumbnailEncSha256: imageMessage.fileEncSha256
-            };
-        }
         if (options.backgroundColor) {
             extContent.backgroundArgb = await assertColor(options.backgroundColor);
         }
@@ -735,53 +304,55 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m.extendedTextMessage = extContent;
     }
-    else if (hasProp(msg, 'contacts')) {
-        const contactLen = msg.contacts.contacts.length;
+    else if (hasNonNullishProperty(message, 'contacts')) {
+        const contactLen = message.contacts.contacts.length;
         if (!contactLen) {
             throw new Boom('require atleast 1 contact', { statusCode: 400 });
         }
         if (contactLen === 1) {
-            m.contactMessage = WAProto.Message.ContactMessage.create(msg.contacts.contacts[0]);
+            m.contactMessage = WAProto.Message.ContactMessage.create(message.contacts.contacts[0]);
         }
         else {
-            m.contactsArrayMessage = WAProto.Message.ContactsArrayMessage.create(msg.contacts);
+            m.contactsArrayMessage = WAProto.Message.ContactsArrayMessage.create(message.contacts);
         }
     }
-    else if (hasProp(msg, 'location')) {
-        m.locationMessage = WAProto.Message.LocationMessage.create(msg.location);
+    else if (hasNonNullishProperty(message, 'location')) {
+        m.locationMessage = WAProto.Message.LocationMessage.create(message.location);
     }
-    else if (hasProp(msg, 'react')) {
-        if (!msg.react.senderTimestampMs) {
-            msg.react.senderTimestampMs = Date.now();
+    else if (hasNonNullishProperty(message, 'react')) {
+        if (!message.react.senderTimestampMs) {
+            message.react.senderTimestampMs = Date.now();
         }
-        m.reactionMessage = WAProto.Message.ReactionMessage.create(msg.react);
+        m.reactionMessage = WAProto.Message.ReactionMessage.create(message.react);
     }
-    else if (hasProp(msg, 'delete')) {
+    else if (hasNonNullishProperty(message, 'delete')) {
         m.protocolMessage = {
-            key: msg.delete,
+            key: message.delete,
             type: WAProto.Message.ProtocolMessage.Type.REVOKE
         };
     }
-    else if (hasProp(msg, 'forward')) {
-        m = generateForwardMessageContent(msg.forward, msg.force);
+    else if (hasNonNullishProperty(message, 'forward')) {
+        m = generateForwardMessageContent(message.forward, message.force);
     }
-    else if (hasProp(msg, 'disappearingMessagesInChat')) {
-        const exp = typeof msg.disappearingMessagesInChat === 'boolean'
-            ? msg.disappearingMessagesInChat
+    else if (hasNonNullishProperty(message, 'disappearingMessagesInChat')) {
+        const exp = typeof message.disappearingMessagesInChat === 'boolean'
+            ? message.disappearingMessagesInChat
                 ? WA_DEFAULT_EPHEMERAL
                 : 0
-            : msg.disappearingMessagesInChat;
+            : message.disappearingMessagesInChat;
         m = prepareDisappearingMessageSettingContent(exp);
     }
-    else if (hasProp(msg, 'groupInvite')) {
+    else if (hasNonNullishProperty(message, 'groupInvite')) {
         m.groupInviteMessage = {};
-        m.groupInviteMessage.inviteCode = msg.groupInvite.inviteCode;
-        m.groupInviteMessage.inviteExpiration = msg.groupInvite.inviteExpiration;
-        m.groupInviteMessage.caption = msg.groupInvite.text;
-        m.groupInviteMessage.groupJid = msg.groupInvite.jid;
-        m.groupInviteMessage.groupName = msg.groupInvite.subject;
+        m.groupInviteMessage.inviteCode = message.groupInvite.inviteCode;
+        m.groupInviteMessage.inviteExpiration = message.groupInvite.inviteExpiration;
+        m.groupInviteMessage.caption = message.groupInvite.text;
+        m.groupInviteMessage.groupJid = message.groupInvite.jid;
+        m.groupInviteMessage.groupName = message.groupInvite.subject;
+        //TODO: use built-in interface and get disappearing mode info etc.
+        //TODO: cache / use store!?
         if (options.getProfilePicUrl) {
-            const pfpUrl = await options.getProfilePicUrl(msg.groupInvite.jid, 'preview');
+            const pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid, 'preview');
             if (pfpUrl) {
                 const resp = await fetch(pfpUrl, { method: 'GET', dispatcher: options?.options?.dispatcher });
                 if (resp.ok) {
@@ -791,227 +362,123 @@ export const generateWAMessageContent = async (message, options) => {
             }
         }
     }
-    else if (hasProp(msg, 'stickers')) {
-        m.stickerPackMessage = await prepareStickerPackMessage(msg, options);
-    }
-    else if (hasProp(msg, 'pin')) {
+    else if (hasNonNullishProperty(message, 'pin')) {
         m.pinInChatMessage = {};
         m.messageContextInfo = {};
-        m.pinInChatMessage.key = msg.pin;
-        m.pinInChatMessage.type = msg.type;
+        m.pinInChatMessage.key = message.pin;
+        m.pinInChatMessage.type = message.type;
         m.pinInChatMessage.senderTimestampMs = Date.now();
-        m.messageContextInfo.messageAddOnDurationInSecs = msg.type === 1 ? msg.time || 86400 : 0;
-    }
-    else if (hasProp(msg, 'keep')) {
-        m.keepInChatMessage = {};
-        m.keepInChatMessage.key = msg.keep;
-        m.keepInChatMessage.keepType = msg.type;
-        m.keepInChatMessage.timestampMs = Date.now();
+        m.messageContextInfo.messageAddOnDurationInSecs = message.type === 1 ? message.time || 86400 : 0;
     }
-    else if (hasProp(msg, 'flowReply')) {
-        m.interactiveResponseMessage = {
-            body: {
-                format: msg.flowReply.format || proto.Message.InteractiveResponseMessage.Body.Format.DEFAULT,
-                text: msg.flowReply.text
-            },
-            nativeFlowResponseMessage: {
-                name: msg.flowReply.name,
-                paramsJson: msg.flowReply.paramsJson || '{}',
-                version: msg.flowReply.version || 1
-            }
-        };
-    }
-    else if (hasProp(msg, 'buttonReply')) {
-        switch (msg.type) {
+    else if (hasNonNullishProperty(message, 'buttonReply')) {
+        switch (message.type) {
             case 'template':
                 m.templateButtonReplyMessage = {
-                    selectedDisplayText: msg.buttonReply.displayText,
-                    selectedId: msg.buttonReply.id,
-                    selectedIndex: msg.buttonReply.index
+                    selectedDisplayText: message.buttonReply.displayText,
+                    selectedId: message.buttonReply.id,
+                    selectedIndex: message.buttonReply.index
                 };
                 break;
             case 'plain':
                 m.buttonsResponseMessage = {
-                    selectedButtonId: msg.buttonReply.id,
-                    selectedDisplayText: msg.buttonReply.displayText,
+                    selectedButtonId: message.buttonReply.id,
+                    selectedDisplayText: message.buttonReply.displayText,
                     type: proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT
                 };
                 break;
         }
     }
-    else if (hasProp(msg, 'listReply')) {
-        m.listResponseMessage = {
-            description: msg.listReply.description,
-            listType: proto.Message.ListResponseMessage.ListType.SINGLE_SELECT,
-            singleSelectReply: {
-                selectedRowId: msg.listReply.id
-            },
-            title: msg.listReply.title
-        };
-    }
-    else if (hasOptProp(msg, 'ptv') && msg.ptv) {
-        const { videoMessage } = await prepareWAMessageMedia({ video: msg.video }, options);
+    else if (hasOptionalProperty(message, 'ptv') && message.ptv) {
+        const { videoMessage } = await prepareWAMessageMedia({ video: message.video }, options);
         m.ptvMessage = videoMessage;
     }
-    else if (hasProp(msg, 'product')) {
-        m.productMessage = await prepareProductMessage(msg, options);
+    else if (hasNonNullishProperty(message, 'product')) {
+        const { imageMessage } = await prepareWAMessageMedia({ image: message.product.productImage }, options);
+        m.productMessage = WAProto.Message.ProductMessage.create({
+            ...message,
+            product: {
+                ...message.product,
+                productImage: imageMessage
+            }
+        });
     }
-    else if (hasProp(msg, 'event')) {
+    else if (hasNonNullishProperty(message, 'listReply')) {
+        m.listResponseMessage = { ...message.listReply };
+    }
+    else if (hasNonNullishProperty(message, 'event')) {
         m.eventMessage = {};
-        const startTime = Math.floor(msg.event.startDate.getTime() / 1000);
-        if (msg.event.call && options.getCallLink) {
-            const token = await options.getCallLink(msg.event.call, { startTime });
-            m.eventMessage.joinLink = (msg.event.call === 'audio' ? CALL_AUDIO_PREFIX : CALL_VIDEO_PREFIX) + token;
+        const startTime = Math.floor(message.event.startDate.getTime() / 1000);
+        if (message.event.call && options.getCallLink) {
+            const token = await options.getCallLink(message.event.call, { startTime });
+            m.eventMessage.joinLink = (message.event.call === 'audio' ? CALL_AUDIO_PREFIX : CALL_VIDEO_PREFIX) + token;
         }
         m.messageContextInfo = {
-            messageSecret: msg.event.messageSecret || randomBytes(32)
+            // encKey
+            messageSecret: message.event.messageSecret || randomBytes(32)
         };
-        m.eventMessage.name = msg.event.name;
-        m.eventMessage.description = msg.event.description;
+        m.eventMessage.name = message.event.name;
+        m.eventMessage.description = message.event.description;
         m.eventMessage.startTime = startTime;
-        m.eventMessage.endTime = msg.event.endDate ? msg.event.endDate.getTime() / 1000 : undefined;
-        m.eventMessage.isCanceled = msg.event.isCancelled ?? false;
-        m.eventMessage.extraGuestsAllowed = msg.event.extraGuestsAllowed;
-        m.eventMessage.isScheduleCall = msg.event.isScheduleCall ?? false;
-        m.eventMessage.location = msg.event.location;
-    }
-    else if (hasProp(msg, 'poll')) {
-        (_a = msg.poll).selectableCount || (_a.selectableCount = 0);
-        (_b = msg.poll).toAnnouncementGroup || (_b.toAnnouncementGroup = false);
-        if (!Array.isArray(msg.poll.values)) {
+        m.eventMessage.endTime = message.event.endDate ? message.event.endDate.getTime() / 1000 : undefined;
+        m.eventMessage.isCanceled = message.event.isCancelled ?? false;
+        m.eventMessage.extraGuestsAllowed = message.event.extraGuestsAllowed;
+        m.eventMessage.isScheduleCall = message.event.isScheduleCall ?? false;
+        m.eventMessage.location = message.event.location;
+    }
+    else if (hasNonNullishProperty(message, 'poll')) {
+        (_a = message.poll).selectableCount || (_a.selectableCount = 0);
+        (_b = message.poll).toAnnouncementGroup || (_b.toAnnouncementGroup = false);
+        if (!Array.isArray(message.poll.values)) {
             throw new Boom('Invalid poll values', { statusCode: 400 });
         }
-        if (msg.poll.selectableCount < 0 || msg.poll.selectableCount > msg.poll.values.length) {
-            throw new Boom(`poll.selectableCount in poll should be >= 0 and <= ${msg.poll.values.length}`, {
+        if (message.poll.selectableCount < 0 || message.poll.selectableCount > message.poll.values.length) {
+            throw new Boom(`poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`, {
                 statusCode: 400
             });
         }
+        m.messageContextInfo = {
+            // encKey
+            messageSecret: message.poll.messageSecret || randomBytes(32)
+        };
         const pollCreationMessage = {
-            name: msg.poll.name,
-            selectableOptionsCount: msg.poll.selectableCount,
-            options: msg.poll.values.map((optionName) => ({ optionName })),
-            endTime: msg.poll.endDate ? msg.poll.endDate.getTime() : undefined,
-            hideParticipantName: msg.poll.hideVoter ?? false,
-            allowAddOption: msg.poll.canAddOption ?? false
+            name: message.poll.name,
+            selectableOptionsCount: message.poll.selectableCount,
+            options: message.poll.values.map(optionName => ({ optionName }))
         };
-        if (msg.poll.toAnnouncementGroup) {
+        if (message.poll.toAnnouncementGroup) {
+            // poll v2 is for community announcement groups (single select and multiple)
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
-            if (msg.poll.pollType === 1) {
-                if (!msg.poll.correctAnswer) {
-                    throw new Boom('No "correctAnswer" provided for quiz', { statusCode: 400 });
-                }
-                m.pollCreationMessageV5 = {
-                    ...pollCreationMessage,
-                    correctAnswer: {
-                        optionName: msg.poll.correctAnswer.toString()
-                    },
-                    pollType: 1,
-                    selectableOptionsCount: 1
-                };
-            }
-            else if (msg.poll.selectableCount === 1) {
+            if (message.poll.selectableCount === 1) {
+                //poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
+                // poll for multiple choice polls
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
-        m.messageContextInfo = {
-            messageSecret: msg.poll.messageSecret || randomBytes(32)
-        };
-    }
-    else if (hasProp(msg, 'pollResult')) {
-        const pollResultSnapshotMessage = {
-            name: msg.pollResult.name,
-            pollVotes: msg.pollResult.votes.map((vote) => ({
-                optionName: vote.name,
-                optionVoteCount: parseInt(vote.voteCount)
-            }))
-        };
-        if (msg.pollResult.pollType === 1) {
-            pollResultSnapshotMessage.pollType = proto.Message.PollType.QUIZ;
-            m.pollResultSnapshotMessageV3 = pollResultSnapshotMessage;
-        }
-        else {
-            pollResultSnapshotMessage.pollType = proto.Message.PollType.POLL;
-            m.pollResultSnapshotMessage = pollResultSnapshotMessage;
-        }
     }
-    else if (hasProp(msg, 'pollUpdate')) {
-        if (!msg.pollUpdate.key) {
-            throw new Boom('Message key is required', { statusCode: 400 });
-        }
-        if (!msg.pollUpdate.vote) {
-            throw new Boom('Encrypted vote payload is required', { statusCode: 400 });
-        }
-        m.pollUpdateMessage = {
-            metadata: msg.pollUpdate.metadata,
-            pollCreationMessageKey: msg.pollUpdate.key,
-            senderTimestampMs: Date.now(),
-            vote: msg.pollUpdate.vote
-        };
-    }
-    else if (hasProp(msg, 'paymentInviteServiceType')) {
-        m.paymentInviteMessage = {
-            expiryTimestamp: Date.now(),
-            serviceType: msg.paymentInviteServiceType
-        };
-    }
-    else if (hasProp(msg, 'orderText')) {
-        if (!Buffer.isBuffer(msg.thumbnail)) {
-            throw new Boom('Must provide thumbnail buffer in order message', { statusCode: 400 });
-        }
-        m.orderMessage = {
-            itemCount: 1,
-            messageVersion: 1,
-            orderTitle: LIBRARY_NAME,
-            status: proto.Message.OrderMessage.OrderStatus.INQUIRY,
-            surface: proto.Message.OrderMessage.OrderSurface.CATALOG,
-            token: generateMessageIDV2(),
-            totalAmount1000: 1000,
-            totalCurrencyCode: 'IDR',
-            ...msg,
-            message: msg.orderText
-        };
-        delete m.orderMessage.orderText;
-    }
-    else if (hasProp(msg, 'album')) {
-        if (!Array.isArray(msg.album)) {
-            throw new Boom('Invalid album type. Expected an array.', { statusCode: 400 });
-        }
-        let videoCount = 0;
-        for (let i = 0; i < msg.album.length; i++) {
-            if (msg.album[i].video)
-                videoCount++;
-        }
-        let imageCount = 0;
-        for (let i = 0; i < msg.album.length; i++) {
-            if (msg.album[i].image)
-                imageCount++;
-        }
-        if (videoCount + imageCount < 2) {
-            throw new Boom('Minimum provide 2 media to upload album message', { statusCode: 400 });
-        }
+    else if (hasNonNullishProperty(message, 'album')) {
         m.albumMessage = {
-            expectedImageCount: imageCount,
-            expectedVideoCount: videoCount
+            expectedImageCount: message.album.expectedImageCount,
+            expectedVideoCount: message.album.expectedVideoCount
         };
     }
-    else if (hasProp(msg, 'sharePhoneNumber')) {
+    else if (hasNonNullishProperty(message, 'sharePhoneNumber')) {
         m.protocolMessage = {
             type: proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
         };
     }
-    else if (hasProp(msg, 'requestPhoneNumber')) {
+    else if (hasNonNullishProperty(message, 'requestPhoneNumber')) {
         m.requestPhoneNumberMessage = {};
     }
-    else if (hasProp(msg, 'limitSharing')) {
+    else if (hasNonNullishProperty(message, 'limitSharing')) {
         m.protocolMessage = {
             type: proto.Message.ProtocolMessage.Type.LIMIT_SHARING,
             limitSharing: {
-                sharingLimited: msg.limitSharing === true,
+                sharingLimited: message.limitSharing === true,
                 trigger: 1,
                 limitSharingSettingTimestamp: Date.now(),
                 initiatedByMe: true
@@ -1019,408 +486,57 @@ export const generateWAMessageContent = async (message, options) => {
         };
     }
     else {
-        m = await prepareWAMessageMedia(msg, options);
-    }
-    if (hasProp(msg, 'buttons')) {
-        const buttonsMessage = {
-            buttons: msg.buttons.map((button) => {
-                const buttonText = button.text || button.buttonText;
-                if (hasOptProp(button, 'sections')) {
-                    return {
-                        nativeFlowInfo: {
-                            name: 'single_select',
-                            paramsJson: JSON.stringify({
-                                title: buttonText,
-                                sections: button.sections
-                            })
-                        },
-                        type: ButtonType.NATIVE_FLOW
-                    };
-                }
-                else if (hasOptProp(button, 'name')) {
-                    return {
-                        nativeFlowInfo: {
-                            name: button.name,
-                            paramsJson: button.paramsJson
-                        },
-                        type: ButtonType.NATIVE_FLOW
-                    };
-                }
-                return {
-                    buttonId: button.id || button.buttonId,
-                    buttonText: typeof buttonText === 'string' ? { displayText: buttonText } : buttonText,
-                    type: button.type || ButtonType.RESPONSE
-                };
-            })
-        };
-        if (hasOptProp(msg, 'text')) {
-            buttonsMessage.contentText = msg.text;
-            buttonsMessage.headerType = ButtonHeaderType.EMPTY;
-        }
-        else {
-            if (hasOptProp(msg, 'caption')) {
-                buttonsMessage.contentText = msg.caption;
-            }
-            const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
-            buttonsMessage.headerType = ButtonHeaderType[type];
-            Object.assign(buttonsMessage, m);
-        }
-        if (hasOptProp(msg, 'footer')) {
-            buttonsMessage.footerText = msg.footer;
-        }
-        m = { buttonsMessage };
-    }
-    else if (hasProp(msg, 'sections')) {
-        const listMessage = {
-            sections: msg.sections,
-            buttonText: msg.buttonText,
-            title: msg.title,
-            footerText: msg.footer,
-            description: msg.text,
-            listType: ListType.SINGLE_SELECT
-        };
-        m = { listMessage };
-    }
-    else if (hasProp(msg, 'templateButtons')) {
-        const hydratedTemplate = {
-            hydratedButtons: msg.templateButtons.map((button, i) => {
-                const buttonText = button.text || button.buttonText;
-                if (hasOptProp(button, 'id')) {
-                    return {
-                        index: i,
-                        quickReplyButton: {
-                            displayText: buttonText || '👉🏻 Click',
-                            id: button.id
-                        }
-                    };
-                }
-                else if (hasOptProp(button, 'url')) {
-                    return {
-                        index: i,
-                        urlButton: {
-                            displayText: buttonText || '🌐 Visit',
-                            url: button.url
-                        }
-                    };
-                }
-                else if (hasOptProp(button, 'call')) {
-                    return {
-                        index: i,
-                        callButton: {
-                            displayText: buttonText || '📞 Call',
-                            phoneNumber: button.call
-                        }
-                    };
-                }
-                button.index = button.index || i;
-                return button;
-            })
-        };
-        if (hasOptProp(msg, 'text')) {
-            hydratedTemplate.hydratedContentText = msg.text;
-        }
-        else {
-            if (hasOptProp(msg, 'caption')) {
-                hydratedTemplate.hydratedTitleText = msg.title;
-                hydratedTemplate.hydratedContentText = msg.caption;
-            }
-            Object.assign(hydratedTemplate, m);
-        }
-        if (hasOptProp(msg, 'footer')) {
-            hydratedTemplate.hydratedFooterText = msg.footer;
-        }
-        hydratedTemplate.templateId = msg.id || 'template-' + Date.now();
-        m = {
-            templateMessage: {
-                hydratedFourRowTemplate: hydratedTemplate,
-                hydratedTemplate: hydratedTemplate
-            }
-        };
-    }
-    else if (hasProp(msg, 'nativeFlow')) {
-        const interactiveMessage = {
-            nativeFlowMessage: prepareNativeFlowButtons(msg)
-        };
-        if (hasOptProp(msg, 'bizJid')) {
-            interactiveMessage.collectionMessage = {
-                bizJid: msg.bizJid,
-                id: msg.id,
-                messageVersion: 1
-            };
-        }
-        else if (hasOptProp(msg, 'shopSurface')) {
-            interactiveMessage.shopStorefrontMessage = {
-                surface: msg.shopSurface,
-                id: msg.id,
-                messageVersion: 1
-            };
-        }
-        if (hasOptProp(msg, 'text')) {
-            interactiveMessage.body = { text: msg.text };
-        }
-        else {
-            if (hasOptProp(msg, 'caption')) {
-                const isValidHeader = hasValidInteractiveHeader(m);
-                if (!isValidHeader) {
-                    throw new Boom('Invalid media type for interactive message header', { statusCode: 400 });
-                }
-                interactiveMessage.header = {
-                    title: msg.title || '',
-                    subtitle: msg.subtitle || '',
-                    hasMediaAttachment: isValidHeader
-                };
-                interactiveMessage.body = { text: msg.caption };
-            }
-            if (hasOptProp(msg, 'thumbnail') && !!msg.thumbnail) {
-                interactiveMessage.jpegThumbnail = msg.thumbnail;
-            }
-            Object.assign(interactiveMessage.header, m);
-        }
-        if (hasOptProp(msg, 'audioFooter')) {
-            const { audioMessage } = await prepareWAMessageMedia({ audio: msg.audioFooter }, options);
-            interactiveMessage.footer = {
-                audioMessage,
-                hasMediaAttachment: true
-            };
-        }
-        else if (hasOptProp(msg, 'footer')) {
-            interactiveMessage.footer = { text: msg.footer };
-        }
-        m = { interactiveMessage };
-    }
-    else if (hasProp(msg, 'cards')) {
-        const interactiveMessage = {
-            carouselMessage: {
-                cards: await Promise.all(msg.cards.map(async (card) => {
-                    let carouselHeader = {};
-                    if (hasProp(card, 'product')) {
-                        carouselHeader.productMessage = await prepareProductMessage(card, options);
-                    }
-                    else {
-                        carouselHeader = await prepareWAMessageMedia(card, options).catch(() => ({}));
-                    }
-                    const isValidHeader = hasValidCarouselHeader(carouselHeader);
-                    if (!isValidHeader) {
-                        throw new Boom('Invalid media type for carousel card', { statusCode: 400 });
-                    }
-                    const carouselCard = {
-                        nativeFlowMessage: prepareNativeFlowButtons(card.nativeFlow ? card : [])
-                    };
-                    if (hasOptProp(card, 'text')) {
-                        carouselCard.body = { text: card.text };
-                    }
-                    else {
-                        if (hasOptProp(card, 'caption')) {
-                            carouselCard.header = {
-                                title: card.title || '',
-                                subtitle: card.subtitle || '',
-                                hasMediaAttachment: isValidHeader
-                            };
-                            carouselCard.body = { text: card.caption };
-                        }
-                        if (hasOptProp(card, 'thumbnail') && !!card.thumbnail) {
-                            carouselCard.jpegThumbnail = card.thumbnail;
-                        }
-                        Object.assign(carouselCard.header, carouselHeader);
-                    }
-                    if (hasOptProp(card, 'audioFooter')) {
-                        const { audioMessage } = await prepareWAMessageMedia({ audio: card.audioFooter }, options);
-                        carouselCard.footer = {
-                            audioMessage,
-                            hasMediaAttachment: true
-                        };
-                    }
-                    else if (hasOptProp(card, 'footer')) {
-                        carouselCard.footer = { text: card.footer };
-                    }
-                    return carouselCard;
-                })),
-                carouselCardType: CarouselCardType.UNKNOWN,
-                messageVersion: 1
-            }
-        };
-        if (hasOptProp(msg, 'text')) {
-            interactiveMessage.body = { text: msg.text };
-        }
-        if (hasOptProp(msg, 'footer')) {
-            interactiveMessage.footer = { text: msg.footer };
-        }
-        m = { interactiveMessage };
+        m = await prepareWAMessageMedia(message, options);
     }
-    else if (hasProp(msg, 'requestPaymentFrom')) {
-        const requestPaymentMessage = {
-            amount: {
-                currencyCode: 'IDR',
-                offset: 1000,
-                value: 1000
-            },
-            amount1000: 1000,
-            currencyCodeIso4217: 'IDR',
-            expiryTimestamp: Date.now(),
-            noteMessage: m,
-            requestFrom: msg.requestPaymentFrom,
-            ...msg
-        };
-        delete requestPaymentMessage.requestPaymentFrom;
-        if (hasProp(m, 'extendedTextMessage') || hasProp(m, 'stickerMessage')) {
-            Object.assign(requestPaymentMessage.noteMessage, m);
-        }
-        else {
-            throw new Boom('Invalid message type for request payment note message', { statusCode: 400 });
-        }
-        m = { requestPaymentMessage };
-    }
-    else if (hasProp(msg, 'invoiceNote')) {
-        const attachment = m.imageMessage || m.documentMessage;
-        const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
-        const invoiceMessage = {
-            attachmentType: proto.Message.InvoiceMessage.AttachmentType[type === 'DOCUMENT' ? 'PDF' : 'IMAGE'],
-            note: msg.invoiceNote
-        };
-        if (attachment) {
-            const { directPath, fileEncSha256, fileSha256, jpegThumbnail = undefined, mediaKey, mediaKeyTimestamp, mimetype } = attachment;
-            Object.assign(invoiceMessage, {
-                attachmentDirectPath: directPath,
-                attachmentFileEncSha256: fileEncSha256,
-                attachmentFileSha256: fileSha256,
-                attachmentJpegThumbnail: jpegThumbnail,
-                attachmentMediaKey: mediaKey,
-                attachmentMediaKeyTimestamp: mediaKeyTimestamp,
-                attachmentMimetype: mimetype,
-                token: generateMessageIDV2()
-            });
-        }
-        else {
-            throw new Boom('Invalid media type for invoice message', { statusCode: 400 });
-        }
-        m = { invoiceMessage };
-    }
-    if (hasOptProp(msg, 'externalAdReply') && !!msg.externalAdReply) {
-        const messageType = Object.keys(m)[0];
-        const key = m[messageType];
-        const content = msg.externalAdReply;
-        if ('thumbnail' in content && !Buffer.isBuffer(content.thumbnail)) {
-            throw new Boom('Thumbnail must in buffer type', { statusCode: 400 });
-        }
-        if (!content.url || typeof content.url !== 'string') {
-            content.url = DONATE_URL;
-        }
-        const externalAdReply = {
-            ...content,
-            body: content.body,
-            mediaType: content.mediaType || 1,
-            mediaUrl: content.url,
-            renderLargerThumbnail: content.largeThumbnail,
-            sourceUrl: content.url,
-            thumbnail: content.thumbnail,
-            thumbnailUrl: content.url + '?update=' + Date.now(),
-            title: content.title || LIBRARY_NAME
-        };
-        delete externalAdReply.subTitle;
-        delete externalAdReply.largeThumbnail;
-        delete externalAdReply.url;
-        if (key && 'contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo.externalAdReply = { ...key.contextInfo.externalAdReply, ...externalAdReply };
-        }
-        else if (key) {
-            key.contextInfo = { externalAdReply };
-        }
+    if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
+        m = { viewOnceMessage: { message: m } };
     }
-    if ((hasOptProp(msg, 'mentions') && msg.mentions?.length) ||
-        (hasOptProp(msg, 'mentionAll') && msg.mentionAll)) {
+    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 (msg.mentions?.length) {
-                key.contextInfo.mentionedJid = msg.mentions;
+            if (message.mentions?.length) {
+                key.contextInfo.mentionedJid = message.mentions;
             }
-            if (msg.mentionAll) {
+            if (message.mentionAll) {
                 key.contextInfo.nonJidMentions = 1;
             }
         }
         else if (key) {
             key.contextInfo = {
-                mentionedJid: msg.mentions,
-                nonJidMentions: msg.mentionAll ? 1 : 0
+                mentionedJid: message.mentions,
+                nonJidMentions: message.mentionAll ? 1 : 0
             };
         }
     }
-    if (hasOptProp(msg, 'contextInfo') && !!msg.contextInfo) {
-        const messageType = Object.keys(m)[0];
-        const key = m[messageType];
-        if (key && 'contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo = { ...key.contextInfo, ...msg.contextInfo };
-        }
-        else if (key) {
-            key.contextInfo = msg.contextInfo;
-        }
-    }
-    if (hasOptProp(msg, 'groupStatus') && !!msg.groupStatus) {
-        const messageType = Object.keys(m)[0];
-        const key = m[messageType];
-        if (key && 'contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo.isGroupStatus = msg.groupStatus;
-        }
-        else if (key) {
-            key.contextInfo = {
-                isGroupStatus: msg.groupStatus
-            };
-        }
-        m = { groupStatusMessageV2: { message: m } };
-        delete msg.groupStatus;
+    if (hasOptionalProperty(message, 'edit')) {
+        m = {
+            protocolMessage: {
+                key: message.edit,
+                editedMessage: m,
+                timestampMs: Date.now(),
+                type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT
+            }
+        };
     }
-    if (hasOptProp(msg, 'spoiler') && !!msg.spoiler) {
+    if (hasOptionalProperty(message, 'contextInfo') && !!message.contextInfo) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
-        if (key && 'contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo.isSpoiler = msg.spoiler;
+        if ('contextInfo' in key && !!key.contextInfo) {
+            key.contextInfo = { ...key.contextInfo, ...message.contextInfo };
         }
         else if (key) {
-            key.contextInfo = {
-                isSpoiler: msg.spoiler
-            };
-        }
-        m = { spoilerMessage: { message: m } };
-        delete msg.spoiler;
-    }
-    else if (hasOptProp(msg, 'interactiveAsTemplate') && !!msg.interactiveAsTemplate) {
-        if (!m.interactiveMessage) {
-            throw new Boom('Invalid message type for template', { statusCode: 400 });
+            key.contextInfo = message.contextInfo;
         }
-        m = {
-            templateMessage: {
-                interactiveMessageTemplate: m.interactiveMessage,
-                templateId: msg.id || 'template-' + Date.now()
-            }
-        };
-        delete msg.interactiveAsTemplate;
-    }
-    if (hasOptProp(msg, 'ephemeral') && !!msg.ephemeral) {
-        m = { ephemeralMessage: { message: m } };
-        delete msg.ephemeral;
-    }
-    if (hasOptProp(msg, 'isLottie') && !!msg.isLottie) {
-        m = { lottieStickerMessage: { message: m } };
-    }
-    else if (hasOptProp(msg, 'viewOnce') && !!msg.viewOnce) {
-        m = { viewOnceMessage: { message: m } };
-    }
-    else if (hasOptProp(msg, 'viewOnceV2') && !!msg.viewOnceV2) {
-        m = { viewOnceMessageV2: { message: m } };
-        delete msg.viewOnceV2;
     }
-    else if (hasOptProp(msg, 'viewOnceV2Extension') && !!msg.viewOnceV2Extension) {
-        m = { viewOnceMessageV2Extension: { message: m } };
-        delete msg.viewOnceV2Extension;
-    }
-    if (hasOptProp(msg, 'edit')) {
-        m = {
-            protocolMessage: {
-                key: msg.edit,
-                editedMessage: m,
-                timestampMs: Date.now(),
-                type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT
+    if (hasOptionalProperty(message, 'albumParentKey') && !!message.albumParentKey) {
+        m.messageContextInfo = {
+            ...m.messageContextInfo,
+            messageAssociation: {
+                associationType: WAProto.MessageAssociation.AssociationType.MEDIA_ALBUM,
+                parentMessageKey: message.albumParentKey
             }
         };
     }
@@ -1433,82 +549,79 @@ export const generateWAMessageContent = async (message, options) => {
     return WAProto.Message.create(m);
 };
 export const generateWAMessageFromContent = (jid, message, options) => {
+    // set timestamp to now
+    // if not specified
     if (!options.timestamp) {
         options.timestamp = new Date();
     }
     const innerMessage = normalizeMessageContent(message);
-    const messageContextInfo = message.messageContextInfo;
     const key = getContentType(innerMessage);
     const timestamp = unixTimestampSeconds(options.timestamp);
-    const isNewsletter = isJidNewsletter(jid);
     const { quoted, userJid } = options;
-    if (quoted && innerMessage) {
+    if (quoted && !isJidNewsletter(jid)) {
         const participant = quoted.key.fromMe
-            ? userJid
+            ? userJid // TODO: Add support for LIDs
             : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
         let quotedMsg = normalizeMessageContent(quoted.message);
-        if (quotedMsg) {
-            const msgType = getContentType(quotedMsg);
-            quotedMsg = proto.Message.create({ [msgType]: quotedMsg[msgType] });
-            const quotedContent = quotedMsg[msgType];
-            if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
-                delete quotedContent.contextInfo;
-            }
-            const innerMsgKey = innerMessage[key];
-            const contextInfo = (innerMsgKey && typeof innerMsgKey === 'object' && 'contextInfo' in innerMsgKey && innerMsgKey.contextInfo) || {};
-            contextInfo.participant = jidNormalizedUser(participant || '');
-            contextInfo.stanzaId = quoted.key.id;
-            contextInfo.quotedMessage = quotedMsg;
-            if (!isNewsletter && jid !== quoted.key.remoteJid) {
-                contextInfo.remoteJid = quoted.key.remoteJid;
-            }
-            if (contextInfo && innerMsgKey && typeof innerMsgKey === 'object') {
-                innerMsgKey.contextInfo = contextInfo;
-            }
-        }
-    }
-    if (innerMessage &&
-        !!options?.ephemeralExpiration &&
+        const msgType = getContentType(quotedMsg);
+        // strip any redundant properties
+        quotedMsg = proto.Message.create({ [msgType]: quotedMsg[msgType] });
+        const quotedContent = quotedMsg[msgType];
+        if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
+            delete quotedContent.contextInfo;
+        }
+        const contextInfo = ('contextInfo' in innerMessage[key] && innerMessage[key]?.contextInfo) || {};
+        contextInfo.participant = jidNormalizedUser(participant);
+        contextInfo.stanzaId = quoted.key.id;
+        contextInfo.quotedMessage = quotedMsg;
+        // if a participant is quoted, then it must be a group
+        // hence, remoteJid of group must also be entered
+        if (jid !== quoted.key.remoteJid) {
+            contextInfo.remoteJid = quoted.key.remoteJid;
+        }
+        if (contextInfo && innerMessage[key]) {
+            /* @ts-ignore */
+            innerMessage[key].contextInfo = contextInfo;
+        }
+    }
+    if (
+    // if we want to send a disappearing message
+    !!options?.ephemeralExpiration &&
+        // and it's not a protocol message -- delete, toggle disappear message
         key !== 'protocolMessage' &&
+        // already not converted to disappearing message
         key !== 'ephemeralMessage' &&
-        !isNewsletter) {
-        const innerMsgKey = innerMessage[key];
-        if (innerMsgKey && typeof innerMsgKey === 'object') {
-            innerMsgKey.contextInfo = {
-                ...(innerMsgKey.contextInfo || {}),
-                expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL
-            };
-        }
-    }
-    if (messageContextInfo?.messageSecret && (isPnUser(jid) || isLidUser(jid))) {
-        messageContextInfo.deviceListMetadata = {
-            recipientKeyHash: randomBytes(10),
-            recipientTimestamp: unixTimestampSeconds()
+        // newsletters don't support ephemeral messages
+        !isJidNewsletter(jid)) {
+        /* @ts-ignore */
+        innerMessage[key].contextInfo = {
+            ...(innerMessage[key].contextInfo || {}),
+            expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL
+            //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
         };
-        messageContextInfo.deviceListMetadataVersion = 2;
     }
-    const finalMessage = WAProto.Message.create(message);
+    message = WAProto.Message.create(message);
     const messageJSON = {
         key: {
             remoteJid: jid,
             fromMe: true,
             id: options?.messageId || generateMessageIDV2()
         },
-        message: finalMessage,
+        message: message,
         messageTimestamp: timestamp,
         messageStubParameters: [],
-        participant: isJidGroup(jid) || isJidStatusBroadcast(jid) ? userJid : undefined,
+        participant: isJidGroup(jid) || isJidStatusBroadcast(jid) ? userJid : undefined, // TODO: Add support for LIDs
         status: WAMessageStatus.PENDING
     };
     return WAProto.WebMessageInfo.fromObject(messageJSON);
 };
 export const generateWAMessage = async (jid, content, options) => {
+    // ensure msg ID is with every log
     options.logger = options?.logger?.child({ msgId: options.messageId });
-    if (jid) {
-        options.jid = jid;
-    }
-    return generateWAMessageFromContent(jid, await generateWAMessageContent(content, options), options);
+    // Pass jid in the options to generateWAMessageContent
+    return generateWAMessageFromContent(jid, await generateWAMessageContent(content, { ...options, jid }), options);
 };
+/** Get the key to access the true type of content */
 export const getContentType = (content) => {
     if (content) {
         const keys = Object.keys(content);
@@ -1516,10 +629,17 @@ export const getContentType = (content) => {
         return key;
     }
 };
+/**
+ * Normalizes ephemeral, view once messages to regular message content
+ * Eg. image messages in ephemeral messages, in view once messages etc.
+ * @param content
+ * @returns
+ */
 export const normalizeMessageContent = (content) => {
     if (!content) {
         return undefined;
     }
+    // set max iterations to prevent an infinite loop
     for (let i = 0; i < 5; i++) {
         const inner = getFutureProofMessage(content);
         if (!inner) {
@@ -1527,37 +647,23 @@ export const normalizeMessageContent = (content) => {
         }
         content = inner.message;
     }
-    return content || undefined;
+    return content;
     function getFutureProofMessage(message) {
-        return (message?.associatedChildMessage ||
-            message?.botForwardedMessage ||
-            message?.botInvokeMessage ||
-            message?.botTaskMessage ||
+        return (message?.ephemeralMessage ||
+            message?.viewOnceMessage ||
             message?.documentWithCaptionMessage ||
+            message?.viewOnceMessageV2 ||
+            message?.viewOnceMessageV2Extension ||
             message?.editedMessage ||
-            message?.ephemeralMessage ||
-            message?.eventCoverImage ||
-            message?.groupMentionedMessage ||
-            message?.groupStatusMentionMessage ||
+            message?.associatedChildMessage ||
             message?.groupStatusMessage ||
-            message?.groupStatusMessageV2 ||
-            message?.limitSharingMessage ||
-            message?.lottieStickerMessage ||
-            message?.newsletterAdminProfileMessage ||
-            message?.newsletterAdminProfileMessageV2 ||
-            message?.newsletterAdminProfileStatusMessage ||
-            message?.pollCreationMessageV4 ||
-            message?.pollCreationOptionImageMessage ||
-            message?.questionMessage ||
-            message?.questionReplyMessage ||
-            message?.spoilerMessage ||
-            message?.statusAddYours ||
-            message?.statusMentionMessage ||
-            message?.viewOnceMessage ||
-            message?.viewOnceMessageV2 ||
-            message?.viewOnceMessageV2Extension);
+            message?.groupStatusMessageV2);
     }
 };
+/**
+ * Extract the true message content from a message
+ * Eg. extracts the inner message from a disappearing message/view once message
+ */
 export const extractMessageContent = (content) => {
     const extractFromTemplateMessage = (msg) => {
         if (msg.imageMessage) {
@@ -1593,6 +699,9 @@ export const extractMessageContent = (content) => {
     }
     return content;
 };
+/**
+ * Returns the device predicted by message ID
+ */
 export const getDevice = (id) => /^3A.{18}$/.test(id)
     ? 'ios'
     : /^3E.{20}$/.test(id)
@@ -1602,6 +711,7 @@ export const getDevice = (id) => /^3A.{18}$/.test(id)
             : /^(3F|.{18}$)/.test(id)
                 ? 'desktop'
                 : 'unknown';
+/** Upserts a receipt in the message */
 export const updateMessageWithReceipt = (msg, receipt) => {
     msg.userReceipt = msg.userReceipt || [];
     const recp = msg.userReceipt.find(m => m.userJid === receipt.userJid);
@@ -1612,6 +722,7 @@ export const updateMessageWithReceipt = (msg, receipt) => {
         msg.userReceipt.push(receipt);
     }
 };
+/** Update the message with a new reaction */
 export const updateMessageWithReaction = (msg, reaction) => {
     const authorID = getKeyAuthor(reaction.key);
     const reactions = (msg.reactions || []).filter(r => getKeyAuthor(r.key) !== authorID);
@@ -1619,20 +730,28 @@ export const updateMessageWithReaction = (msg, reaction) => {
     reactions.push(reaction);
     msg.reactions = reactions;
 };
+/** Update the message with a new poll update */
 export const updateMessageWithPollUpdate = (msg, update) => {
-    const authorID = getKeyAuthor(update.pollUpdateMessageKey || update.pollCreationMessageKey);
-    const pollUpdates = (msg.pollUpdates || []).filter(r => getKeyAuthor(r.pollUpdateMessageKey || r.pollCreationMessageKey) !== authorID);
+    const authorID = getKeyAuthor(update.pollUpdateMessageKey);
+    const reactions = (msg.pollUpdates || []).filter(r => getKeyAuthor(r.pollUpdateMessageKey) !== authorID);
     if (update.vote?.selectedOptions?.length) {
-        pollUpdates.push(update);
+        reactions.push(update);
     }
-    msg.pollUpdates = pollUpdates;
+    msg.pollUpdates = reactions;
 };
+/** Update the message with a new event response */
 export const updateMessageWithEventResponse = (msg, update) => {
-    const authorID = getKeyAuthor(update.eventResponseMessageKey || update.eventCreationMessageKey);
-    const responses = (msg.eventResponses || []).filter(r => getKeyAuthor(r.eventResponseMessageKey || r.eventCreationMessageKey) !== authorID);
+    const authorID = getKeyAuthor(update.eventResponseMessageKey);
+    const responses = (msg.eventResponses || []).filter(r => getKeyAuthor(r.eventResponseMessageKey) !== authorID);
     responses.push(update);
     msg.eventResponses = responses;
 };
+/**
+ * Aggregates all poll updates in a poll.
+ * @param msg the poll creation message
+ * @param meId your jid
+ * @returns A list of options & their voters
+ */
 export function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     const opts = message?.pollCreationMessage?.options ||
         message?.pollCreationMessageV2?.options ||
@@ -1661,11 +780,17 @@ export function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
                 };
                 data = voteHashMap[hash];
             }
-            data.voters.push(getKeyAuthor((update.pollUpdateMessageKey || update.pollCreationMessageKey), meId));
+            voteHashMap[hash].voters.push(getKeyAuthor(update.pollUpdateMessageKey, meId));
         }
     }
     return Object.values(voteHashMap);
 }
+/**
+ * Aggregates all event responses in an event message.
+ * @param msg the event creation message
+ * @param meId your jid
+ * @returns A list of response types & their responders
+ */
 export function getAggregateResponsesInEventMessage({ eventResponses }, meId) {
     const responseTypes = ['GOING', 'NOT_GOING', 'MAYBE'];
     const responseMap = {};
@@ -1676,13 +801,14 @@ export function getAggregateResponsesInEventMessage({ eventResponses }, meId) {
         };
     }
     for (const update of eventResponses || []) {
-        const responseType = update.response || update.eventResponse || update.eventResponseMessage?.response || 'UNKNOWN';
+        const responseType = update.eventResponse || 'UNKNOWN';
         if (responseType !== 'UNKNOWN' && responseMap[responseType]) {
-            responseMap[responseType].responders.push(getKeyAuthor((update.eventResponseMessageKey || update.eventCreationMessageKey), meId));
+            responseMap[responseType].responders.push(getKeyAuthor(update.eventResponseMessageKey, meId));
         }
     }
     return Object.values(responseMap);
 }
+/** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 export const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};
     for (const { remoteJid, id, participant, fromMe } of keys) {
@@ -1691,7 +817,7 @@ export const aggregateMessageKeysNotFromMe = (keys) => {
             if (!keyMap[uqKey]) {
                 keyMap[uqKey] = {
                     jid: remoteJid,
-                    participant: participant || undefined,
+                    participant: participant,
                     messageIds: []
                 };
             }
@@ -1701,12 +827,16 @@ export const aggregateMessageKeysNotFromMe = (keys) => {
     return Object.values(keyMap);
 };
 const REUPLOAD_REQUIRED_STATUS = [410, 404];
+/**
+ * Downloads the given message. Throws an error if it's not a media message
+ */
 export const downloadMediaMessage = async (message, type, options, ctx) => {
     const result = await downloadMsg().catch(async (error) => {
         if (ctx &&
-            typeof error?.status === 'number' &&
+            typeof error?.status === 'number' && // treat errors with status as HTTP failures requiring reupload
             REUPLOAD_REQUIRED_STATUS.includes(error.status)) {
             ctx.logger.info({ key: message.key }, 'sending reupload media request...');
+            // request reupload
             message = await ctx.reuploadRequest(message);
             const result = await downloadMsg();
             return result;
@@ -1747,28 +877,17 @@ export const downloadMediaMessage = async (message, type, options, ctx) => {
         return stream;
     }
 };
+/** Checks whether the given message is a media message; if it is returns the inner content */
 export const assertMediaContent = (content) => {
     content = extractMessageContent(content);
     const mediaContent = content?.documentMessage ||
         content?.imageMessage ||
         content?.videoMessage ||
         content?.audioMessage ||
-        content?.stickerMessage ||
-        content?.ptvMessage;
+        content?.stickerMessage;
     if (!mediaContent) {
         throw new Boom('given message is not a media message', { statusCode: 400, data: content });
     }
     return mediaContent;
 };
-export const shouldIncludeBizBinaryNode = (message) => {
-    const normalized = normalizeMessageContent(message);
-    const hasValidInteractive = normalized?.interactiveMessage &&
-        !normalized.interactiveMessage.carouselMessage &&
-        !normalized.interactiveMessage.collectionMessage &&
-        !normalized.interactiveMessage.shopStorefrontMessage;
-    return !!(normalized?.buttonsMessage ||
-        normalized?.interactiveMessage ||
-        normalized?.listMessage ||
-        hasValidInteractive);
-};
 //# sourceMappingURL=messages.js.map