@hbmodsofc/baileys 1.5.2 → 1.7.6

package/lib/Utils/messages.js

@@ -1,14 +1,15 @@
-"use strict"; 
+"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 WAProto_1 = require("../../WAProto");
+const index_js_1 = require("../../WAProto/index.js");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
@@ -21,22 +22,21 @@ const MIMETYPE_MAP = {
     document: 'application/pdf',
     audio: 'audio/ogg; codecs=opus',
     sticker: 'image/webp',
-    'product-catalog-image': 'image/jpeg',
+    'product-catalog-image': 'image/jpeg'
 };
 const MessageTypeProto = {
-    'image': Types_1.WAProto.Message.ImageMessage,
-    'video': Types_1.WAProto.Message.VideoMessage,
-    'audio': Types_1.WAProto.Message.AudioMessage,
-    'sticker': Types_1.WAProto.Message.StickerMessage,
-    'document': Types_1.WAProto.Message.DocumentMessage,
+    image: Types_1.WAProto.Message.ImageMessage,
+    video: Types_1.WAProto.Message.VideoMessage,
+    audio: Types_1.WAProto.Message.AudioMessage,
+    sticker: Types_1.WAProto.Message.StickerMessage,
+    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 extractUrlFromText = (text) => text.match(Defaults_1.URL_REGEX)?.[0];
 exports.extractUrlFromText = extractUrlFromText;
 const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
     const url = (0, exports.extractUrlFromText)(text);
@@ -45,8 +45,9 @@ const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
             const urlInfo = await getUrlInfo(url);
             return urlInfo;
         }
-        catch (error) { // ignore if fails
-            logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'url generation failed');
+        catch (error) {
+            // ignore if fails
+            logger?.warn({ trace: error.stack }, 'url generation failed');
         }
     }
 };
@@ -74,165 +75,150 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     if (!mediaType) {
-        throw new boom_1.Boom('Invalid media type', { 
-            statusCode: 400 
-        });
+        throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
     }
-
     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: "120363191549232941@newsletter",
-                        serverMessageId: 0,
-                        newsletterName: "HBWABot Support",
-                        contentType: "UPDATE",
-                    }
-                }
-            ]
-        }),
         media: message[mediaType]
     };
     delete uploadData[mediaType];
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
-        ('url' in uploadData.media) &&
+        'url' in uploadData.media &&
         !!uploadData.media.url &&
-        !!options.mediaCache && (
-    mediaType + ':' + uploadData.media.url.toString());
-    
+        !!options.mediaCache &&
+        mediaType + ':' + uploadData.media.url.toString();
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
-    
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-
     if (cacheableKey) {
-        const mediaBuff = options.mediaCache.get(cacheableKey);
+        const mediaBuff = await options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
-            logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'got media cache hit');
+            logger?.debug({ cacheableKey }, 'got media cache hit');
             const obj = Types_1.WAProto.Message.decode(mediaBuff);
             const key = `${mediaType}Message`;
             Object.assign(obj[key], { ...uploadData, media: undefined });
             return obj;
         }
     }
-
+    const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
+    if (isNewsletter) {
+        logger?.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
+        const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(uploadData.media, options.mediaTypeOverride || mediaType, logger);
+        const fileSha256B64 = fileSha256.toString('base64');
+        const { mediaUrl, directPath } = await options.upload(filePath, {
+            fileEncSha256B64: fileSha256B64,
+            mediaType: mediaType,
+            timeoutMs: options.mediaUploadTimeoutMs
+        });
+        await fs_1.promises.unlink(filePath);
+        const obj = Types_1.WAProto.Message.create({
+            // todo: add more support here
+            [`${mediaType}Message`]: MessageTypeProto[mediaType].create({
+                url: mediaUrl,
+                directPath,
+                fileSha256,
+                fileLength,
+                ...uploadData,
+                media: undefined
+            })
+        });
+        if (uploadData.ptv) {
+            obj.ptvMessage = obj.videoMessage;
+            delete obj.videoMessage;
+        }
+        if (cacheableKey) {
+            logger?.debug({ cacheableKey }, 'set cache');
+            await options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        }
+        return obj;
+    }
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
-    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
-        (typeof uploadData['jpegThumbnail'] === 'undefined');
+    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined';
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, opusConverted } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
-        opts: options.options,
-        isPtt: uploadData.ptt, 
-        forceOpus: (mediaType === "audio" && uploadData.mimetype && uploadData.mimetype.includes('opus'))
+        opts: options.options
     });
