cuki-bailx 1.2.4 → 1.2.6

package/lib/Utils/messages.js

@@ -1,13 +1,19 @@
-"use strict"; 
+// BAILEYS BY VYZEN, MAU APA LU!? 
+
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.getAggregateVotesInPollMessage = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
+exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
+exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
+const child_process_1 = require("child_process");
+const os_1 = require("os");
+const path_1 = require("path");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
@@ -45,7 +51,7 @@ const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
             const urlInfo = await getUrlInfo(url);
             return urlInfo;
         }
-        catch (error) { // ignore if fails
+        catch (error) { 
             logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'url generation failed');
         }
     }
@@ -78,47 +84,15 @@ const prepareWAMessageMedia = async (message, options) => {
     }
     const uploadData = {
         ...message,
-        ...(message.annotations ? {
-            annotations: message.annotations
-        } : {
-            annotations: [
-                {
-                    polygonVertices: [
-                        {
-                            x: 60.71664810180664,
-                            y: -36.39784622192383
-                        },
-                        {
-                            x: -16.710189819335938,
-                            y: 49.263675689697266
-                        },
-                        {
-                            x: -56.585853576660156,
-                            y: 37.85963439941406
-                        },
-                        {
-                            x: 20.840980529785156,
-                            y: -47.80188751220703
-                        }
-                    ],
-                    newsletter: {
-                        newsletterJid: "120363297591152843@newsletter",
-                        serverMessageId: 0,
-                        newsletterName: "-",
-                        contentType: "UPDATE",
-                    }
-                }
-            ]
-        }),
         media: message[mediaType]
     };
     delete uploadData[mediaType];
-    // check if cacheable + generate cache key
+
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
-    // generate the key
+
     mediaType + ':' + uploadData.media.url.toString());
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
@@ -126,7 +100,7 @@ const prepareWAMessageMedia = async (message, options) => {
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-    // check for cache hit
+
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -142,13 +116,94 @@ const prepareWAMessageMedia = async (message, options) => {
         (typeof uploadData['jpegThumbnail'] === 'undefined');
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
+    
+    
+    if (requiresWaveformProcessing) {
+        let tmpInput;
+        let tmpOutput;
+        try {
+            let bufferToConvert = null;
+            let isMediaUrl = false;
+            
+            
+            if (Buffer.isBuffer(uploadData.media)) {
+                bufferToConvert = uploadData.media;
+            } else if (typeof uploadData.media === 'string') {
+                if (fs_1.existsSync(uploadData.media)) {
+                    bufferToConvert = fs_1.readFileSync(uploadData.media);
+                } else if (uploadData.media.startsWith('http')) {
+                    isMediaUrl = true;
+                }
+            } else if (typeof uploadData.media === 'object' && 'url' in uploadData.media && uploadData.media.url.startsWith('http')) {
+                 isMediaUrl = true;
+            }
+
+            
+            if (isMediaUrl) {
+                const mediaUrl = typeof uploadData.media === 'string' ? uploadData.media : uploadData.media.url;
+                const resp = await axios_1.default.get(mediaUrl, { 
+                    responseType: 'arraybuffer',
+                    
+                    headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36' } 
+                });
+                if (resp.status === 200 && resp.data.length > 100) {
+                     bufferToConvert = resp.data;
+                } else {
+                     throw new boom_1.Boom(`Gagal mengunduh audio dari URL: Status ${resp.status} atau file terlalu kecil.`, { statusCode: 400 });
+                }
+            }
+            
+            if (bufferToConvert) {
+                 tmpInput = path_1.join(os_1.tmpdir(), `vyzen-raw-${(0, crypto_1.randomBytes)(4).toString('hex')}.tmp`);
+                 tmpOutput = path_1.join(os_1.tmpdir(), `vyzen-fixed-${(0, crypto_1.randomBytes)(4).toString('hex')}.opus`);
+                 
+                 fs_1.writeFileSync(tmpInput, bufferToConvert);
+
+                 await new Promise((resolve, reject) => {
+                     
+                     const cmd = `ffmpeg -y -i "${tmpInput}" -vn -c:a libopus -b:a 128k -ac 1 -ar 48000 -f opus -map_metadata -1 "${tmpOutput}"`;
+                     (0, child_process_1.exec)(cmd, (error, stdout, stderr) => {
+                         if (error) {
+                             logger === null || logger === void 0 ? void 0 : logger.error(`FFMPEG PTT Fix Error: ${error.message} \n ${stderr}`);
+                             reject(new Error(`FFmpeg failed: ${stderr.trim()}`)); 
+                         }
+                         else {
+                             resolve();
+                         }
+                     });
+                 });
+
+                 if (fs_1.existsSync(tmpOutput) && fs_1.statSync(tmpOutput).size > 1000) { 
+                     const fixedBuffer = fs_1.readFileSync(tmpOutput);
+                     
+                     uploadData.media = fixedBuffer; 
+                     uploadData.mimetype = 'audio/ogg; codecs=opus'; 
+                     logger === null || logger === void 0 ? void 0 : logger.debug('Vyzen Auto-Fix: Audio converted to Whatsapp PTT standard successfully');
+                 } else {
+                    logger === null || logger === void 0 ? void 0 : logger.warn('Vyzen Auto-Fix: File hasil konversi terlalu kecil atau gagal dibuat, menggunakan media asli.');
+                 }
+            }
+        } catch (err) {
+            logger === null || logger === void 0 ? void 0 : logger.warn({ err }, 'Vyzen Auto-Fix: Gagal memproses PTT, fallback ke data media asli.');
+        } finally {
+            
+            if (tmpInput && fs_1.existsSync(tmpInput)) {
+                fs_1.unlinkSync(tmpInput);
+            }
+            if (tmpOutput && fs_1.existsSync(tmpOutput)) {
+                fs_1.unlinkSync(tmpOutput);
+            }
+        }
+    }
+
+
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
     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
     });
