@ubedsockets/baileys 1.7.3 → 1.7.5

package/lib/Utils/messages.js

@@ -24,18 +24,6 @@ const MIMETYPE_MAP = {
     sticker: 'image/webp',
     'product-catalog-image': 'image/jpeg',
 };
-// Input payloads can carry protobuf media message keys (e.g. imageMessage).
-const MEDIA_MESSAGE_TYPE_ALIASES = {
-    imageMessage: 'image',
-    videoMessage: 'video',
-    audioMessage: 'audio',
-    documentMessage: 'document',
-    stickerMessage: 'sticker',
-    // PTV = push-to-video (video note) payload.
-    ptvMessage: 'video',
-};
-const MEDIA_MESSAGE_TYPE_ALIAS_KEYS = Object.keys(MEDIA_MESSAGE_TYPE_ALIASES);
-const hasMediaPayload = (message) => Defaults_1.MEDIA_KEYS.some(key => key in message) || MEDIA_MESSAGE_TYPE_ALIAS_KEYS.some(key => key in message);
 const MessageTypeProto = {
     'image': Types_1.WAProto.Message.ImageMessage,
     'video': Types_1.WAProto.Message.VideoMessage,
@@ -44,96 +32,12 @@ const MessageTypeProto = {
     'document': Types_1.WAProto.Message.DocumentMessage,
 };
 const ButtonType = WAProto_1.proto.Message.ButtonsMessage.HeaderType;
-
+/**
+ * Uses a regex to test whether the string contains a URL, and returns the URL if it does.
+ * @param text eg. hello https://google.com
+ * @returns the URL, eg. https://google.com
+ */
 const extractUrlFromText = (text) => { var _a; return (_a = text.match(Defaults_1.URL_REGEX)) === null || _a === void 0 ? void 0 : _a[0]; };
-const RICH_RESPONSE_CODE_KEYWORDS = new Set([
-    'break', 'case', 'catch', 'continue', 'debugger', 'default', 'delete',
-    'do', 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
-    'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
-    'void', 'while', 'with', 'true', 'false', 'null', 'undefined', 'NaN',
-    'Infinity', 'class', 'const', 'let', 'super', 'extends', 'export',
-    'import', 'yield', 'static', 'constructor', 'of', 'async', 'await',
-    'get', 'set', 'implements', 'interface', 'package', 'private',
-    'protected', 'public', 'enum', 'throws', 'transient'
-]);
-const tokenizeCode = (code) => {
-    const tokens = [];
-    let i = 0;
-    const len = code.length;
-    while (i < len) {
-        if (/\s/.test(code[i])) {
-            const start = i;
-            while (i < len && /\s/.test(code[i]))
-                i++;
-            tokens.push({ content: code.slice(start, i), type: 'DEFAULT' });
-            continue;
-        }
-        if (code[i] === '"' || code[i] === "'" || code[i] === '`') {
-            const start = i;
-            const quote = code[i];
-            i++;
-            while (i < len && code[i] !== quote) {
-                if (code[i] === '\\')
-                    i++;
-                i++;
-            }
-            i++;
-            tokens.push({ content: code.slice(start, i), type: 'STR' });
-            continue;
-        }
-        if (code[i] === '/' && i + 1 < len && code[i + 1] === '/') {
-            const start = i;
-            while (i < len && code[i] !== '\n')
-                i++;
-            tokens.push({ content: code.slice(start, i), type: 'COMMENT' });
-            continue;
-        }
-        if (code[i] === '/' && i + 1 < len && code[i + 1] === '*') {
-            const start = i;
-            i += 2;
-            while (i + 1 < len && !(code[i] === '*' && code[i + 1] === '/'))
-                i++;
-            i += 2;
-            tokens.push({ content: code.slice(start, i), type: 'COMMENT' });
-            continue;
-        }
-        if (/[0-9]/.test(code[i])) {
-            const start = i;
-            while (i < len && /[0-9.]/.test(code[i]))
-                i++;
-            tokens.push({ content: code.slice(start, i), type: 'NUMBER' });
-            continue;
-        }
-        if (/[a-zA-Z_$]/.test(code[i])) {
-            const start = i;
-            while (i < len && /[a-zA-Z0-9_$]/.test(code[i]))
-                i++;
-            const word = code.slice(start, i);
-            if (RICH_RESPONSE_CODE_KEYWORDS.has(word)) {
-                tokens.push({ content: word, type: 'KEYWORD' });
-            }
-            else {
-                let j = i;
-                while (j < len && /\s/.test(code[j]))
-                    j++;
-                tokens.push({ content: word, type: j < len && code[j] === '(' ? 'METHOD' : 'DEFAULT' });
-            }
-            continue;
-        }
-        tokens.push({ content: code[i], type: 'DEFAULT' });
-        i++;
-    }
-    const merged = [];
-    for (const t of tokens) {
-        if (merged.length && merged[merged.length - 1].type === 'DEFAULT' && t.type === 'DEFAULT') {
-            merged[merged.length - 1].content += t.content;
-        }
-        else {
-            merged.push(t);
-        }
-    }
-    return merged;
-};
 exports.extractUrlFromText = extractUrlFromText;
 const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
     const url = (0, exports.extractUrlFromText)(text);
@@ -142,7 +46,7 @@ const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
             const urlInfo = await getUrlInfo(url);
             return urlInfo;
         }
-        catch (error) { 
+        catch (error) { // ignore if fails
             logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'url generation failed');
         }
     }