-
-    if (mediaType === 'audio' && opusConverted) {
-        uploadData.mimetype = 'audio/ogg; codecs=opus';
-    }
-
-    const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
-    
-    const [{ mediaUrl, directPath, handle }] = await Promise.all([
+    const fileEncSha256B64 = fileEncSha256.toString('base64');
+    const [{ mediaUrl, directPath }] = await Promise.all([
         (async () => {
-            const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
-            logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
+            const result = await options.upload(encFilePath, {
+                fileEncSha256B64,
+                mediaType,
+                timeoutMs: options.mediaUploadTimeoutMs
+            });
+            logger?.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(originalFilePath, mediaType, options);
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
                         uploadData.height = originalImageDimensions.height;
-                        logger === null || logger === void 0 ? void 0 : logger.debug('set dimensions');
+                        logger?.debug('set dimensions');
                     }
-                    logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
+                    logger?.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
-                    logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(originalFilePath);
+                    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');
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(originalFilePath, logger);
+                    logger?.debug('processed waveform');
                 }
                 if (requiresAudioBackground) {
                     uploadData.backgroundArgb = await assertColor(options.backgroundColor);
-                    logger === null || logger === void 0 ? void 0 : logger.debug('computed backgroundColor audio status');
+                    logger?.debug('computed backgroundColor audio status');
                 }
             }
             catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.warn({ trace: error.stack }, 'failed to obtain extra info');
+                logger?.warn({ trace: error.stack }, 'failed to obtain extra info');
             }
-        })(),
-    ])
-        .finally(async () => {
-        if (!Buffer.isBuffer(encWriteStream)) {
-            encWriteStream.destroy();
+        })()
+    ]).finally(async () => {
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
+            }
+            logger?.debug('removed tmp files');
         }
-        
-        if (didSaveToTmpPath && bodyPath) {
-            await fs_1.promises.unlink(bodyPath);
-            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+        catch (error) {
+            logger?.warn('failed to remove tmp file');
         }
     });
-
-    const obj = Types_1.WAProto.Message.fromObject({
-        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-            url: handle ? undefined : mediaUrl,
+    const obj = Types_1.WAProto.Message.create({
+        [`${mediaType}Message`]: MessageTypeProto[mediaType].create({
+            url: mediaUrl,
             directPath,
-            mediaKey: mediaKey,
-            fileEncSha256: fileEncSha256,
+            mediaKey,
+            fileEncSha256,
             fileSha256,
             fileLength,
-            mediaKeyTimestamp: handle ? undefined : (0, generics_1.unixTimestampSeconds)(),
+            mediaKeyTimestamp: (0, generics_1.unixTimestampSeconds)(),
             ...uploadData,
             media: undefined
         })
     });
-
     if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
     }
-
     if (cacheableKey) {
-        logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
-        options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        logger?.debug({ cacheableKey }, 'set cache');
+        await options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
     }
-
     return obj;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
@@ -248,7 +234,7 @@ const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
             }
         }
     };