-    // 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 () => {
@@ -172,14 +227,86 @@ const prepareWAMessageMedia = async (message, options) => {
                     uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
+                
+                
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
-                    logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
-                }
-                if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
-                    logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
+                    let audioBuffer = null;
+                    if (Buffer.isBuffer(uploadData.media)) {
+                        audioBuffer = uploadData.media;
+                    } else if (typeof uploadData.media === 'string') {
+                        try {
+                            audioBuffer = fs_1.readFileSync(uploadData.media);
+                        } catch (e) {}
+                    } else if (bodyPath) {
+                        try {
+                            audioBuffer = fs_1.readFileSync(bodyPath);
+                        } catch (e) {}
+                    }
+
+                    if (audioBuffer) {
+                        try {
+                            
+                            const tmpPath = path_1.join(os_1.tmpdir(), `wa-wave-${(0, crypto_1.randomBytes)(4).toString('hex')}.tmp`);
+                            fs_1.writeFileSync(tmpPath, audioBuffer);
+
+                            
+                            const getPcm = () => new Promise((resolve, reject) => {
+                                
+                                const cmd = `ffmpeg -i "${tmpPath}" -f s16le -ac 1 -ar 8000 pipe:1`;
+                                (0, child_process_1.exec)(cmd, { encoding: 'buffer', maxBuffer: 20 * 1024 * 1024 }, (error, stdout) => {
+                                    if (error) reject(error);
+                                    else resolve(stdout);
+                                });
+                            });
+
+                            const rawPcm = await getPcm();
+                            try { fs_1.unlinkSync(tmpPath); } catch(e){} 
+
+                            
+                            const samples = new Int16Array(rawPcm.buffer, rawPcm.byteOffset, rawPcm.byteLength / 2);
+                            const waveformLength = 64;
+                            const newData = new Uint8Array(waveformLength);
+                            const step = Math.floor(samples.length / waveformLength);
+
+                            for (let i = 0; i < waveformLength; i++) {
+                                let maxVal = 0;
+                                const start = i * step;
+                                const end = start + step;
+                                
+                                
+                                for (let j = start; j < end; j++) {
+                                    const val = Math.abs(samples[j]);
+                                    if (val > maxVal) maxVal = val;
+                                }
+
+                                
+                                let ratio = maxVal / 32767;
+
+     
+                                ratio = Math.pow(ratio, 0.75);
+
+                                
+                                let val = Math.floor(ratio * 100);
+                                if (val > 100) val = 100;
+                                newData[i] = val;
+                            }
+                            
+                            uploadData.waveform = newData;
+                            logger === null || logger === void 0 ? void 0 : logger.debug('processed realistic audio waveform via ffmpeg');
+
+                        } catch (err) {
+                           
+                            logger === null || logger === void 0 ? void 0 : logger.warn({ err }, 'failed to generate realistic waveform, falling back to random');
+                            const hash = (0, crypto_1.createHash)('sha256').update(audioBuffer).digest();
+                            uploadData.waveform = new Uint8Array(64);
+                            for (let i = 0; i < 64; i++) {
+                                uploadData.waveform[i] = Math.floor((hash[i % hash.length] / 255) * 60); 
+                            }
+                        }
+                    }
                 }