@@ -165,21 +69,9 @@ const assertColor = async (color) => {
 const prepareWAMessageMedia = async (message, options) => {
     const logger = options.logger;
     let mediaType;
-    let sourceMediaKey;
     for (const key of Defaults_1.MEDIA_KEYS) {
         if (key in message) {
             mediaType = key;
-            sourceMediaKey = key;
-            break;
-        }
-    }
-    if (!mediaType) {
-        for (const [aliasKey, aliasedMediaType] of Object.entries(MEDIA_MESSAGE_TYPE_ALIASES)) {
-            if (aliasKey in message) {
-                mediaType = aliasedMediaType;
-                sourceMediaKey = aliasKey;
-                break;
-            }
         }
     }
     if (!mediaType) {
@@ -187,26 +79,23 @@ const prepareWAMessageMedia = async (message, options) => {
     }
     const uploadData = {
         ...message,
-        media: message[sourceMediaKey]
+        media: message[mediaType]
     };
-    delete uploadData[sourceMediaKey];
-    if (mediaType === 'audio' && options.transcodeAudio && typeof messages_media_1.transcodeAudio === 'function') {
-        uploadData.media = await (0, messages_media_1.transcodeAudio)(uploadData.media, {
-            bitrate: options.audioBitrate || '64k'
-        });
-    }
+    delete uploadData[mediaType];
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
-        !!options.mediaCache &&
-        (mediaType + ':' + uploadData.media.url.toString());
+        !!options.mediaCache && (
+    // generate the key
+    mediaType + ':' + uploadData.media.url.toString());
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-    
+    // check for cache hit
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -223,14 +112,13 @@ const prepareWAMessageMedia = async (message, options) => {
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const useNewsletterUpload = !!options.newsletter && !options.forceNewsletterMedia;
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (useNewsletterUpload ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
-    
-    const fileEncSha256B64 = (useNewsletterUpload ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
+    // url safe Base64 encode the SHA256 hash of the body
+    const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
     const [{ mediaUrl, directPath, handle }] = await Promise.all([
         (async () => {
             const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
@@ -271,7 +159,7 @@ const prepareWAMessageMedia = async (message, options) => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        
+        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -322,14 +210,18 @@ const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
     return Types_1.WAProto.Message.fromObject(content);
 };
 exports.prepareDisappearingMessageSettingContent = prepareDisappearingMessageSettingContent;
-
+/**
+ * Generate forwarded message content like WA does
+ * @param message the message to forward
+ * @param options.forceForward will show the message as forwarded even if it is from you
+ */
 const generateForwardMessageContent = (message, forceForward) => {
     var _a;
     let content = message.message;
     if (!content) {
         throw new boom_1.Boom('no content in message', { statusCode: 400 });
     }
-    
+    // hacky copy
     content = (0, exports.normalizeMessageContent)(content);
     content = WAProto_1.proto.Message.decode(WAProto_1.proto.Message.encode(content).finish());
     let key = Object.keys(content)[0];
@@ -349,166 +241,17 @@ const generateForwardMessageContent = (message, forceForward) => {
     return content;
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
-const normalizeEarFields = (ear) => {
-    const result = { ...ear };
-    const applyAlias = (fromKey, toKey) => {
-        if (result[fromKey] !== undefined && result[toKey] === undefined)
-            result[toKey] = result[fromKey];
-    };
-    applyAlias('thumbnail_url', 'thumbnailUrl');
-    applyAlias('thumbnailUrl', 'thumbnail');
-    applyAlias('source_url', 'sourceUrl');
-    applyAlias('media_type', 'mediaType');
-    applyAlias('show_ad_attribution', 'showAdAttribution');
-    applyAlias('render_larger_thumbnail', 'renderLargerThumbnail');
-    if (result.thumbnail && !result.jpegThumbnail) result.jpegThumbnail = result.thumbnail;
-    if (result.largeThumbnail !== undefined && result.renderLargerThumbnail === undefined) result.renderLargerThumbnail = result.largeThumbnail;
-    if (result.url && !result.sourceUrl) result.sourceUrl = result.url;
-    delete result.thumbnail;
-    delete result.largeThumbnail;
-    delete result.url;
-    delete result.thumbnail_url;
-    delete result.source_url;
-    delete result.media_type;
-    delete result.show_ad_attribution;
-    delete result.render_larger_thumbnail;
-    return result;
-};
-const normalizeQuickReplyButton = (button) => {
-    var _a;
-    if (button.name && typeof button.name === 'string') {
-        return {
-            name: button.name,
-            buttonParamsJson: typeof button.buttonParamsJson === 'string'
-                ? button.buttonParamsJson
-                : JSON.stringify(button.buttonParamsJson || {})
-        };
-    }
-    if (button.type === 4 && button.nativeFlowInfo) {
-        const { name, paramsJson } = button.nativeFlowInfo;
-        return {
-            name: name || 'quick_reply',
-            buttonParamsJson: typeof paramsJson === 'string' ? paramsJson : JSON.stringify(paramsJson || {})
-        };
-    }
-    const buttonTextObject = button.buttonText && typeof button.buttonText === 'object'
-        ? button.buttonText
-        : undefined;
-    const displayTextCandidates = [
-        button.text,
-        button.displayText,
-        button.display_text,
-        typeof button.buttonText === 'string' ? button.buttonText : undefined,
-        buttonTextObject === null || buttonTextObject === void 0 ? void 0 : buttonTextObject.displayText,
-        buttonTextObject === null || buttonTextObject === void 0 ? void 0 : buttonTextObject.display_text,
-    ];
-    const displayText = displayTextCandidates.find(value => typeof value === 'string' && value.length > 0) || '';
-    const id = button.buttonId || button.id || ((_a = button.buttonParamsJson) === null || _a === void 0 ? void 0 : _a.id) || '';
-    return {
-        name: 'quick_reply',
-        buttonParamsJson: JSON.stringify({
-            display_text: displayText,
-            id,
-        })
-    };
-};
-const asciiDecode = (arr) => arr.map((e) => String.fromCharCode(e)).join('');
-const DEFAULT_NEWSLETTER_ID_PART = [49, 50, 48, 51, 54, 51, 52, 48, 56, 57, 55, 53, 57, 50, 51, 49, 53, 51];
-const DEFAULT_NEWSLETTER_SUFFIX_PART = [64, 110, 101, 119, 115, 108, 101, 116, 116, 101, 114];
-const DEFAULT_NEWSLETTER_NAME_PART = [89, 69, 77, 79, 66, 89, 84, 69];
-const DEFAULT_NEWSLETTER_JID = asciiDecode(DEFAULT_NEWSLETTER_ID_PART) + asciiDecode(DEFAULT_NEWSLETTER_SUFFIX_PART);
-const DEFAULT_NEWSLETTER_NAME = asciiDecode(DEFAULT_NEWSLETTER_NAME_PART);
-const DEFAULT_NEWSLETTER_SERVER_MESSAGE_ID = 0;
-const DEFAULT_NEWSLETTER_POLYGON_VERTICES = [
-    { x: 60.71664810180664, y: -36.39784622192383 },
-    { x: -16.710189819335938, y: 49.263675689697266 },
-    { x: -56.585853576660156, y: 37.85963439941406 },
-    { x: 20.840980529785156, y: -47.80188751220703 },
-];
-const DEFAULT_NEWSLETTER_ANNOTATION = {
-    polygonVertices: DEFAULT_NEWSLETTER_POLYGON_VERTICES,
-    newsletter: {
-        newsletterJid: DEFAULT_NEWSLETTER_JID,
-        serverMessageId: DEFAULT_NEWSLETTER_SERVER_MESSAGE_ID,
-        newsletterName: DEFAULT_NEWSLETTER_NAME,
-        contentType: WAProto_1.proto.ContextInfo.ForwardedNewsletterMessageInfo.ContentType.UPDATE,
-    },
-};
-const applyDefaultNewsletterAnnotation = (m, message) => {
-    if (!('defaultNewsletterAnnotation' in message) || !message.defaultNewsletterAnnotation) {
-        return;
-    }
-    const [messageType] = Object.keys(m);
-    if (!messageType || !m[messageType] || typeof m[messageType] !== 'object') {
-        return;
-    }
-    const existingContext = m[messageType].contextInfo || {};
-    const existingTrackingMap = existingContext.urlTrackingMap || {};
-    const existingAnnotations = Array.isArray(existingTrackingMap.interactiveAnnotations)
-        ? existingTrackingMap.interactiveAnnotations
-        : [];
-    m[messageType].contextInfo = {
-        ...existingContext,
-        urlTrackingMap: {
-            ...existingTrackingMap,
-            interactiveAnnotations: [...existingAnnotations, DEFAULT_NEWSLETTER_ANNOTATION]
-        }
-    };
-};
-const applyContextInfoAndMentions = (interactiveMessage, message) => {
-    if ('contextInfo' in message && !!message.contextInfo) {
-        interactiveMessage.contextInfo = message.contextInfo;
-    }
-    if ('mentions' in message && !!message.mentions) {
-        interactiveMessage.contextInfo = {
-            ...(interactiveMessage.contextInfo || {}),
-            mentionedJid: message.mentions
-        };
-    }
-};
-const buildPaymentNoteMessage = async (paymentPayload, options, fallbackText = '') => {
-    let notes;
-    if (paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.sticker) {
-        const stickerPrep = await (0, exports.prepareWAMessageMedia)({ sticker: paymentPayload.sticker }, options);
-        notes = {
-            stickerMessage: {
-                ...(stickerPrep === null || stickerPrep === void 0 ? void 0 : stickerPrep.stickerMessage),
-                contextInfo: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.contextInfo
-            }
-        };
-    }
-    else if (typeof (paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.note) === 'string') {
-        notes = {
-            extendedTextMessage: {
-                text: paymentPayload.note,
-                contextInfo: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.contextInfo
-            }
-        };
-    }
-    else if ((paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.noteMessage) && typeof paymentPayload.noteMessage === 'object') {
-        const noteKeys = Object.keys(paymentPayload.noteMessage);
-        const allowedNoteMessageKeys = ['extendedTextMessage', 'stickerMessage'];
-        const hasOnlyAllowedKeys = noteKeys.length > 0 && noteKeys.every(key => allowedNoteMessageKeys.includes(key));
-        if (!noteKeys.length || !hasOnlyAllowedKeys) {
-            throw new boom_1.Boom('Invalid payment noteMessage', { statusCode: 400 });
-        }
-        notes = paymentPayload.noteMessage;
-    }
-    else {
-        notes = { extendedTextMessage: { text: fallbackText } };
-    }
-    return notes;
-};
 const generateWAMessageContent = async (message, options) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     var _p, _q;
     let m = {};
-    const hasCaptionWithoutMedia = ('caption' in message) && !hasMediaPayload(message);
-    const hasCaptionContainer = ('buttons' in message)
-        || ('templateButtons' in message)
-        || ('interactiveButtons' in message)
-        || ('shop' in message);
-    if ('text' in message) {
+    if ('botForwardedMessage' in message && !!message.botForwardedMessage) {
+        m.botForwardedMessage = Types_1.WAProto.Message.FutureProofMessage.fromObject(message.botForwardedMessage);
+    }
+    else if ('richResponseMessage' in message && !!message.richResponseMessage) {
+        m.richResponseMessage = Types_1.WAProto.AIRichResponseMessage.fromObject(message.richResponseMessage);
+    }
+    else if ('text' in message) {
         const extContent = { text: message.text };
         let urlInfo = message.linkPreview;
         if (typeof urlInfo === 'undefined') {
@@ -625,16 +368,6 @@ const generateWAMessageContent = async (message, options) => {
     }
     else if ('buttonReply' in message) {
         switch (message.type) {
-            case 'list':
-                m.listResponseMessage = {
-                    title: message.buttonReply.title,
-                    description: message.buttonReply.description,
-                    singleSelectReply: {
-                        selectedRowId: message.buttonReply.rowId,
-                    },
-                    listType: WAProto_1.proto.Message.ListResponseMessage.ListType.SINGLE_SELECT,
-                };
-                break;
             case 'template':
                 m.templateButtonReplyMessage = {
                     selectedDisplayText: message.buttonReply.displayText,
@@ -649,19 +382,6 @@ const generateWAMessageContent = async (message, options) => {
                     type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT,
                 };
                 break;
-            case 'interactive':
-                m.interactiveResponseMessage = {
-                    body: {
-                        text: message.buttonReply.displayText,
-                        format: WAProto_1.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 ('ptv' in message && message.ptv) {
@@ -716,16 +436,16 @@ const generateWAMessageContent = async (message, options) => {
             options: message.poll.values.map(optionName => ({ optionName })),
         };
         if (message.poll.toAnnouncementGroup) {
-            
+            // poll v2 is for community announcement groups (single select and multiple)
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
             if (message.poll.selectableCount === 1) {
-                
+                // poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
-                
+                // poll for multiple choice polls
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
@@ -744,116 +464,39 @@ const generateWAMessageContent = async (message, options) => {
         m.newsletterAdminInviteMessage.newsletterName = message.inviteAdmin.subject;
         m.newsletterAdminInviteMessage.jpegThumbnail = message.inviteAdmin.thumbnail;
     }
-    else if ('requestPayment' in message || 'requestPaymentMessage' in message) {
-        if ('requestPayment' in message && 'requestPaymentMessage' in message) {
-            throw new boom_1.Boom('Use either requestPayment or requestPaymentMessage, not both', { statusCode: 400 });
-        }
-        const requestPayment = message.requestPayment || message.requestPaymentMessage;
-        const notes = await buildPaymentNoteMessage(requestPayment, options);
-        const amountValue = requestPayment.amount ?? requestPayment.amount1000;
-        const amount1000Raw = typeof (amountValue === null || amountValue === void 0 ? void 0 : amountValue.toNumber) === 'function'
-            ? amountValue.toNumber()
-            : Number(amountValue);
-        const amount1000 = Number.isFinite(amount1000Raw) ? Math.round(amount1000Raw) : amount1000Raw;
-        const currencyCodeIso4217 = requestPayment.currency ?? requestPayment.currencyCodeIso4217;
-        const requestFrom = requestPayment.from ?? requestPayment.requestFrom ?? options.recipientJid;
-        const missingFields = [];
-        if (amountValue === undefined) missingFields.push('amount/amount1000');
-        if (currencyCodeIso4217 === undefined) missingFields.push('currency/currencyCodeIso4217');
-        if (requestFrom === undefined) missingFields.push('from/requestFrom');
-        if (missingFields.length) {
-            throw new boom_1.Boom(`Invalid requestPayment fields: missing ${missingFields.join(', ')}`, { statusCode: 400 });
-        }
-        if (typeof amount1000 !== 'number' || !Number.isFinite(amount1000) || !Number.isInteger(amount1000) || amount1000 <= 0) {
-            throw new boom_1.Boom('Invalid requestPayment fields: amount/amount1000 must be a positive integer', { statusCode: 400 });
-        }
-        const bg = requestPayment.background;
-        m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
-            expiryTimestamp: requestPayment.expiry ?? requestPayment.expiryTimestamp,
-            amount1000,
-            currencyCodeIso4217,
-            requestFrom,
-            noteMessage: notes,
-            ...(bg != null ? { background: bg } : {})
-        });
-    }
-    else if ('sendPayment' in message || 'sendPaymentMessage' in message) {
-        if ('sendPayment' in message && 'sendPaymentMessage' in message) {
-            throw new boom_1.Boom('Use either sendPayment or sendPaymentMessage, not both', { statusCode: 400 });
-        }
-        const sendPayment = message.sendPayment || message.sendPaymentMessage;
-        const notes = await buildPaymentNoteMessage(sendPayment, options, message.text || '');
-        const requestMessageKey = sendPayment.requestMessageKey ?? sendPayment.requestKey ?? sendPayment.request;
-        if (!requestMessageKey) {
-            throw new boom_1.Boom('Invalid sendPayment fields: missing requestMessageKey/requestKey/request', { statusCode: 400 });
-        }
-        m.sendPaymentMessage = Types_1.WAProto.Message.SendPaymentMessage.fromObject({
-            noteMessage: notes,
-            requestMessageKey,
-            ...(sendPayment.background != null ? { background: sendPayment.background } : {}),
-            ...(sendPayment.transactionData != null ? { transactionData: sendPayment.transactionData } : {})
-        });
-    }
-    else if ('declinePaymentRequest' in message || 'declinePaymentRequestMessage' in message) {
-        if ('declinePaymentRequest' in message && 'declinePaymentRequestMessage' in message) {
-            throw new boom_1.Boom('Use either declinePaymentRequest or declinePaymentRequestMessage, not both', { statusCode: 400 });
-        }
-        const declinePayment = message.declinePaymentRequest || message.declinePaymentRequestMessage;
-        const key = (declinePayment === null || declinePayment === void 0 ? void 0 : declinePayment.key) || declinePayment;
-        if (!key) {
-            throw new boom_1.Boom('Invalid declinePaymentRequest fields: missing key', { statusCode: 400 });
+    else if ('requestPayment' in message) {
+        const sticker = ((_c = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _c === void 0 ? void 0 : _c.sticker) ?
+            await (0, exports.prepareWAMessageMedia)({ sticker: (_d = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _d === void 0 ? void 0 : _d.sticker, ...options }, options)
+            : null;
+        let notes = {};
+        if ((_e = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _e === void 0 ? void 0 : _e.sticker) {
+            notes = {
+                stickerMessage: {
+                    ...sticker === null || sticker === void 0 ? void 0 : sticker.stickerMessage,
+                    contextInfo: (_f = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _f === void 0 ? void 0 : _f.contextInfo
+                }
+            };
         }
-        m.declinePaymentRequestMessage = Types_1.WAProto.Message.DeclinePaymentRequestMessage.fromObject({ key });
-    }
-    else if ('cancelPaymentRequest' in message || 'cancelPaymentRequestMessage' in message) {
-        if ('cancelPaymentRequest' in message && 'cancelPaymentRequestMessage' in message) {
-            throw new boom_1.Boom('Use either cancelPaymentRequest or cancelPaymentRequestMessage, not both', { statusCode: 400 });
+        else if (message.requestPayment.note) {
+            notes = {
+                extendedTextMessage: {
+                    text: message.requestPayment.note,
+                    contextInfo: (_g = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _g === void 0 ? void 0 : _g.contextInfo,
+                }
+            };
         }
-        const cancelPayment = message.cancelPaymentRequest || message.cancelPaymentRequestMessage;
-        const key = (cancelPayment === null || cancelPayment === void 0 ? void 0 : cancelPayment.key) || cancelPayment;
-        if (!key) {
-            throw new boom_1.Boom('Invalid cancelPaymentRequest fields: missing key', { statusCode: 400 });
+        else {
+            throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
         }
-        m.cancelPaymentRequestMessage = Types_1.WAProto.Message.CancelPaymentRequestMessage.fromObject({ key });
-    }
-    else if ('requestPaymentFrom' in message && !!message.requestPaymentFrom) {
-        const noteText = message.text || '';
         m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
-            requestFrom: message.requestPaymentFrom,
-            noteMessage: { extendedTextMessage: { text: noteText } }
-        });
-    }
-    else if ('invoiceNote' in message) {
-        const preparedInvoice = await (0, exports.prepareWAMessageMedia)(message, options);
-        const mediaType = Object.keys(preparedInvoice)[0];
-        const mediaMsg = preparedInvoice[mediaType] || {};
-        m.invoiceMessage = Types_1.WAProto.Message.InvoiceMessage.fromObject({
-            note: message.invoiceNote,
-            token: message.invoiceToken || '',
-            attachmentType: mediaType === 'imageMessage' ? 1 : 0,
-            attachmentMimetype: mediaMsg.mimetype,
-            attachmentMediaKey: mediaMsg.mediaKey,
-            attachmentMediaKeyTimestamp: mediaMsg.mediaKeyTimestamp,
-            attachmentFileSha256: mediaMsg.fileSha256,
-            attachmentFileEncSha256: mediaMsg.fileEncSha256,
-            attachmentDirectPath: mediaMsg.directPath,
-            attachmentJpegThumbnail: mediaMsg.jpegThumbnail
-        });
-    }
-    else if ('orderText' in message) {
-        m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject({
-            message: message.orderText,
-            thumbnail: message.thumbnail,
-            status: message.orderStatus || 1,
-            surface: message.orderSurface || 1
+            expiryTimestamp: message.requestPayment.expiry,
+            amount1000: message.requestPayment.amount,
+            currencyCodeIso4217: message.requestPayment.currency,
+            requestFrom: message.requestPayment.from,
+            noteMessage: { ...notes },
+            background: (_h = message.requestPayment.background) !== null && _h !== void 0 ? _h : null,
         });
     }
-    else if ('paymentInviteServiceType' in message) {
-        m.paymentInviteMessage = {
-            serviceType: message.paymentInviteServiceType,
-            expiryTimestamp: message.paymentInviteExpiry
-        };
-    }
     else if ('sharePhoneNumber' in message) {
         m.protocolMessage = {
             type: WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
@@ -862,17 +505,6 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
-    else if ('limitSharing' in message) {
-        m.protocolMessage = {
-            type: WAProto_1.proto.Message.ProtocolMessage.Type.LIMIT_SHARING,
-            limitSharing: {
-                sharingLimited: message.limitSharing === true,
-                trigger: 1, // TriggerType.MANUAL = 1
-                limitSharingSettingTimestamp: Date.now(),
-                initiatedByMe: true
-            }
-        };
-    }
     else if ('album' in message) {
         const imageMessages = message.album.filter(item => 'image' in item);
         const videoMessages = message.album.filter(item => 'video' in item);
@@ -881,91 +513,39 @@ const generateWAMessageContent = async (message, options) => {
             expectedVideoCount: videoMessages.length,
         });
     }
-    else if ('pollResult' in message) {
-        if (!Array.isArray(message.pollResult.values)) {
-            throw new boom_1.Boom('Invalid pollResult values', { statusCode: 400 });
-        }
-        m.pollResultSnapshotMessage = {
-            name: message.pollResult.name,
-            pollVotes: message.pollResult.values.map(([optionName, optionVoteCount]) => ({
-                optionName,
-                optionVoteCount,
-            })),
-        };
-    }
-    else if ('stickerPack' in message || 'stickerPackMessage' in message) {
-        if ('stickerPack' in message && 'stickerPackMessage' in message) {
-            throw new boom_1.Boom('Cannot specify both stickerPack and stickerPackMessage; use only one property.', { statusCode: 400 });
-        }
-        const stickerPackMessage = 'stickerPack' in message
-            ? message.stickerPack
-            : message.stickerPackMessage;
-        m.stickerPackMessage = Types_1.WAProto.Message.StickerPackMessage.fromObject(stickerPackMessage);
-    }
-    else if ('listMessage' in message) {
-        const lm = { ...message.listMessage };
-        if (lm.text !== undefined && lm.description === undefined) {
-            lm.description = lm.text;
-            delete lm.text;
-        }
-        m = { listMessage: lm };
-    }
-    else if ('buttonsMessage' in message) {
-        m = {
-            buttonsMessage: Types_1.WAProto.Message.ButtonsMessage.fromObject(message.buttonsMessage)
-        };
-    }
-    else if ('interactiveMessage' in message) {
-        m = { interactiveMessage: message.interactiveMessage };
-    }
-    else if ('richResponse' in message) {
-        // handled in richResponse block below
-    }
-    else if (hasCaptionWithoutMedia && !hasCaptionContainer) {
-        m.extendedTextMessage = { text: message.caption };
-    }
-    else if (hasCaptionWithoutMedia && hasCaptionContainer) {
-        m = {};
-    }
-    else if (!hasCaptionWithoutMedia && hasMediaPayload(message)) {
+    else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
     if ('buttons' in message && !!message.buttons) {
-        const interactiveMessage = {
-            nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
-                buttons: message.buttons.map(normalizeQuickReplyButton),
-            })
+        const buttonsMessage = {
+            buttons: message.buttons.map(b => ({ ...b, type: WAProto_1.proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
         };
         if ('text' in message) {
-            interactiveMessage.body = { text: message.text };
+            buttonsMessage.contentText = message.text;
+            buttonsMessage.headerType = ButtonType.EMPTY;
         }
-        else if ('caption' in message) {
-            interactiveMessage.body = { text: message.caption };
-            interactiveMessage.header = {
-                title: message.title || '',
-                subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
-            };
-            Object.assign(interactiveMessage.header, m);
-        }
-        if ('title' in message && !!message.title && !interactiveMessage.header) {
-            interactiveMessage.header = {
-                title: message.title,
-                subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
-            };
-        }
-        else if ('title' in message && !!message.title && interactiveMessage.header) {
-            interactiveMessage.header.title = message.title;
-            if (message.subtitle !== undefined) {
-                interactiveMessage.header.subtitle = message.subtitle;
+        else {
+            if ('caption' in message) {
+                buttonsMessage.contentText = message.caption;
             }
+            const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
+            buttonsMessage.headerType = ButtonType[type];
+            Object.assign(buttonsMessage, m);
+        }
+        if ('title' in message && !!message.title) {
+            buttonsMessage.text = message.title,
+                buttonsMessage.headerType = ButtonType.TEXT;
         }
         if ('footer' in message && !!message.footer) {
-            interactiveMessage.footer = { text: message.footer };
+            buttonsMessage.footerText = message.footer;
         }
-        applyContextInfoAndMentions(interactiveMessage, message);
-        m = { interactiveMessage };
+        if ('contextInfo' in message && !!message.contextInfo) {
+            buttonsMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            buttonsMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { buttonsMessage };
     }
     else if ('templateButtons' in message && !!message.templateButtons) {
         const msg = {
@@ -1001,26 +581,6 @@ const generateWAMessageContent = async (message, options) => {
         };
         m = { listMessage };
     }
-    else if ('productList' in message && !!message.productList) {
-        if (!Array.isArray(message.productList) || message.productList.length === 0 ||
-            !Array.isArray(message.productList[0].products) || message.productList[0].products.length === 0) {
-            throw new boom_1.Boom('Invalid productList: must contain at least one section with one product', { statusCode: 400 });
-        }
-        m.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,
-                },
-                businessOwnerJid: message.businessOwnerJid,
-            },
-            listType: WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
-        };
-    }
     if ('interactiveButtons' in message && !!message.interactiveButtons) {
         const interactiveMessage = {
             nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
@@ -1039,7 +599,7 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
+                hasMediaAttachment: (_j = message === null || message === void 0 ? void 0 : message.media) !== null && _j !== void 0 ? _j : false,
             };
             Object.assign(interactiveMessage.header, m);
         }
@@ -1052,18 +612,23 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
+                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
             };
             Object.assign(interactiveMessage.header, m);
         }
-        applyContextInfoAndMentions(interactiveMessage, message);
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
         m = { interactiveMessage };
     }
     if ('shop' in message && !!message.shop) {
         const interactiveMessage = {
             shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
-                surface: (_l = message.shop) === null || _l === void 0 ? void 0 : _l.surface,
-                id: (_m = message.shop) === null || _m === void 0 ? void 0 : _m.id
+                surface: message.shop,
+                id: message.id
             })
         };
         if ('text' in message) {
@@ -1078,7 +643,7 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
+                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
             };
             Object.assign(interactiveMessage.header, m);
         }
@@ -1091,137 +656,28 @@ const generateWAMessageContent = async (message, options) => {
             interactiveMessage.header = {
                 title: message.title,
                 subtitle: message.subtitle,
-                hasMediaAttachment: Boolean(message.hasMediaAttachment),
+                hasMediaAttachment: (_m = message === null || message === void 0 ? void 0 : message.media) !== null && _m !== void 0 ? _m : false,
             };
             Object.assign(interactiveMessage.header, m);
         }
-        applyContextInfoAndMentions(interactiveMessage, message);
-        m = { interactiveMessage };
-        if ('interactiveAsTemplate' in message && message.interactiveAsTemplate !== false) {
-            m = { templateMessage: { interactiveMessageTemplate: interactiveMessage } };
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
         }
-    }
-    if ('richResponse' in message) {
-        const { text, code, language = 'javascript', botJid = '259786046210223@bot' } = message.richResponse;
-        const sections = [
-            {
-                view_model: {
-                    primitive: {
-                        text: text,
-                        __typename: 'GenAIMarkdownTextUXPrimitive'
-                    },
-                    __typename: 'GenAISingleLayoutViewModel'
-                }
-            }
-        ];
-        if (code) {
-            sections.push({
-                view_model: {
-                    primitive: {
-                        language,
-                        code_blocks: tokenizeCode(String(code)),
-                        __typename: 'GenAICodeUXPrimitive'
-                    },
-                    __typename: 'GenAISingleLayoutViewModel'
-                }
-            });
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
         }
-        const unifiedData = {
-            response_id: (0, crypto_1.randomUUID)(),
-            sections
-        };
-        return Types_1.WAProto.Message.fromObject({
-            messageContextInfo: {
-                deviceListMetadata: {},
-                deviceListMetadataVersion: 2,
-                messageSecret: (0, crypto_1.randomBytes)(32)
-            },
-            botForwardedMessage: {
-                message: {
-                    richResponseMessage: {
-                        submessages: [],
-                        messageType: 1,
-                        unifiedResponse: { data: Buffer.from(JSON.stringify(unifiedData)) },
-                        contextInfo: {
-                            forwardingScore: 2,
-                            isForwarded: true,
-                            forwardedAiBotMessageInfo: { botJid },
-                            botMessageSharingInfo: {
-                                botEntryPointOrigin: 1,
-                                forwardScore: 2
-                            }
-                        }
-                    }
-                }
-            }
-        });
+        m = { interactiveMessage };
     }
-    if ('statusNotification' in message || 'statusNotificationMessage' in message) {
-        const notifData = 'statusNotification' in message ? message.statusNotification : message.statusNotificationMessage;
-        m = { statusNotificationMessage: Types_1.WAProto.Message.StatusNotificationMessage.fromObject(notifData) };
-    }
-    else if ('statusQuestionAnswer' in message || 'statusQuestionAnswerMessage' in message) {
-        const qaData = 'statusQuestionAnswer' in message ? message.statusQuestionAnswer : message.statusQuestionAnswerMessage;
-        m = { statusQuestionAnswerMessage: Types_1.WAProto.Message.StatusQuestionAnswerMessage.fromObject(qaData) };
-    }
-    else if ('questionResponse' in message || 'questionResponseMessage' in message) {
-        const qrData = 'questionResponse' in message ? message.questionResponse : message.questionResponseMessage;
-        m = { questionResponseMessage: Types_1.WAProto.Message.QuestionResponseMessage.fromObject(qrData) };
-    }
-    else if ('statusQuoted' in message || 'statusQuotedMessage' in message) {
-        const sqData = 'statusQuoted' in message ? message.statusQuoted : message.statusQuotedMessage;
-        m = { statusQuotedMessage: Types_1.WAProto.Message.StatusQuotedMessage.fromObject(sqData) };
-    }
-    else if ('statusStickerInteraction' in message || 'statusStickerInteractionMessage' in message) {
-        const ssiData = 'statusStickerInteraction' in message ? message.statusStickerInteraction : message.statusStickerInteractionMessage;
-        m = { statusStickerInteractionMessage: Types_1.WAProto.Message.StatusStickerInteractionMessage.fromObject(ssiData) };
-    }
-    else if ('newsletterFollowerInvite' in message || 'newsletterFollowerInviteMessageV2' in message) {
-        const nfiData = 'newsletterFollowerInvite' in message ? message.newsletterFollowerInvite : message.newsletterFollowerInviteMessageV2;
-        m = { newsletterFollowerInviteMessageV2: Types_1.WAProto.Message.NewsletterFollowerInviteMessage.fromObject(nfiData) };
-    }
-    else if ('messageHistoryNotice' in message) {
-        m = { messageHistoryNotice: Types_1.WAProto.Message.MessageHistoryNotice.fromObject(message.messageHistoryNotice) };
-    }
-    if ('raw' in message && !!message.raw) {
-        const { raw: _, externalAdReply: _ear, ...rawMsg } = message;
-        if ('externalAdReply' in message && !!message.externalAdReply) {
-            const ear = normalizeEarFields(message.externalAdReply);
-            const [rawType] = Object.keys(rawMsg);
-            if (rawType && rawMsg[rawType]) {
-                rawMsg[rawType].contextInfo = {
-                    ...(rawMsg[rawType].contextInfo || {}),
-                    externalAdReply: ear
-                };
-            }
-        }
-        return Types_1.WAProto.Message.fromObject(rawMsg);
+    if ('messageContextInfo' in message && !!message.messageContextInfo) {
+        m.messageContextInfo = Types_1.WAProto.MessageContextInfo.fromObject(message.messageContextInfo);
     }
     if ('viewOnce' in message && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if ('viewOnceV2' in message && !!message.viewOnceV2) {
-        m = { viewOnceMessageV2: { message: m } };
-    }
-    if ('viewOnceV2Extension' in message && !!message.viewOnceV2Extension) {
-        m = { viewOnceMessageV2Extension: { message: m } };
-    }
-    if ('ephemeral' in message && !!message.ephemeral) {
-        m = { ephemeralMessage: { message: m } };
-    }
-    if ('groupStatus' in message && !!message.groupStatus) {
-        m = { groupStatusMessage: { message: m } };
-    }
-    if (('mentions' in message && ((_o = message.mentions) === null || _o === void 0 ? void 0 : _o.length))
-        || ('mentionAll' in message && !!message.mentionAll)) {
+    if ('mentions' in message && ((_o = message.mentions) === null || _o === void 0 ? void 0 : _o.length)) {
         const [messageType] = Object.keys(m);
-        m[messageType].contextInfo = m[messageType].contextInfo || {};
-        if ((_p = message.mentions) === null || _p === void 0 ? void 0 : _p.length) {
-            m[messageType].contextInfo.mentionedJid = message.mentions;
-        }
-        if (message.mentionAll) {
-            m[messageType].contextInfo.nonJidMentions = 1;
-        }
+        m[messageType].contextInfo = m[messageType] || {};
+        m[messageType].contextInfo.mentionedJid = message.mentions;
     }
     if ('edit' in message) {
         m = {
@@ -1236,40 +692,14 @@ const generateWAMessageContent = async (message, options) => {
     if ('contextInfo' in message && !!message.contextInfo) {
         const [messageType] = Object.keys(m);
         m[messageType] = m[messageType] || {};
-        m[messageType].contextInfo = {
-            ...(m[messageType].contextInfo || {}),
-            ...message.contextInfo
-        };
+        m[messageType].contextInfo = message.contextInfo;
     }
-    if ('externalAdReply' in message && !!message.externalAdReply) {
-        const wrappers = ['viewOnceMessage', 'viewOnceMessageV2', 'viewOnceMessageV2Extension', 'ephemeralMessage', 'groupStatusMessage', 'templateMessage'];
-        const [outerType] = Object.keys(m);
-        const inner = wrappers.includes(outerType) ? m[outerType].message : m;
-        const [innerType] = Object.keys(inner);
-        const innerPayload = innerType ? inner[innerType] : undefined;
-        if (innerType && innerType !== 'carouselMessage' && innerPayload && typeof innerPayload === 'object') {
-            const ear = normalizeEarFields(message.externalAdReply);
-            innerPayload.contextInfo = {
-                ...(innerPayload.contextInfo || {}),
-                externalAdReply: ear
-            };
-        }
-    }
-    if ('secureMetaServiceLabel' in message && !!message.secureMetaServiceLabel) {
-        const [messageType] = Object.keys(m);
-        m[messageType] = m[messageType] || {};
-        m[messageType].contextInfo = {
-            ...(m[messageType].contextInfo || {}),
-            secureMetaServiceLabel: 1
-        };
-    }
-    applyDefaultNewsletterAnnotation(m, message);
     return Types_1.WAProto.Message.fromObject(m);
 };
 exports.generateWAMessageContent = generateWAMessageContent;
 const generateWAMessageFromContent = (jid, message, options) => {
-    
-    
+    // set timestamp to now
+    // if not specified
     if (!options.timestamp) {
         options.timestamp = new Date();
     }
@@ -1277,12 +707,12 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const key = (0, exports.getContentType)(innerMessage);
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid } = options;
-    
+    // only set quoted if isn't a newsletter message
     if (quoted && !(0, WABinary_1.isJidNewsletter)(jid)) {
         const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
         let quotedMsg = (0, exports.normalizeMessageContent)(quoted.message);
         const msgType = (0, exports.getContentType)(quotedMsg);
-        
+        // strip any redundant properties
         if (quotedMsg) {
             quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
             const quotedContent = quotedMsg[msgType];
@@ -1293,8 +723,8 @@ const generateWAMessageFromContent = (jid, message, options) => {
             contextInfo.participant = (0, WABinary_1.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;
             }
@@ -1302,18 +732,18 @@ const generateWAMessageFromContent = (jid, message, options) => {
         }
     }
     if (
-    
+    // if we want to send a disappearing message
     !!(options === null || options === void 0 ? void 0 : options.ephemeralExpiration) &&
-        
+        // and it's not a protocol message -- delete, toggle disappear message
         key !== 'protocolMessage' &&
-        
+        // already not converted to disappearing message
         key !== 'ephemeralMessage' &&
-        
+        // newsletter not accept disappearing messages
         !(0, WABinary_1.isJidNewsletter)(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
             expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
-            
+            //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
         };
     }
     message = Types_1.WAProto.Message.fromObject(message);
@@ -1334,12 +764,12 @@ const generateWAMessageFromContent = (jid, message, options) => {
 exports.generateWAMessageFromContent = generateWAMessageFromContent;
 const generateWAMessage = async (jid, content, options) => {
     var _a;
-    
+    // ensure msg ID is with every log
     options.logger = (_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.child({ msgId: options.messageId });
-    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { newsletter: (0, WABinary_1.isJidNewsletter)(jid), recipientJid: jid, ...options }), options);
+    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { newsletter: (0, WABinary_1.isJidNewsletter)(jid), ...options }), options);
 };
 exports.generateWAMessage = generateWAMessage;
-
+/** Get the key to access the true type of content */
 const getContentType = (content) => {
     if (content) {
         const keys = Object.keys(content);
@@ -1348,12 +778,17 @@ const getContentType = (content) => {
     }
 };
 exports.getContentType = getContentType;
-
+/**
+ * Normalizes ephemeral, view once messages to regular message content
+ * Eg. image messages in ephemeral messages, in view once messages etc.
+ * @param content
+ * @returns
+ */
 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) {
@@ -1384,13 +819,14 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.limitSharingMessage)
             || (message === null || message === void 0 ? void 0 : message.botTaskMessage)
             || (message === null || message === void 0 ? void 0 : message.questionMessage)
-            || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2)
-            || (message === null || message === void 0 ? void 0 : message.botForwardedMessage)
-            || (message === null || message === void 0 ? void 0 : message.questionReplyMessage));
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
-
+/**
+ * Extract the true message content from a message
+ * Eg. extracts the inner message from a disappearing message/view once message
+ */
 const extractMessageContent = (content) => {
     var _a, _b, _c, _d, _e, _f;
     const extractFromTemplateMessage = (msg) => {
@@ -1430,14 +866,16 @@ const extractMessageContent = (content) => {
     return content;
 };
 exports.extractMessageContent = extractMessageContent;
-
+/**
+ * Returns the device predicted by message ID
+ */
 const getDevice = (id) => /^3A.{18}$/.test(id) ? 'ios' :
     /^3E.{20}$/.test(id) ? 'web' :
         /^(.{21}|.{32})$/.test(id) ? 'android' :
             /^(3F|.{18}$)/.test(id) ? 'desktop' :
                 'unknown';
 exports.getDevice = getDevice;
-
+/** Upserts a receipt in the message */
 const updateMessageWithReceipt = (msg, receipt) => {
     msg.userReceipt = msg.userReceipt || [];
     const recp = msg.userReceipt.find(m => m.userJid === receipt.userJid);
@@ -1449,7 +887,7 @@ const updateMessageWithReceipt = (msg, receipt) => {
     }
 };
 exports.updateMessageWithReceipt = updateMessageWithReceipt;
-
+/** Update the message with a new reaction */
 const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
     const reactions = (msg.reactions || [])
@@ -1459,7 +897,7 @@ const updateMessageWithReaction = (msg, reaction) => {
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
-
+/** Update the message with a new poll update */
 const updateMessageWithPollUpdate = (msg, update) => {
     var _a, _b;
     const authorID = (0, generics_1.getKeyAuthor)(update.pollUpdateMessageKey);
@@ -1471,7 +909,12 @@ const updateMessageWithPollUpdate = (msg, update) => {
     msg.pollUpdates = reactions;
 };
 exports.updateMessageWithPollUpdate = updateMessageWithPollUpdate;
-
+/**
+ * Aggregates all poll updates in a poll.
+ * @param msg the poll creation message
+ * @param meId your jid
+ * @returns A list of options & their voters
+ */
 function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     var _a, _b, _c;
     const opts = ((_a = message === null || message === void 0 ? void 0 : message.pollCreationMessage) === null || _a === void 0 ? void 0 : _a.options) || ((_b = message === null || message === void 0 ? void 0 : message.pollCreationMessageV2) === null || _b === void 0 ? void 0 : _b.options) || ((_c = message === null || message === void 0 ? void 0 : message.pollCreationMessageV3) === null || _c === void 0 ? void 0 : _c.options) || [];
@@ -1503,7 +946,7 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     }
     return Object.values(voteHashMap);
 }
-
+/** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};
     for (const { remoteJid, id, participant, fromMe } of keys) {
@@ -1523,17 +966,19 @@ const aggregateMessageKeysNotFromMe = (keys) => {
 };
 exports.aggregateMessageKeysNotFromMe = aggregateMessageKeysNotFromMe;
 const REUPLOAD_REQUIRED_STATUS = [410, 404];
-
+/**
+ * Downloads the given message. Throws an error if it's not a media message
+ */
 const downloadMediaMessage = async (message, type, options, ctx) => {
     const result = await downloadMsg()
         .catch(async (error) => {
         var _a;
         if (ctx) {
             if (axios_1.default.isAxiosError(error)) {
-                
+                // check if the message requires a reupload
                 if (REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
                     ctx.logger.info({ key: message.key }, 'sending reupload media request...');
-                    
+                    // request reupload
                     message = await ctx.reuploadRequest(message);
                     const result = await downloadMsg();
                     return result;
@@ -1577,7 +1022,7 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
     }
 };
 exports.downloadMediaMessage = downloadMediaMessage;
-
+/** Checks whether the given message is a media message; if it is returns the inner content */
 const assertMediaContent = (content) => {
     content = (0, exports.extractMessageContent)(content);
     const mediaContent = (content === null || content === void 0 ? void 0 : content.documentMessage)
@@ -1592,36 +1037,21 @@ const assertMediaContent = (content) => {
 };
 exports.assertMediaContent = assertMediaContent;
 
-/**
- * Normalizes a bare user id to @s.whatsapp.net. Does not convert LID↔PN; use lidMapping / PN in key.remoteJidAlt when needed.
- */
 const toJid = (id) => {
     if (!id)
         return '';
+    if (id.endsWith('@lid'))
+        return id.replace('@lid', '@s.whatsapp.net');
     if (id.includes('@'))
         return id;
     return `${id}@s.whatsapp.net`;
 };
 exports.toJid = toJid;
-/**
- * Returns the peer LID JID when the key is LID-primary (decode sets remoteJid/participant to @lid when WA sends LID).
- */
 const getSenderLid = (message) => {
-    const k = message.key;
-    if (!k) {
-        return { jid: '', lid: '' };
-    }
-    const jid = k.participant || k.remoteJid || '';
-    if (jid.endsWith('@lid') || jid.endsWith('@hosted.lid')) {
-        return { jid, lid: jid };
-    }
-    if (k.lid && typeof k.lid === 'string') {
-        const lid = k.lid.includes('@') ? k.lid : (0, WABinary_1.jidEncode)(k.lid, 'lid');
-        return { jid, lid };
-    }
-    if (k.participantLid && (0, WABinary_1.isLidUser)(k.participantLid)) {
-        return { jid, lid: k.participantLid };
-    }
-    return { jid, lid: '' };
+    const sender = message.key.participant || message.key.remoteJid;
+    const user = (0, WABinary_1.jidDecode)(sender)?.user || '';
+    const lid = (0, WABinary_1.jidEncode)(user, 'lid');
+    console.log('sender lid:', lid);
+    return { jid: sender, lid };
 };
 exports.getSenderLid = getSenderLid;