-    return Types_1.WAProto.Message.fromObject(content);
+    return Types_1.WAProto.Message.create(content);
 };
 exports.prepareDisappearingMessageSettingContent = prepareDisappearingMessageSettingContent;
 /**
@@ -257,34 +243,33 @@ exports.prepareDisappearingMessageSettingContent = prepareDisappearingMessageSet
  * @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());
+    content = index_js_1.proto.Message.decode(index_js_1.proto.Message.encode(content).finish());
     let key = Object.keys(content)[0];
-    let score = ((_a = content[key].contextInfo) === null || _a === void 0 ? void 0 : _a.forwardingScore) || 0;
+    let score = content?.[key]?.contextInfo?.forwardingScore || 0;
     score += message.key.fromMe && !forceForward ? 0 : 1;
     if (key === 'conversation') {
         content.extendedTextMessage = { text: content[key] };
         delete content.conversation;
         key = 'extendedTextMessage';
     }
+    const key_ = content?.[key];
     if (score > 0) {
-        content[key].contextInfo = { forwardingScore: score, isForwarded: true };
+        key_.contextInfo = { forwardingScore: score, isForwarded: true };
     }
     else {
-        content[key].contextInfo = {};
+        key_.contextInfo = {};
     }
     return content;
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
-    var _a;
-    var _b;
+    var _a, _b;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -293,7 +278,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;
@@ -324,20 +308,20 @@ const generateWAMessageContent = async (message, options) => {
             throw new boom_1.Boom('require atleast 1 contact', { statusCode: 400 });
         }
         if (contactLen === 1) {
-            m.contactMessage = Types_1.WAProto.Message.ContactMessage.fromObject(message.contacts.contacts[0]);
+            m.contactMessage = Types_1.WAProto.Message.ContactMessage.create(message.contacts.contacts[0]);
         }
         else {
-            m.contactsArrayMessage = Types_1.WAProto.Message.ContactsArrayMessage.fromObject(message.contacts);
+            m.contactsArrayMessage = Types_1.WAProto.Message.ContactsArrayMessage.create(message.contacts);
         }
     }
     else if ('location' in message) {
-        m.locationMessage = Types_1.WAProto.Message.LocationMessage.fromObject(message.location);
+        m.locationMessage = Types_1.WAProto.Message.LocationMessage.create(message.location);
     }
     else if ('react' in message) {
         if (!message.react.senderTimestampMs) {
             message.react.senderTimestampMs = Date.now();
         }
-        m.reactionMessage = Types_1.WAProto.Message.ReactionMessage.fromObject(message.react);
+        m.reactionMessage = Types_1.WAProto.Message.ReactionMessage.create(message.react);
     }
     else if ('delete' in message) {
         m.protocolMessage = {
@@ -349,64 +333,133 @@ const generateWAMessageContent = async (message, options) => {
         m = (0, exports.generateForwardMessageContent)(message.forward, message.force);
     }
     else if ('disappearingMessagesInChat' in message) {
-        const exp = typeof message.disappearingMessagesInChat === 'boolean' ?
-            (message.disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-            message.disappearingMessagesInChat;
+        const exp = typeof message.disappearingMessagesInChat === 'boolean'
+            ? message.disappearingMessagesInChat
+                ? Defaults_1.WA_DEFAULT_EPHEMERAL
+                : 0
+            : 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;
+        //TODO: use built-in interface and get disappearing mode info etc.
+        //TODO: cache / use store!?
+        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 ('buttonReply' in message) {
         switch (message.type) {
             case 'template':
                 m.templateButtonReplyMessage = {
                     selectedDisplayText: message.buttonReply.displayText,
                     selectedId: message.buttonReply.id,
-                    selectedIndex: message.buttonReply.index,
+                    selectedIndex: message.buttonReply.index
                 };
                 break;
             case 'plain':
                 m.buttonsResponseMessage = {
                     selectedButtonId: message.buttonReply.id,
                     selectedDisplayText: message.buttonReply.displayText,
-                    type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT,
+                    type: index_js_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT
                 };
                 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({
+        m.productMessage = Types_1.WAProto.Message.ProductMessage.create({
             ...message,
             product: {
                 ...message.product,
-                productImage: imageMessage,
+                productImage: imageMessage
             }
         });
     }
     else if ('listReply' in message) {
         m.listResponseMessage = { ...message.listReply };
     }
+    else if ('event' in message) {
+        m.eventMessage = {};
+        const startTime = Math.floor(message.event.startDate.getTime() / 1000);
+        if (message.event.call && options.getCallLink) {
+            const token = await options.getCallLink(message.event.call, { startTime });
+            m.eventMessage.joinLink = (message.event.call === 'audio' ? Defaults_1.CALL_AUDIO_PREFIX : Defaults_1.CALL_VIDEO_PREFIX) + token;
+        }
+        m.messageContextInfo = {
+            // encKey
+            messageSecret: message.event.messageSecret || (0, crypto_1.randomBytes)(32)
+        };
+        m.eventMessage.name = message.event.name;
+        m.eventMessage.description = message.event.description;
+        m.eventMessage.startTime = startTime;
+        m.eventMessage.endTime = message.event.endDate ? message.event.endDate.getTime() / 1000 : undefined;
+        m.eventMessage.isCanceled = message.event.isCancelled ?? false;
+        m.eventMessage.extraGuestsAllowed = message.event.extraGuestsAllowed;
+        m.eventMessage.isScheduleCall = message.event.isScheduleCall ?? false;
+        m.eventMessage.location = message.event.location;
+    }
     else if ('poll' in message) {
-        (_b = message.poll).selectableCount || (_b.selectableCount = 0);
+        (_a = message.poll).selectableCount || (_a.selectableCount = 0);
+        (_b = message.poll).toAnnouncementGroup || (_b.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
-        if (message.poll.selectableCount < 0
-            || message.poll.selectableCount > message.poll.values.length) {
-            throw new boom_1.Boom(`poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`, { statusCode: 400 });
+        if (message.poll.selectableCount < 0 || message.poll.selectableCount > message.poll.values.length) {
+            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),
+            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 })),
+            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;
+            }
+        }
     }
     else if ('sharePhoneNumber' in message) {
         m.protocolMessage = {
-            type: WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
+            type: index_js_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
         };
     }
     else if ('requestPhoneNumber' in message) {
@@ -415,68 +468,20 @@ const generateWAMessageContent = async (message, options) => {
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
-    if ('buttons' in message && !!message.buttons) {
-        const buttonsMessage = {
-            buttons: message.buttons.map(b => ({ ...b, type: WAProto_1.proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
-        };
-        if ('text' in message) {
-            buttonsMessage.contentText = message.text;
-            buttonsMessage.headerType = ButtonType.EMPTY;
-        }
-        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 ('footer' in message && !!message.footer) {
-            buttonsMessage.footerText = message.footer;
-        }
-        m = { buttonsMessage };
-    }
-    else if ('templateButtons' in message && !!message.templateButtons) {
-        const msg = {
-            hydratedButtons: message.templateButtons
-        };
-        if ('text' in message) {
-            msg.hydratedContentText = message.text;
-        }
-        else {
-            if ('caption' in message) {
-                msg.hydratedContentText = message.caption;
-            }
-            Object.assign(msg, m);
-        }
-        if ('footer' in message && !!message.footer) {
-            msg.hydratedFooterText = message.footer;
-        }
-        m = {
-            templateMessage: {
-                fourRowTemplate: msg,
-                hydratedTemplate: msg
-            }
-        };
-    }
-    if ('sections' in message && !!message.sections) {
-        const listMessage = {
-            sections: message.sections,
-            buttonText: message.buttonText,
-            title: message.title,
-            footerText: message.footer,
-            description: message.text,
-            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
-        };
-        m = { listMessage };
-    }
     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)) {
-        const [messageType] = Object.keys(m);
-        m[messageType].contextInfo = m[messageType] || {};
-        m[messageType].contextInfo.mentionedJid = message.mentions;
+    if ('mentions' in message && message.mentions?.length) {
+        const messageType = Object.keys(m)[0];
+        const key = m[messageType];
+        if ('contextInfo' in key && !!key.contextInfo) {
+            key.contextInfo.mentionedJid = message.mentions;
+        }
+        else if (key) {
+            key.contextInfo = {
+                mentionedJid: message.mentions
+            };
+        }
     }
     if ('edit' in message) {
         m = {
@@ -489,11 +494,16 @@ const generateWAMessageContent = async (message, options) => {
         };
     }
     if ('contextInfo' in message && !!message.contextInfo) {
-        const [messageType] = Object.keys(m);
-        m[messageType] = m[messageType] || {};
-        m[messageType].contextInfo = message.contextInfo;
+        const messageType = Object.keys(m)[0];
+        const key = m[messageType];
+        if ('contextInfo' in key && !!key.contextInfo) {
+            key.contextInfo = { ...key.contextInfo, ...message.contextInfo };
+        }
+        else if (key) {
+            key.contextInfo = message.contextInfo;
+        }
     }
-    return Types_1.WAProto.Message.fromObject(m);
+    return Types_1.WAProto.Message.create(m);
 };
 exports.generateWAMessageContent = generateWAMessageContent;
 const generateWAMessageFromContent = (jid, message, options) => {
@@ -506,17 +516,19 @@ 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)) {
-        const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
+    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] });
+        quotedMsg = index_js_1.proto.Message.create({ [msgType]: quotedMsg[msgType] });
         const quotedContent = quotedMsg[msgType];
         if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
             delete quotedContent.contextInfo;
         }
-        const contextInfo = innerMessage[key].contextInfo || {};
+        const contextInfo = ('contextInfo' in innerMessage[key] && innerMessage[key]?.contextInfo) || {};
         contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
         contextInfo.stanzaId = quoted.key.id;
         contextInfo.quotedMessage = quotedMsg;
@@ -525,29 +537,33 @@ const generateWAMessageFromContent = (jid, message, options) => {
         if (jid !== quoted.key.remoteJid) {
             contextInfo.remoteJid = quoted.key.remoteJid;
         }
-        innerMessage[key].contextInfo = contextInfo;
+        if (contextInfo && innerMessage[key]) {
+            /* @ts-ignore */
+            innerMessage[key].contextInfo = contextInfo;
+        }
     }
     if (
     // if we want to send a disappearing message
-    !!(options === null || options === void 0 ? void 0 : options.ephemeralExpiration) &&
+    !!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)) {
+        // newsletters don't support ephemeral messages
+        !(0, WABinary_1.isJidNewsletter)(jid)) {
+        /* @ts-ignore */
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
-            expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
+            expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL
             //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
         };
     }
