@crysnovax/baileys 2.5.0 → 2.5.2

package/lib/Utils/messages.js

@@ -2,7 +2,6 @@ import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
 import { zip } from 'fflate';
 import { promises as fs } from 'fs';
-import {} from 'stream';
 import { proto } from '../../WAProto/index.js';
 import { CALL_AUDIO_PREFIX, CALL_VIDEO_PREFIX, DONATE_URL, LIBRARY_NAME, MEDIA_KEYS, URL_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { AssociationType, ButtonHeaderType, ButtonType, CarouselCardType, ListType, ProtocolType, WAMessageStatus, WAProto } from '../Types/index.js';
@@ -12,6 +11,7 @@ import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './gener
 import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getImageProcessingLibrary, getRawMediaUploadData, getStream, toBuffer } from './messages-media.js';
 import { prepareRichResponseMessage } from './rich-message-utils.js';
 import { shouldIncludeReportingToken } from './reporting-utils.js';
+const CONCURRENCY_LIMIT = 15;
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
     video: 'video/mp4',
@@ -36,7 +36,7 @@ const mediaAnnotation = [
             { x: 20.840980529785156, y: -47.80188751220703 }
         ],
         newsletter: {
-            // Lia@Note 03-02-26 --- You can change jid, message id, and name via .env (⁠≧⁠▽⁠≦⁠)
+            // crysnovax@Note 03-02-26 --- You can change jid, message id, and name via .env (⁠≧⁠▽⁠≦⁠)
             newsletterJid: process.env.NEWSLETTER_ID ||
                 '120363402922206865@newsletter',
             serverMessageId: process.env.NEWSLETTER_MESSAGE_ID ||
@@ -106,9 +106,9 @@ export const prepareWAMessageMedia = async (message, options) => {
         'url' in uploadData.media &&
         !!uploadData.media.url &&
         !!options.mediaCache &&
-        mediaType + ':' + uploadData.media.url;
+        mediaType + ':' + uploadData.media.url.toString();
     if (mediaType === 'document' && !uploadData.fileName) {
-        uploadData.fileName = LIBRARY_NAME;
+        uploadData.fileName = 'file';
     }
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
@@ -123,13 +123,13 @@ export const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
-    const isNewsletter = isJidNewsletter(options.jid);
+    const isNewsletter = !!options.jid && isJidNewsletter(options.jid);
     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 || requiresWaveformProcessing;
-    // Lia@Changes 06-02-26 --- Add few support for sending media to newsletter (⁠≧⁠▽⁠≦⁠)
+    // crysnovax@Changes 06-02-26 --- Add few support for sending media to newsletter (⁠≧⁠▽⁠≦⁠)
     if (isNewsletter) {
         logger?.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
         const { filePath, fileSha256, fileLength } = await getRawMediaUploadData(uploadData.media, options.mediaTypeOverride || mediaType, logger);
@@ -285,36 +285,33 @@ export const prepareDisappearingMessageSettingContent = (ephemeralExpiration) =>
         ephemeralMessage: {
             message: {
                 protocolMessage: {
-                    type: ProtocolType.EPHEMERAL_SETTING,
+                    type: WAProto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
                     ephemeralExpiration
                 }
             }
         }
     };
-    return content;
+    return WAProto.Message.fromObject(content);
 };
-// Lia@Changes 31-01-26 --- Extract product message into a standalone function so it can also be reused as the header for interactive messages
+// crysnovax@Changes 31-01-26 --- Extract product message into a standalone function so it can also be reused as the header for interactive messages
 const prepareProductMessage = async (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);
-    // Lia@Changes 01-02-26 --- Add product message default value
-    const content = {
-        ...message,
-        product: {
-            currencyCode: 'IDR',
-            priceAmount1000: 1000,
-            title: LIBRARY_NAME,
-            ...message.product,
-            productImage: imageMessage
-        }
+    // crysnovax@Changes 01-02-26 --- Add product message default value
+    const { image, ...content } = message;
+    content.product = {
+        currencyCode: 'IDR',
+        priceAmount1000: 1000,
+        title: LIBRARY_NAME,
+        ...message.product,
+        productImage: imageMessage
     };
-    delete content.image;
     return content;
 };
 /**
- * Lia@Note 30-01-26
+ * crysnovax@Note 30-01-26
  * ---
  * Credits: Work on ensuring stickerPackMessage fields are valid by @jlucaso1 (https://github.com/jlucaso1).
  * based on https://github.com/WhiskeySockets/Baileys/pull/1561
@@ -330,7 +327,7 @@ const prepareStickerPackMessage = async (message, options) => {
     if (!cover) {
         throw new Boom('Sticker pack must contain a cover', { statusCode: 400 });
     }
-    // Lia@Changes 01-02-26 --- Add caching for sticker pack (similiar to prepareWAMessageMedia)
+    // crysnovax@Changes 01-02-26 --- Add caching for sticker pack (similiar to prepareWAMessageMedia)
     const cacheableKey = Array.isArray(stickers) &&
         stickers.length &&
         !!options.mediaCache &&
@@ -529,18 +526,18 @@ const prepareStickerPackMessage = async (message, options) => {
     }
     return WAProto.Message.StickerPackMessage.fromObject(content);
 };
-// Lia@Changes 30-01-26 --- Add native flow button helper for interactive message
+// crysnovax@Changes 30-01-26 --- Add native flow button helper for interactive message
 const prepareNativeFlowButtons = (message) => {
-    const buttons = message.nativeFlow
+    const buttons = message.nativeFlow;
     const isButtonsFieldArray = Array.isArray(buttons);
     const correctedField = isButtonsFieldArray ? buttons : buttons.buttons;
     const messageParamsJson = {};
-    // Lia@Changes 31-01-26 --- Add offer and options inside interactive message
+    // crysnovax@Changes 31-01-26 --- Add offer and options inside interactive message
     if (hasOptionalProperty(message, 'offerText') && !!message.offerText) {
         Object.assign(messageParamsJson, {
             limited_time_offer: {
                 text: message.offerText || LIBRARY_NAME,
-                url: message.offerUrl || DONATE_URL, // Lia@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
+                url: message.offerUrl || DONATE_URL, // crysnovax@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
                 copy_code: message.offerCode,
                 expiration_time: message.offerExpiration
             }
@@ -590,6 +587,7 @@ const prepareNativeFlowButtons = (message) => {
                         display_text: buttonText || '🌐 Visit',
                         url: button.url,
                         merchant_url: button.url,
+                        webview_interaction: button.useWebview,
                         icon: buttonIcon
                     })
                 };
@@ -604,7 +602,7 @@ const prepareNativeFlowButtons = (message) => {
                     })
                 };
             }
-            // Lia@Changes 12-03-26 --- Add "single_select" shortcut ＼⁠(⁠°⁠o⁠°⁠)⁠／
+            // crysnovax@Changes 12-03-26 --- Add "single_select" shortcut ＼⁠(⁠°⁠o⁠°⁠)⁠／
             else if (hasOptionalProperty(button, 'sections') && !!button.sections) {
                 return {
                     name: 'single_select',
@@ -627,7 +625,7 @@ const prepareNativeFlowButtons = (message) => {
  * @param options.forceForward will show the message as forwarded even if it is from you
  */
 export const generateForwardMessageContent = (message, forceForward) => {
-    let content = message.message || message;
+    let content = message.message;
     if (!content) {
         throw new Boom('no content in message', { statusCode: 400 });
     }
@@ -675,36 +673,35 @@ export const hasOptionalProperty = (obj, key) => {
         key in obj &&
         obj[key] != null;
 };
-// Lia@Changes 06-02-26 --- Validate album message media to avoid bug 👀
+// crysnovax@Changes 06-02-26 --- Validate album message media to avoid bug 👀
 export const hasValidAlbumMedia = (message) => {
-    return message.imageMessage ||
-        message.videoMessage;
+    return !!(message.imageMessage ||
+        message.videoMessage);
 };
 export const hasValidInteractiveHeader = (message) => {
-    return message.imageMessage ||
+    return !!(message.imageMessage ||
         message.videoMessage ||
         message.documentMessage ||
         message.productMessage ||
-        message.locationMessage;
+        message.locationMessage);
 };
-// Lia@Changes 30-01-26 --- Validate carousel cards header to avoid bug 👀
+// crysnovax@Changes 30-01-26 --- Validate carousel cards header to avoid bug 👀
 export const hasValidCarouselHeader = (message) => {
-    return message.imageMessage ||
+    return !!(message.imageMessage ||
         message.videoMessage ||
-        message.productMessage;
+        message.productMessage);
 };
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
     let m = {};
-    // Lia@Changes 30-01-26 --- Add "raw" boolean to send raw messages directly via generateWAMessage()
+    // crysnovax@Changes 30-01-26 --- Add "raw" boolean to send raw messages directly via generateWAMessage()
     if (hasNonNullishProperty(message, 'raw')) {
         delete message.raw;
         return message;
     }
-    // Lia@Changes 09-04-26 --- Add support for code block, latex, reels carousel, table with richResponseMessage
+    // crysnovax@Changes 09-04-26 --- Add support for code block and table with richResponseMessage
     else if (hasNonNullishProperty(message, 'code') ||
-        hasNonNullishProperty(message, 'expressions') ||
-        hasNonNullishProperty(message, 'items') ||
+        hasNonNullishProperty(message, 'links') ||
         hasNonNullishProperty(message, 'table') ||
         hasNonNullishProperty(message, 'richResponse')) {
         m = prepareRichResponseMessage(message);
@@ -720,7 +717,8 @@ export const generateWAMessageContent = async (message, options) => {
             extContent.jpegThumbnail = urlInfo.jpegThumbnail;
             extContent.description = urlInfo.description;
             extContent.title = urlInfo.title;
-            extContent.previewType = 0;
+            extContent.previewType = urlInfo.previewType ?? 0;
+            extContent.linkPreviewMetadata = urlInfo.linkPreviewMetadata;
             const img = urlInfo.highQualityThumbnail;
             if (img) {
                 extContent.thumbnailDirectPath = img.directPath;
@@ -732,6 +730,21 @@ export const generateWAMessageContent = async (message, options) => {
                 extContent.thumbnailEncSha256 = img.fileEncSha256;
             }
         }
+        const faviconData = message.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);
         }
@@ -746,25 +759,25 @@ export const generateWAMessageContent = async (message, options) => {
             throw new Boom('require atleast 1 contact', { statusCode: 400 });
         }
         if (contactLen === 1) {
-            m.contactMessage = message.contacts.contacts[0];
+            m.contactMessage = WAProto.Message.ContactMessage.create(message.contacts.contacts[0]);
         }
         else {
-            m.contactsArrayMessage = message.contacts;
+            m.contactsArrayMessage = WAProto.Message.ContactsArrayMessage.create(message.contacts);
         }
     }
     else if (hasNonNullishProperty(message, 'location')) {
-        m.locationMessage = message.location;
+        m.locationMessage = WAProto.Message.LocationMessage.create(message.location);
     }
     else if (hasNonNullishProperty(message, 'react')) {
         if (!message.react.senderTimestampMs) {
             message.react.senderTimestampMs = Date.now();
         }
-        m.reactionMessage = message.react;
+        m.reactionMessage = WAProto.Message.ReactionMessage.create(message.react);
     }
     else if (hasNonNullishProperty(message, 'delete')) {
         m.protocolMessage = {
             key: message.delete,
-            type: ProtocolType.REVOKE
+            type: WAProto.Message.ProtocolMessage.Type.REVOKE
         };
     }
     else if (hasNonNullishProperty(message, 'forward')) {
@@ -894,27 +907,26 @@ export const generateWAMessageContent = async (message, options) => {
                 statusCode: 400
             });
         }