+                
+
                 if (requiresAudioBackground) {
                     uploadData.backgroundArgb = await assertColor(options.backgroundColor);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed backgroundColor audio status');
@@ -194,10 +321,16 @@ const prepareWAMessageMedia = async (message, options) => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        // remove tmp files
+        
         if (didSaveToTmpPath && bodyPath) {
-            await fs_1.promises.unlink(bodyPath);
-            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+            try {
+                await fs_1.promises.access(bodyPath);
+                await fs_1.promises.unlink(bodyPath);
+                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
+            }
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
         }
     });
     const obj = Types_1.WAProto.Message.fromObject({
@@ -250,7 +383,7 @@ const generateForwardMessageContent = (message, forceForward) => {
     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];
@@ -271,8 +404,8 @@ const generateForwardMessageContent = (message, forceForward) => {
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
-    var _a;
-    var _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _p, _q;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -281,7 +414,6 @@ const generateWAMessageContent = async (message, options) => {
             urlInfo = await (0, exports.generateLinkPreviewIfRequired)(message.text, options.getUrlInfo, options.logger);
         }
         if (urlInfo) {
-            extContent.canonicalUrl = urlInfo['canonical-url'];
             extContent.matchedText = urlInfo['matched-text'];
             extContent.jpegThumbnail = urlInfo.jpegThumbnail;
             extContent.description = urlInfo.description;
@@ -342,6 +474,54 @@ const generateWAMessageContent = async (message, options) => {
             message.disappearingMessagesInChat;
         m = (0, exports.prepareDisappearingMessageSettingContent)(exp);
     }
+    else if ('groupInvite' in message) {
+        m.groupInviteMessage = {};
+        m.groupInviteMessage.inviteCode = message.groupInvite.inviteCode;
+        m.groupInviteMessage.inviteExpiration = message.groupInvite.inviteExpiration;
+        m.groupInviteMessage.caption = message.groupInvite.text;
+        m.groupInviteMessage.groupJid = message.groupInvite.jid;
+        m.groupInviteMessage.groupName = message.groupInvite.subject;
+        
+        
+        if (options.getProfilePicUrl) {
+            const pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid, 'preview');
+            if (pfpUrl) {
+                const resp = await axios_1.default.get(pfpUrl, { responseType: 'arraybuffer' });
+                if (resp.status === 200) {
+                    m.groupInviteMessage.jpegThumbnail = resp.data;
+                }
+            }
+        }
+    }
+    else if ('pin' in message) {
+        m.pinInChatMessage = {};
+        m.messageContextInfo = {};
+        m.pinInChatMessage.key = message.pin;
+        m.pinInChatMessage.type = message.type;
+        m.pinInChatMessage.senderTimestampMs = Date.now();
+        m.messageContextInfo.messageAddOnDurationInSecs = message.type === 1 ? message.time || 86400 : 0;
+    }
+    else if ('keep' in message) {
+        m.keepInChatMessage = {};
+        m.keepInChatMessage.key = message.keep;
+        m.keepInChatMessage.keepType = message.type;
+        m.keepInChatMessage.timestampMs = Date.now();
+    }
+    else if ('call' in message) {
+        m = {
+            scheduledCallCreationMessage: {
+                scheduledTimestampMs: (_a = message.call.time) !== null && _a !== void 0 ? _a : Date.now(),
+                callType: (_b = message.call.type) !== null && _b !== void 0 ? _b : 1,
+                title: message.call.title
+            }
+        };
+    }
+    else if ('paymentInvite' in message) {
+        m.paymentInviteMessage = {
+            serviceType: message.paymentInvite.type,
+            expiryTimestamp: message.paymentInvite.expiry
+        };
+    }
     else if ('buttonReply' in message) {
         switch (message.type) {
             case 'template':
@@ -360,6 +540,10 @@ const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
+    else if ('ptv' in message && message.ptv) {
+        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ video: message.video }, options);
+        m.ptvMessage = videoMessage;
+    }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
         m.productMessage = Types_1.WAProto.Message.ProductMessage.fromObject({
@@ -370,11 +554,27 @@ const generateWAMessageContent = async (message, options) => {
             }
         });
     }
+    else if ('order' in message) {
+        m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject({
+            orderId: message.order.id,
+            thumbnail: message.order.thumbnail,
+            itemCount: message.order.itemCount,
+            status: message.order.status,
+            surface: message.order.surface,
+            orderTitle: message.order.title,
+            message: message.order.text,
+            sellerJid: message.order.seller,
+            token: message.order.token,
+            totalAmount1000: message.order.amount,
+            totalCurrencyCode: message.order.currency
+        });
+    }
     else if ('listReply' in message) {
         m.listResponseMessage = { ...message.listReply };
     }
     else if ('poll' in message) {
-        (_b = message.poll).selectableCount || (_b.selectableCount = 0);
+        (_p = message.poll).selectableCount || (_p.selectableCount = 0);
+        (_q = message.poll).toAnnouncementGroup || (_q.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
@@ -383,14 +583,75 @@ const generateWAMessageContent = async (message, options) => {
             throw new boom_1.Boom(`poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`, { statusCode: 400 });
         }
         m.messageContextInfo = {
-            // encKey
+            
             messageSecret: message.poll.messageSecret || (0, crypto_1.randomBytes)(32),
         };
-        m.pollCreationMessage = {
+        const pollCreationMessage = {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
             options: message.poll.values.map(optionName => ({ optionName })),
         };
+        if (message.poll.toAnnouncementGroup) {
+            
+            m.pollCreationMessageV2 = pollCreationMessage;
+        }
+        else {
+            if (message.poll.selectableCount === 1) {
+                
+                m.pollCreationMessageV3 = pollCreationMessage;
+            }
+            else {
+              
+                m.pollCreationMessage = pollCreationMessage;
+            }
+        }
+    }
+    else if ('event' in message) {
+        m.messageContextInfo = {
+            messageSecret: message.event.messageSecret || (0, crypto_1.randomBytes)(32),
+        };
+        m.eventMessage = { ...message.event };
+    }
+    else if ('inviteAdmin' in message) {
+        m.newsletterAdminInviteMessage = {};
+        m.newsletterAdminInviteMessage.inviteExpiration = message.inviteAdmin.inviteExpiration;
+        m.newsletterAdminInviteMessage.caption = message.inviteAdmin.text;
+        m.newsletterAdminInviteMessage.newsletterJid = message.inviteAdmin.jid;
+        m.newsletterAdminInviteMessage.newsletterName = message.inviteAdmin.subject;
+        m.newsletterAdminInviteMessage.jpegThumbnail = message.inviteAdmin.thumbnail;
+    }
+    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
+                }
+            };
+        }
+        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,
+                }
+            };
+        }
+        else {
+            throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
+        }
+        m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
+            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 ('sharePhoneNumber' in message) {
         m.protocolMessage = {
@@ -400,6 +661,14 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
+    else if ('album' in message) {
+        const imageMessages = message.album.filter(item => 'image' in item);
+        const videoMessages = message.album.filter(item => 'video' in item);
+        m.albumMessage = WAProto_1.proto.Message.AlbumMessage.fromObject({
+            expectedImageCount: imageMessages.length,
+            expectedVideoCount: videoMessages.length,
+        });
+    }
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
@@ -419,14 +688,24 @@ const generateWAMessageContent = async (message, options) => {
             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) {
             buttonsMessage.footerText = message.footer;
         }
+        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 = {
-            hydratedButtons: message.templateButtons
+            hydratedButtons: message.hasOwnProperty("templateButtons") ? message.templateButtons : message.templateButtons
         };
         if ('text' in message) {
             msg.hydratedContentText = message.text;
@@ -458,10 +737,97 @@ const generateWAMessageContent = async (message, options) => {
         };
         m = { listMessage };
     }
+    else if ('interactiveButtons' in message && !!message.interactiveButtons) {
+        const interactiveMessage = {
+            nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
+                buttons: message.interactiveButtons,
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_j = message === null || message === void 0 ? void 0 : message.media) !== null && _j !== void 0 ? _j : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
+    else if ('shop' in message && !!message.shop) {
+        const interactiveMessage = {
+            shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
+                surface: message.shop,
+                id: message.id
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_m = message === null || message === void 0 ? void 0 : message.media) !== null && _m !== void 0 ? _m : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
     if ('viewOnce' in message && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if ('mentions' in message && ((_a = message.mentions) === null || _a === void 0 ? void 0 : _a.length)) {
+    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] || {};
         m[messageType].contextInfo.mentionedJid = message.mentions;
@@ -485,8 +851,8 @@ const generateWAMessageContent = async (message, options) => {
 };
 exports.generateWAMessageContent = generateWAMessageContent;
 const generateWAMessageFromContent = (jid, message, options) => {
-    // set timestamp to now
-    // if not specified
+    
+    
     if (!options.timestamp) {
         options.timestamp = new Date();
     }
@@ -494,36 +860,39 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const key = (0, exports.getContentType)(innerMessage);
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid } = options;
-    if (quoted && !(0, WABinary_1.isJidNewsLetter)(jid)) {
+    
+    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
-        quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
-        const quotedContent = quotedMsg[msgType];
-        if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
-            delete quotedContent.contextInfo;
-        }
-        const contextInfo = innerMessage[key].contextInfo || {};
-        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;
-        }
-        innerMessage[key].contextInfo = contextInfo;
+        
+        if (quotedMsg) {
+            quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
+            const quotedContent = quotedMsg[msgType];
+            if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
+                delete quotedContent.contextInfo;
+            }
+            const contextInfo = innerMessage[key].contextInfo || {};
+            contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
+            contextInfo.stanzaId = quoted.key.id;
+            contextInfo.quotedMessage = quotedMsg;
+            
+            
+            if (jid !== quoted.key.remoteJid) {
+                contextInfo.remoteJid = quoted.key.remoteJid;
+            }
+            innerMessage[key].contextInfo = contextInfo;
+        }
     }
     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)) {
+        
+        !(0, WABinary_1.isJidNewsletter)(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
             expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
@@ -535,7 +904,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
         },
         message: message,
         messageTimestamp: timestamp,
@@ -548,9 +917,9 @@ 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), ...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 */
@@ -572,7 +941,7 @@ 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) {
@@ -587,7 +956,24 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension)
-            || (message === null || message === void 0 ? void 0 : message.editedMessage));
+            || (message === null || message === void 0 ? void 0 : message.editedMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupMentionedMessage)
+            || (message === null || message === void 0 ? void 0 : message.botInvokeMessage)
+            || (message === null || message === void 0 ? void 0 : message.lottieStickerMessage)
+            || (message === null || message === void 0 ? void 0 : message.eventCoverImage)
+            || (message === null || message === void 0 ? void 0 : message.statusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationOptionImageMessage)
+            || (message === null || message === void 0 ? void 0 : message.associatedChildMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5)
+            || (message === null || message === void 0 ? void 0 : message.statusAddYours)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessage)
+            || (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));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -637,7 +1023,11 @@ 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' : /^.{18}$/.test(id) ? 'desktop' : 'unknown';
+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) => {
@@ -656,9 +1046,8 @@ const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
     const reactions = (msg.reactions || [])
         .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    reaction.text = reaction.text || '';
+    reactions.push(reaction);
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
@@ -711,7 +1100,6 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     }
     return Object.values(voteHashMap);
 }
-exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 /** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};
@@ -741,10 +1129,10 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
         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;
@@ -802,3 +1190,22 @@ const assertMediaContent = (content) => {
     return mediaContent;
 };
 exports.assertMediaContent = assertMediaContent;
+
+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;
+const getSenderLid = (message) => {
+    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;