-    message = Types_1.WAProto.Message.fromObject(message);
+    message = Types_1.WAProto.Message.create(message);
     const messageJSON = {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
+            id: options?.messageId || (0, generics_1.generateMessageIDV2)()
         },
         message: message,
         messageTimestamp: timestamp,
@@ -555,14 +571,14 @@ const generateWAMessageFromContent = (jid, message, options) => {
         participant: (0, WABinary_1.isJidGroup)(jid) || (0, WABinary_1.isJidStatusBroadcast)(jid) ? userJid : undefined,
         status: Types_1.WAMessageStatus.PENDING
     };
-    return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON);
+    return Types_1.WAProto.WebMessageInfo.create(messageJSON);
 };
 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);
+    options.logger = options?.logger?.child({ msgId: options.messageId });
+    // Pass jid in the options to generateWAMessageContent
+    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { ...options, jid }), options);
 };
 exports.generateWAMessage = generateWAMessage;
 /** Get the key to access the true type of content */
@@ -594,12 +610,12 @@ const normalizeMessageContent = (content) => {
     }
     return content;
     function getFutureProofMessage(message) {
-        return ((message === null || message === void 0 ? void 0 : message.ephemeralMessage)
-            || (message === null || message === void 0 ? void 0 : message.viewOnceMessage)
-            || (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));
+        return (message?.ephemeralMessage ||
+            message?.viewOnceMessage ||
+            message?.documentWithCaptionMessage ||
+            message?.viewOnceMessageV2 ||
+            message?.viewOnceMessageV2Extension ||
+            message?.editedMessage);
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -608,7 +624,6 @@ exports.normalizeMessageContent = normalizeMessageContent;
  * 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) => {
         if (msg.imageMessage) {
             return { imageMessage: msg.imageMessage };
@@ -624,24 +639,22 @@ const extractMessageContent = (content) => {
         }
         else {
             return {
-                conversation: 'contentText' in msg
-                    ? msg.contentText
-                    : ('hydratedContentText' in msg ? msg.hydratedContentText : '')
+                conversation: 'contentText' in msg ? msg.contentText : 'hydratedContentText' in msg ? msg.hydratedContentText : ''
             };
         }
     };
     content = (0, exports.normalizeMessageContent)(content);
-    if (content === null || content === void 0 ? void 0 : content.buttonsMessage) {
+    if (content?.buttonsMessage) {
         return extractFromTemplateMessage(content.buttonsMessage);
     }
-    if ((_a = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _a === void 0 ? void 0 : _a.hydratedFourRowTemplate) {
-        return extractFromTemplateMessage((_b = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _b === void 0 ? void 0 : _b.hydratedFourRowTemplate);
+    if (content?.templateMessage?.hydratedFourRowTemplate) {
+        return extractFromTemplateMessage(content?.templateMessage?.hydratedFourRowTemplate);
     }
-    if ((_c = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _c === void 0 ? void 0 : _c.hydratedTemplate) {
-        return extractFromTemplateMessage((_d = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _d === void 0 ? void 0 : _d.hydratedTemplate);
+    if (content?.templateMessage?.hydratedTemplate) {
+        return extractFromTemplateMessage(content?.templateMessage?.hydratedTemplate);
     }
-    if ((_e = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _e === void 0 ? void 0 : _e.fourRowTemplate) {
-        return extractFromTemplateMessage((_f = content === null || content === void 0 ? void 0 : content.templateMessage) === null || _f === void 0 ? void 0 : _f.fourRowTemplate);
+    if (content?.templateMessage?.fourRowTemplate) {
+        return extractFromTemplateMessage(content?.templateMessage?.fourRowTemplate);
     }
     return content;
 };
@@ -649,7 +662,15 @@ 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) => {
@@ -666,21 +687,17 @@ 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 || [])
-        .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    const reactions = (msg.reactions || []).filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
+    reaction.text = reaction.text || '';
+    reactions.push(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);
-    const reactions = (msg.pollUpdates || [])
-        .filter(r => (0, generics_1.getKeyAuthor)(r.pollUpdateMessageKey) !== authorID);
-    if ((_b = (_a = update.vote) === null || _a === void 0 ? void 0 : _a.selectedOptions) === null || _b === void 0 ? void 0 : _b.length) {
+    const reactions = (msg.pollUpdates || []).filter(r => (0, generics_1.getKeyAuthor)(r.pollUpdateMessageKey) !== authorID);
+    if (update.vote?.selectedOptions?.length) {
         reactions.push(update);
     }
     msg.pollUpdates = reactions;
@@ -693,8 +710,10 @@ exports.updateMessageWithPollUpdate = updateMessageWithPollUpdate;
  * @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) || [];
+    const opts = message?.pollCreationMessage?.options ||
+        message?.pollCreationMessageV2?.options ||
+        message?.pollCreationMessageV3?.options ||
+        [];
     const voteHashMap = opts.reduce((acc, opt) => {
         const hash = (0, crypto_2.sha256)(Buffer.from(opt.optionName || '')).toString();
         acc[hash] = {
@@ -723,7 +742,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 = {};
@@ -748,20 +766,15 @@ 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;
-                }
-            }
+    const result = await downloadMsg().catch(async (error) => {
+        if (ctx &&
+            axios_1.default.isAxiosError(error) && // check if the message requires a reupload
+            REUPLOAD_REQUIRED_STATUS.includes(error.response?.status)) {
+            ctx.logger.info({ key: message.key }, 'sending reupload media request...');
+            // request reupload
+            message = await ctx.reuploadRequest(message);
+            const result = await downloadMsg();
+            return result;
         }
         throw error;
     });
@@ -772,7 +785,7 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
             throw new boom_1.Boom('No message present', { statusCode: 400, data: message });
         }
         const contentType = (0, exports.getContentType)(mContent);
-        let mediaType = contentType === null || contentType === void 0 ? void 0 : contentType.replace('Message', '');
+        let mediaType = contentType?.replace('Message', '');
         const media = mContent[contentType];
         if (!media || typeof media !== 'object' || (!('url' in media) && !('thumbnailDirectPath' in media))) {
             throw new boom_1.Boom(`"${contentType}" message is not a media message`);
@@ -803,11 +816,11 @@ 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)
-        || (content === null || content === void 0 ? void 0 : content.imageMessage)
-        || (content === null || content === void 0 ? void 0 : content.videoMessage)
-        || (content === null || content === void 0 ? void 0 : content.audioMessage)
-        || (content === null || content === void 0 ? void 0 : content.stickerMessage);
+    const mediaContent = content?.documentMessage ||
+        content?.imageMessage ||
+        content?.videoMessage ||
+        content?.audioMessage ||
+        content?.stickerMessage;
     if (!mediaContent) {
         throw new boom_1.Boom('given message is not a media message', { statusCode: 400, data: content });
     }