-        m.messageContextInfo = {
-            // encKey
-            messageSecret: message.poll.messageSecret || randomBytes(32)
-        };
         const pollCreationMessage = {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
-            options: message.poll.values.map(optionName => ({ optionName }))
+            options: message.poll.values.map(optionName => ({ optionName })),
+            endTime: message.poll.endDate ? message.poll.endDate.getTime() : undefined,
+            hideParticipantName: message.poll.hideVoter ?? false,
+            allowAddOption: message.poll.canAddOption ?? false
         };
         if (message.poll.toAnnouncementGroup) {
             // poll v2 is for community announcement groups (single select and multiple)
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
-            // Lia@Changes 08-02-26 --- Add quiz message support
-            if (message.poll.pollType == 1) {
+            // crysnovax@Changes 08-02-26 --- Add quiz message support
+            if (message.poll.pollType === 1) {
                 if (!message.poll.correctAnswer) {
                     throw new Boom('No "correctAnswer" provided for quiz', { statusCode: 400 });
                 }
                 m.pollCreationMessageV5 = {
-                    // Lia@Note 08-02-26 --- quiz for newsletter only
+                    // crysnovax@Note 08-02-26 --- quiz for newsletter only
                     ...pollCreationMessage,
                     correctAnswer: {
                         optionName: message.poll.correctAnswer.toString()
@@ -932,8 +944,12 @@ export const generateWAMessageContent = async (message, options) => {
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
+        m.messageContextInfo = {
+            // encKey
+            messageSecret: message.poll.messageSecret || randomBytes(32)
+        };
     }
-    // Lia@Changes 08-02-26 --- Add poll result snapshot message
+    // crysnovax@Changes 08-02-26 --- Add poll result snapshot message
     else if (hasNonNullishProperty(message, 'pollResult')) {
         const pollResultSnapshotMessage = {
             name: message.pollResult.name,
@@ -942,7 +958,7 @@ export const generateWAMessageContent = async (message, options) => {
                 optionVoteCount: parseInt(vote.voteCount)
             }))
         };
-        if (message.pollResult.pollType == 1) {
+        if (message.pollResult.pollType === 1) {
             pollResultSnapshotMessage.pollType = proto.Message.PollType.QUIZ;
             m.pollResultSnapshotMessageV3 = pollResultSnapshotMessage;
         }
@@ -951,7 +967,7 @@ export const generateWAMessageContent = async (message, options) => {
             m.pollResultSnapshotMessage = pollResultSnapshotMessage;
         }
     }
-    // Lia@Changes 08-02-26 --- Add poll update message
+    // crysnovax@Changes 08-02-26 --- Add poll update message
     else if (hasNonNullishProperty(message, 'pollUpdate')) {
         if (!message.pollUpdate.key) {
             throw new Boom('Message key is required', { statusCode: 400 });
@@ -968,7 +984,7 @@ export const generateWAMessageContent = async (message, options) => {
     }
     else if (hasNonNullishProperty(message, 'sharePhoneNumber')) {
         m.protocolMessage = {
-            type: ProtocolType.SHARE_PHONE_NUMBER
+            type: proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
         };
     }
     else if (hasNonNullishProperty(message, 'requestPhoneNumber')) {
@@ -976,7 +992,7 @@ export const generateWAMessageContent = async (message, options) => {
     }
     else if (hasNonNullishProperty(message, 'limitSharing')) {
         m.protocolMessage = {
-            type: ProtocolType.LIMIT_SHARING,
+            type: proto.Message.ProtocolMessage.Type.LIMIT_SHARING,
             limitSharing: {
                 sharingLimited: message.limitSharing === true,
                 trigger: 1,
@@ -985,14 +1001,14 @@ export const generateWAMessageContent = async (message, options) => {
             }
         };
     }
-    // Lia@Changes 01-02-26 --- Add payment invite message
+    // crysnovax@Changes 01-02-26 --- Add payment invite message
     else if (hasNonNullishProperty(message, 'paymentInviteServiceType')) {
         m.paymentInviteMessage = {
             expiryTimestamp: Date.now(),
             serviceType: message.paymentInviteServiceType
         };
     }
-    // Lia@Changes 01-02-26 --- Add order message
+    // crysnovax@Changes 01-02-26 --- Add order message
     else if (hasNonNullishProperty(message, 'orderText')) {
         if (!Buffer.isBuffer(message.thumbnail)) {
             throw new Boom('Must provide thumbnail buffer in order message', { statusCode: 400 });
@@ -1011,19 +1027,21 @@ export const generateWAMessageContent = async (message, options) => {
         };
         delete m.orderMessage.orderText;
     }
-    // Lia@Changes 31-01-26 --- Add support for album messages
+    // crysnovax@Changes 31-01-26 --- Add support for album messages
     else if (hasNonNullishProperty(message, 'album')) {
         if (!Array.isArray(message.album)) {
             throw new Boom('Invalid album type. Expected an array.', { statusCode: 400 });
         }
         let videoCount = 0;
         for (let i = 0; i < message.album.length; i++) {
-            if (message.album[i].video) videoCount++;
-        };
+            if (message.album[i].video)
+                videoCount++;
+        }
         let imageCount = 0;
         for (let i = 0; i < message.album.length; i++) {
-            if (message.album[i].image) imageCount++;
-        };
+            if (message.album[i].image)
+                imageCount++;
+        }
         if ((videoCount + imageCount) < 2) {
             throw new Boom('Minimum provide 2 media to upload album message', { statusCode: 400 });
         }
@@ -1035,11 +1053,11 @@ export const generateWAMessageContent = async (message, options) => {
     else {
         m = await prepareWAMessageMedia(message, options);
     }
-    // Lia@Changes 30-01-26 --- Add interactive messages (buttonsMessage, listMessage, interactiveMessage, templateMessage, and carouselMessage)
+    // crysnovax@Changes 30-01-26 --- Add interactive messages (buttonsMessage, listMessage, interactiveMessage, templateMessage, and carouselMessage)
     if (hasNonNullishProperty(message, 'buttons')) {
         const buttonsMessage = {
             buttons: message.buttons.map(button => {
-                // Lia@Changes 12-03-26 --- Add "single_select" shortcut!
+                // crysnovax@Changes 12-03-26 --- Add "single_select" shortcut!
                 const buttonText = button.text || button.buttonText;
                 if (hasOptionalProperty(button, 'sections')) {
                     return {
@@ -1097,7 +1115,7 @@ export const generateWAMessageContent = async (message, options) => {
         };
         m = { listMessage };
     }
-    // Lia@Note 03-02-26 --- This message type is shown on WhatsApp Web/Desktop and iOS (I guess ｡⁠◕⁠‿⁠◕⁠｡). On Android, it only appears in newsletter (so far ಥ⁠‿⁠ಥ)
+    // crysnovax@Note 03-02-26 --- This message type is shown on WhatsApp Web/Desktop and iOS (I guess ｡⁠◕⁠‿⁠◕⁠｡). On Android, it only appears in newsletter (so far ಥ⁠‿⁠ಥ)
     else if (hasNonNullishProperty(message, 'templateButtons')) {
         const hydratedTemplate = {
             hydratedButtons: message.templateButtons.map((button, i) => {
@@ -1146,7 +1164,7 @@ export const generateWAMessageContent = async (message, options) => {
         if (hasOptionalProperty(message, 'footer')) {
             hydratedTemplate.hydratedFooterText = message.footer;
         }
-        hydratedTemplate.templateId = message.id || 'template-' + Date.now(); // Lia@Note 04-02-26 --- Minimal templateId to satisfy WhatsApp (⁠ ⁠ꈍ⁠ᴗ⁠ꈍ⁠)
+        hydratedTemplate.templateId = message.id || 'template-' + Date.now(); // crysnovax@Note 04-02-26 --- Minimal templateId to satisfy WhatsApp (⁠ ⁠ꈍ⁠ᴗ⁠ꈍ⁠)
         m = {
             templateMessage: {
                 hydratedFourRowTemplate: hydratedTemplate,
@@ -1218,9 +1236,9 @@ export const generateWAMessageContent = async (message, options) => {
                     else {
                         carouselHeader = await prepareWAMessageMedia(card, options).catch(() => ({ }));
                     }
-                    const isValidHeader = hasValidCarouselHeader(carouselHeader)
+                    const isValidHeader = hasValidCarouselHeader(carouselHeader);
                     if (!isValidHeader) {
-                       throw new Boom('Invalid media type for carousel card', { statusCode: 400 });
+                        throw new Boom('Invalid media type for carousel card', { statusCode: 400 });
                     }
                     const carouselCard = {
                         nativeFlowMessage: prepareNativeFlowButtons(card.nativeFlow ? card : [])
@@ -1243,11 +1261,11 @@ export const generateWAMessageContent = async (message, options) => {
                         Object.assign(carouselCard.header, carouselHeader);
                     }
                     if (hasOptionalProperty(card, 'audioFooter')) {
-                        const parseFooter = await prepareWAMessageMedia({
+                        const { audioMessage } = await prepareWAMessageMedia({
                             audio: card.audioFooter
                         }, options);
                         carouselCard.footer = {
-                            audioMessage: parseFooter.audioMessage,
+                            audioMessage,
                             hasMediaAttachment: true
                         };
                     }
@@ -1268,7 +1286,7 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m = { interactiveMessage };
     }
-    // Lia@Changes 01-02-26 --- Add request payment message
+    // crysnovax@Changes 01-02-26 --- Add request payment message
     else if (hasNonNullishProperty(message, 'requestPaymentFrom')) {
         const requestPaymentMessage = {
             amount: {
@@ -1292,7 +1310,7 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m = { requestPaymentMessage };
     }
-    // Lia@Changes 01-02-26 --- Add invoice message
+    // crysnovax@Changes 01-02-26 --- Add invoice message
     else if (hasNonNullishProperty(message, 'invoiceNote')) {
         const attachment = m.imageMessage || m.documentMessage;
         const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
@@ -1318,7 +1336,7 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m = { invoiceMessage };
     }
-    // Lia@Changes 31-01-26 --- Add direct externalAdReply access (no need to create contextInfo first)
+    // crysnovax@Changes 31-01-26 --- Add direct externalAdReply access (no need to create contextInfo first)
     if (hasOptionalProperty(message, 'externalAdReply') && !!message.externalAdReply) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
@@ -1327,7 +1345,7 @@ export const generateWAMessageContent = async (message, options) => {
             throw new Boom('Thumbnail must in buffer type', { statusCode: 400 });
         }
         if (!content.url || typeof content.url !== 'string') {
-            content.url = DONATE_URL; // Lia@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
+            content.url = DONATE_URL; // crysnovax@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
         }
         const externalAdReply = {
             ...content,
@@ -1335,9 +1353,9 @@ export const generateWAMessageContent = async (message, options) => {
             mediaType: content.mediaType || 1,
             mediaUrl: content.url,
             renderLargerThumbnail: content.largeThumbnail,
-            sourceUrl: content.url + '?update=' + Date.now(),
+            sourceUrl: content.url,
             thumbnail: content.thumbnail,
-            thumbnailUrl: content.url,
+            thumbnailUrl: content.url + '?update=' + Date.now(),
             title: content.title || LIBRARY_NAME
         };
         delete externalAdReply.subTitle;
@@ -1354,18 +1372,21 @@ export const generateWAMessageContent = async (message, options) => {
         (hasOptionalProperty(message, 'mentionAll') && message.mentionAll)) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
-        if ('contextInfo' in key && !!key.contextInfo) {
-            key.contextInfo.mentionedJid = message.mentions || [];
+        if (key && 'contextInfo' in key) {
+            key.contextInfo = key.contextInfo || {};
+            if (message.mentions?.length) {
+                key.contextInfo.mentionedJid = message.mentions;
+            }
+            if (message.mentionAll) {
+                key.contextInfo.nonJidMentions = 1;
+            }
         }
         else if (key) {
             key.contextInfo = {
-                mentionedJid: message.mentions || []
+                mentionedJid: message.mentions,
+                nonJidMentions: message.mentionAll ? 1 : 0
             };
         }
-        if (message.mentionAll) {
-            key.contextInfo.mentionedJid = [];
-            key.contextInfo.nonJidMentions = 1;
-        }
     }
     if (hasOptionalProperty(message, 'contextInfo') && !!message.contextInfo) {
         const messageType = Object.keys(m)[0];
@@ -1377,7 +1398,7 @@ export const generateWAMessageContent = async (message, options) => {
             key.contextInfo = message.contextInfo;
         }
     }
-    // Lia@Changes 31-01-26 --- Add "groupStatus" boolean to set contextInfo.isGroupStatus and wrap message into groupStatusMessageV2
+    // crysnovax@Changes 31-01-26 --- Add "groupStatus" boolean to set contextInfo.isGroupStatus and wrap message into groupStatusMessageV2
     if (hasOptionalProperty(message, 'groupStatus') && !!message.groupStatus) {
         const messageType = Object.keys(m)[0];
         const key = m[messageType];
@@ -1392,20 +1413,35 @@ export const generateWAMessageContent = async (message, options) => {
         m = { groupStatusMessageV2: { message: m } };
         delete message.groupStatus;
     }
-    // Lia@Changes 02-02-26 --- Add "interactiveAsTemplate" boolean to wrap interactiveMessage into templateMessage
+    // crysnovax@Changes 06-05-26 --- Add "spoiler" boolean to set contextInfo.isSpoiler and wrap message into spoilerMessage
+    if (hasOptionalProperty(message, 'spoiler') && !!message.spoiler) {
+        const messageType = Object.keys(m)[0];
+        const key = m[messageType];
+        if ('contextInfo' in key && !!key.contextInfo) {
+            key.contextInfo.isSpoiler = message.spoiler;
+        }
+        else if (key) {
+            key.contextInfo = {
+                isSpoiler: message.spoiler
+            };
+        }
+        m = { spoilerMessage: { message: m } };
+        delete message.spoiler;
+    }
+    // crysnovax@Changes 02-02-26 --- Add "interactiveAsTemplate" boolean to wrap interactiveMessage into templateMessage
     else if (hasOptionalProperty(message, 'interactiveAsTemplate') && !!message.interactiveAsTemplate) {
         if (!m.interactiveMessage) {
-            throw new Boom('Invalid message type for template', { statusCode: 400 }); // Lia@Note 02-02-26 --- To avoid bug 👀
+            throw new Boom('Invalid message type for template', { statusCode: 400 }); // crysnovax@Note 02-02-26 --- To avoid bug 👀
         }
         m = {
             templateMessage: {
                 interactiveMessageTemplate: m.interactiveMessage,
-                templateId: message.id || 'template-' + Date.now() // Lia@Note 04-02-26 --- Minimal templateId to satisfy WhatsApp (⁠ ⁠ꈍ⁠ᴗ⁠ꈍ⁠)
+                templateId: message.id || 'template-' + Date.now() // crysnovax@Note 04-02-26 --- Minimal templateId to satisfy WhatsApp (⁠ ⁠ꈍ⁠ᴗ⁠ꈍ⁠)
             }
         };
         delete message.interactiveAsTemplate;
     }
-    // Lia@Changes 30-01-26 --- Add "ephemeral" boolean to wrap message into ephemeralMessage like "viewOnce"
+    // crysnovax@Changes 30-01-26 --- Add "ephemeral" boolean to wrap message into ephemeralMessage like "viewOnce"
     if (hasOptionalProperty(message, 'ephemeral') && !!message.ephemeral) {
         m = { ephemeralMessage: { message: m } };
         delete message.ephemeral;
@@ -1413,12 +1449,12 @@ export const generateWAMessageContent = async (message, options) => {
     else if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    // Lia@Changes 03-02-26 --- Add "viewOnceV2" boolean to wrap message into viewOnceMessageV2 like "viewOnce"
+    // crysnovax@Changes 03-02-26 --- Add "viewOnceV2" boolean to wrap message into viewOnceMessageV2 like "viewOnce"
     else if (hasOptionalProperty(message, 'viewOnceV2') && !!message.viewOnceV2) {
         m = { viewOnceMessageV2: { message: m } };
         delete message.viewOnceV2;
     }
-    // Lia@Changes 03-02-26 --- Add "viewOnceV2Extension" boolean to wrap message into viewOnceMessageV2Extension like "viewOnce"
+    // crysnovax@Changes 03-02-26 --- Add "viewOnceV2Extension" boolean to wrap message into viewOnceMessageV2Extension like "viewOnce"
     else if (hasOptionalProperty(message, 'viewOnceV2Extension') && !!message.viewOnceV2Extension) {
         m = { viewOnceMessageV2Extension: { message: m } };
         delete message.viewOnceV2Extension;
@@ -1429,7 +1465,7 @@ export const generateWAMessageContent = async (message, options) => {
                 key: message.edit,
                 editedMessage: m,
                 timestampMs: Date.now(),
-                type: ProtocolType.MESSAGE_EDIT
+                type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT
             }
         }
     }
@@ -1439,13 +1475,13 @@ export const generateWAMessageContent = async (message, options) => {
             m.messageContextInfo.messageSecret = randomBytes(32);
         }
     }
-    return proto.Message.create(m);
+    return WAProto.Message.create(m);
 };
 export const generateWAMessageFromContent = (jid, message, options) => {
     // set timestamp to now
     // if not specified
     if (!options.timestamp) {
-        options.timestamp = Date.now();
+        options.timestamp = new Date();
     }
     const messageContextInfo = message.messageContextInfo
     const innerMessage = normalizeMessageContent(message);
@@ -1495,7 +1531,7 @@ export const generateWAMessageFromContent = (jid, message, options) => {
             //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
         };
     }
-    // Lia@Changes 30-01-26 --- Add deviceListMetadata inside messageContextInfo for private chat
+    // crysnovax@Changes 30-01-26 --- Add deviceListMetadata inside messageContextInfo for private chat
     if (messageContextInfo?.messageSecret && (isPnUser(jid) || isLidUser(jid))) {
         messageContextInfo.deviceListMetadata = {
             recipientKeyHash: randomBytes(10),
@@ -1503,7 +1539,7 @@ export const generateWAMessageFromContent = (jid, message, options) => {
         };
         messageContextInfo.deviceListMetadataVersion = 2
     }
-    message = proto.Message.create(message);
+    message = WAProto.Message.create(message);
     const messageJSON = {
         key: {
             remoteJid: jid,
@@ -1518,11 +1554,11 @@ export const generateWAMessageFromContent = (jid, message, options) => {
     };
     return WAProto.WebMessageInfo.fromObject(messageJSON);
 };
-export const generateWAMessage = async (jid, content, options = {}) => {
+export const generateWAMessage = async (jid, content, options) => {
     // ensure msg ID is with every log
     options.logger = options?.logger?.child({ msgId: options.messageId });
     // Pass jid in the options to generateWAMessageContent
-    if (jid && typeof options === 'object') {
+    if (jid) {
         options.jid = jid;
     }
     return generateWAMessageFromContent(jid, await generateWAMessageContent(content, options), options);
@@ -1554,7 +1590,7 @@ export const normalizeMessageContent = (content) => {
         content = inner.message;
     }
     return content;
-    // Lia@Changes 03-02-26 --- Add all futureProofMessage into getFutureProofMessage()
+    // crysnovax@Changes 03-02-26 --- Add all futureProofMessage into getFutureProofMessage()
     function getFutureProofMessage(message) {
         return (
             message?.associatedChildMessage ||
@@ -1571,10 +1607,14 @@ export const normalizeMessageContent = (content) => {
             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 ||
@@ -1872,20 +1912,14 @@ const isWebPBuffer = (buffer) => {
     );
 };
 /**
- * Lia@Changes 30-01-26
+ * crysnovax@Changes 30-01-26
  * ---
  * Determines whether a message should include a Biz Binary Node.
  * A Biz Binary Node is added only for interactive messages
  * such as buttons or other supported interactive types.
  */
-export const shouldIncludeBizBinaryNode = (message) => {
-    const hasValidInteractive =
-        message.interactiveMessage &&
-        !message.interactiveMessage.carouselMessage &&
-        !message.interactiveMessage.collectionMessage &&
-        !message.interactiveMessage.shopStorefrontMessage;
-    return (message.buttonsMessage ||
-        message.interactiveMessage ||
-        message.listMessage ||
-        hasValidInteractive);
-};
+export const shouldIncludeBizBinaryNode = (message) => !!(message.buttonsMessage ||
+    message.listMessage ||
+    message.templateMessage ||
+    (message.interactiveMessage &&
+        message.interactiveMessage.nativeFlowMessage));