@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Utils/messages.js

@@ -1,22 +1,42 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-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 Defaults_1 = require("../Defaults")
-const Types_1 = require("../Types")
-const WABinary_1 = require("../WABinary")
-const crypto_2 = require("./crypto")
-const generics_1 = require("./generics")
-const messages_media_1 = require("./messages-media")
+const { Boom } = require("@hapi/boom")
+const { randomBytes } = require("crypto")
+const { promises } = require("fs")
+const { proto } = require("../../WAProto")
+const {
+  URL_REGEX, 
+  WA_DEFAULT_EPHEMERAL
+} = require("../Defaults/constants")
+const { MEDIA_KEYS } = require("../Defaults/media")
+const {
+  WAProto, 
+  WAMessageStatus
+} = require("../Types")
+const { 
+  isJidGroup, 
+  isJidNewsletter,
+  isJidStatusBroadcast, 
+  jidNormalizedUser
+} = require("../WABinary")
+const { sha256 } = require("./crypto")
+const {
+  generateMessageID, 
+  getKeyAuthor, 
+  unixTimestampSeconds 
+} = require("./generics")
+const { 
+  downloadContentFromMessage, 
+  encryptedStream, 
+  generateThumbnail, 
+  getAudioDuration, 
+  getAudioWaveform, 
+  getRawMediaUploadData, 
+  getStream, 
+  toBuffer 
+} = require("./messages-media")
 
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
@@ -28,11 +48,11 @@ const MIMETYPE_MAP = {
 }
 
 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': WAProto.Message.ImageMessage,
+    'video': WAProto.Message.VideoMessage,
+    'audio': WAProto.Message.AudioMessage,
+    'sticker': WAProto.Message.StickerMessage,
+    'document': WAProto.Message.DocumentMessage
 }
 
 /**
@@ -40,7 +60,7 @@ const MessageTypeProto = {
  * @param text eg. hello https://google.com
  * @returns the URL, eg. https://google.com
  */
-const extractUrlFromText = (text) => text.match(Defaults_1.URL_REGEX)?.[0]
+const extractUrlFromText = (text) => text.match(URL_REGEX)?.[0]
 
 const generateLinkPreviewIfRequired = async (text, getUrlInfo, logger) => {
     const url = extractUrlFromText(text)
@@ -76,66 +96,71 @@ const assertColor = async (color) => {
 
 const prepareWAMessageMedia = async (message, options) => {
     const logger = options.logger
+    
     let mediaType
-
-    for (const key of Defaults_1.MEDIA_KEYS) {
+    
+    for (const key of MEDIA_KEYS) {
         if (key in message) {
             mediaType = key
         }
     }
-
+    
     if (!mediaType) {
-        throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
+        throw new Boom('Invalid media type', { statusCode: 400 })
     }
-
+    
     const uploadData = {
         ...message,
         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 &&
         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 = await options.mediaCache.get(cacheableKey)
+        
         if (mediaBuff) {
             logger?.debug({ cacheableKey }, 'got media cache hit')
-            const obj = Types_1.WAProto.Message.decode(mediaBuff)
+            
+            const obj = proto.Message.decode(mediaBuff)
             const key = `${mediaType}Message`
+            
             Object.assign(obj[key], { ...uploadData, media: undefined })
+            
             return obj
         }
     }
-
-    const isNewsletter = !!options.jid && WABinary_1.isJidNewsletter(options.jid)
-
+    
+    const isNewsletter = !!options.jid && isJidNewsletter(options.jid)
+    
     if (isNewsletter) {
         logger?.info({ key: cacheableKey }, 'Preparing raw media for newsletter')
-        const { filePath, fileSha256, fileLength } = await messages_media_1.getRawMediaUploadData(uploadData.media, options.mediaTypeOverride || mediaType, logger)
-        const fileSha256B64 = fileSha256.toString('base64')
+        const { filePath, fileSha256, fileLength } = await 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.fromObject({
+        
+        await promises.unlink(filePath)
+        
+        const obj = WAProto.Message.fromObject({
             // todo: add more support here
             [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
                 url: mediaUrl,
@@ -146,34 +171,35 @@ const prepareWAMessageMedia = async (message, options) => {
                 media: undefined
             })
         })
-
+        
         if (uploadData.ptv) {
             obj.ptvMessage = obj.videoMessage
             delete obj.videoMessage
         }
-
+        
+        if (obj.stickerMessage) {
+            obj.stickerMessage.stickerSentTs = Date.now()
+        }
+        
         if (cacheableKey) {
             logger?.debug({ cacheableKey }, 'set cache');
-            await options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish())
+            await options.mediaCache.set(cacheableKey, 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 requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation
-
-    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await messages_media_1.encryptedStream(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     })
-
     const fileEncSha256B64 = fileEncSha256.toString('base64')
-
     const [{ mediaUrl, directPath }] = await Promise.all([
         (async () => {
             const result = await options.upload(encFilePath, {
@@ -184,32 +210,31 @@ const prepareWAMessageMedia = async (message, options) => {
             logger?.debug({ mediaType, cacheableKey }, 'uploaded media')
             return result
         })(),
-
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await messages_media_1.generateThumbnail(originalFilePath, mediaType, options)
+                    const { thumbnail, originalImageDimensions } = await generateThumbnail(originalFilePath, mediaType, options)
+                    
                     uploadData.jpegThumbnail = thumbnail
+                    
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width
                         uploadData.height = originalImageDimensions.height
-
                         logger?.debug('set dimensions')
                     }
-
-                    logger?.debug('generated thumbnail');
+                    logger?.debug('generated thumbnail')
                 }
-
+                
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await messages_media_1.getAudioDuration(originalFilePath)
+                    uploadData.seconds = await getAudioDuration(originalFilePath)
                     logger?.debug('computed audio duration')
                 }
-
+                
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await messages_media_1.getAudioWaveform(originalFilePath, logger)
+                    uploadData.waveform = await getAudioWaveform(originalFilePath, logger)
                     logger?.debug('processed waveform')
                 }
-
+                
                 if (requiresAudioBackground) {
                     uploadData.backgroundArgb = await assertColor(options.backgroundColor)
                     logger?.debug('computed backgroundColor audio status')
@@ -221,20 +246,20 @@ const prepareWAMessageMedia = async (message, options) => {
         })()
     ]).finally(async () => {
         try {
-            await fs_1.promises.unlink(encFilePath)
-
+            await promises.unlink(encFilePath)
+            
             if (originalFilePath) {
-                await fs_1.promises.unlink(originalFilePath)
+                await promises.unlink(originalFilePath)
             }
-
+            
             logger?.debug('removed tmp files')
         }
         catch (error) {
             logger?.warn('failed to remove tmp file')
         }
     })
-
-    const obj = Types_1.WAProto.Message.fromObject({
+    
+    const obj = WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: mediaUrl,
             directPath,
@@ -242,88 +267,99 @@ const prepareWAMessageMedia = async (message, options) => {
             fileEncSha256,
             fileSha256,
             fileLength,
-            mediaKeyTimestamp: generics_1.unixTimestampSeconds(),
+            mediaKeyTimestamp: unixTimestampSeconds(),
             ...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())
+        logger?.debug({ cacheableKey }, 'set cache')
+        await options.mediaCache.set(cacheableKey, WAProto.Message.encode(obj).finish())
     }
-
+    
     return obj
 }
 
 const prepareAlbumMessageContent = async (jid, albums, options) => {
-        let mediaHandle
-        let mediaMsg 
-        let message = []
-
-        const albumMsg = generateWAMessageFromContent(jid, {
-                albumMessage: {
-                        expectedImageCount: albums.filter(item => 'image' in item).length, 
-                        expectedVideoCount: albums.filter(item => 'video' in item).length
-                }
-        }, options) 
-
-        await options.suki.relayMessage(jid, albumMsg.message, {
-                messageId: albumMsg.key.id
-        }) 
-
-        for (const i in albums) {
-                const media = albums[i]
-
-                if ('image' in media) {
-                        mediaMsg = await generateWAMessage(jid, {
-                                image: media.image, 
-                                ...media, 
-                                ...options
-                        }, {
-                                userJid: options.userJid, 
-                                upload: async (encFilePath, opts) => {
-                                        const up = await options.suki.waUploadToServer(encFilePath, { ...opts, newsletter: WABinary_1.isJidNewsletter(jid) })
-                                        mediaHandle = up.handle
-                                        return up
-                                }, 
-                                ...options
-                        }) 
-                } else if ('video' in message) {
-                        mediaMsg = await generateWAMessage(jid, {
-                                video: media.video, 
-                                ...media, 
-                                ...options
-                        }, {
-                                userJid: options.userJid, 
-                                upload: async (encFilePath, opts) => {
-                                        const up = await options.suki.waUploadToServer(encFilePath, { ...opts, newsletter: WABinary_1.isJidNewsletter(jid) })
-                                        mediaHandle = up.handle
-                                        return up
-                                }, 
-                                ...options
-                        }) 
-                }
+    if (!Array.isArray(albums)) {
+        throw new Error("albums must be an array containing media objects.")
+    }
+
+    if (albums.length === 0) {
+        throw new Error("albums cannot be empty. At least one media item is required.")
+    }
+
+    const validCount = albums.filter(m => ('image' in m) || ('video' in m)).length
+
+    if (validCount === 0) {
+        throw new Error("albums contains no valid media. Use 'image' or 'video' keys.")
+    }
 
-                if (mediaMsg) {
-                        mediaMsg.message.messageContextInfo = {
-                                messageSecret: crypto_1.randomBytes(32), 
-                                messageAssociation: {
-                                        associationType: 1,
-                                        parentMessageKey: albumMsg.key
-                                }
-                        }
-                } 
+    let mediaHandle
+    let mediaMsg
+    const message = []
 
-                message.push(mediaMsg)
+    const albumMsg = generateWAMessageFromContent(jid, {
+        albumMessage: {
+            expectedImageCount: albums.filter(item => 'image' in item).length,
+            expectedVideoCount: albums.filter(item => 'video' in item).length
         }
+    }, options)
 
-        return message
+    await options.suki.relayMessage(jid, albumMsg.message, {
+        messageId: albumMsg.key.id
+    })
+
+    for (const media of albums) {
+        let content = {}
+        if ('image' in media) {
+            content = { image: media.image }
+        } else if ('video' in media) {
+            content = { video: media.video }
+        } else {
+            continue
+        }
+
+        mediaMsg = await generateWAMessage(
+            jid,
+            {
+                ...content,
+                ...media
+            },
+            {
+                userJid: options.userJid,
+                upload: async (encFilePath, opts) => {
+                    const up = await options.suki.waUploadToServer(
+                        encFilePath,
+                        { ...opts, newsletter: isJidNewsletter(jid) }
+                    )
+                    mediaHandle = up.handle
+                    return up
+                },
+                ...options
+            }
+        )
+
+        if (mediaMsg) {
+            mediaMsg.message.messageContextInfo = {
+                messageSecret: randomBytes(32),
+                messageAssociation: {
+                    associationType: proto.MessageAssociation.AssociationType.MEDIA_ALBUM,
+                    parentMessageKey: albumMsg.key
+                }
+            }
+        }
+
+        message.push(mediaMsg)
+    }
+
+    return message
 }
 
 const prepareDisappearingMessageSettingContent = (expiration) => {
@@ -331,14 +367,14 @@ const prepareDisappearingMessageSettingContent = (expiration) => {
         ephemeralMessage: {
             message: {
                 protocolMessage: {
-                    type: Types_1.WAProto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
+                    type: WAProto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
                     ephemeralExpiration: expiration ? expiration : 0
                 }
             }
         }
     }
 
-    return Types_1.WAProto.Message.fromObject(content)
+    return WAProto.Message.fromObject(content)
 }
 
 /**
@@ -350,12 +386,12 @@ const generateForwardMessageContent = (message, forceForward) => {
     let content = message.message
 
     if (!content) {
-        throw new boom_1.Boom('no content in message', { statusCode: 400 })
+        throw new Boom('no content in message', { statusCode: 400 })
     }
 
     // hacky copy
     content = normalizeMessageContent(content)
-    content = WAProto_1.proto.Message.decode(WAProto_1.proto.Message.encode(content).finish())
+    content = proto.Message.decode(proto.Message.encode(content).finish())
 
     let key = Object.keys(content)[0]
     let score = content[key].contextInfo?.forwardingScore || 0
@@ -379,883 +415,920 @@ const generateForwardMessageContent = (message, forceForward) => {
     return content
 }
 
-const generateWAMessageContent = async (message, options) => {
-    let m = {}
-    if ('text' in message) {
-        const extContent = { text: message.text }
-        let urlInfo = message.linkPreview
-
-        if (typeof urlInfo === 'undefined') {
-            urlInfo = await 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
-            extContent.title = urlInfo.title
-            extContent.previewType = 0
-            const img = urlInfo.highQualityThumbnail
-
-            if (img) {
-                extContent.thumbnailDirectPath = img.directPath
-                extContent.mediaKey = img.mediaKey
-                extContent.mediaKeyTimestamp = img.mediaKeyTimestamp
-                extContent.thumbnailWidth = img.width
-                extContent.thumbnailHeight = img.height
-                extContent.thumbnailSha256 = img.fileSha256
-                extContent.thumbnailEncSha256 = img.fileEncSha256
-            }
-        }
-
-        if (options.backgroundColor) {
-            extContent.backgroundArgb = await assertColor(options.backgroundColor)
-        }
-
-        if (options.textColor) {
-            extContent.textArgb = await assertColor(options.textColor) 
-        }
+const hasNonNullishProperty = (message, key) => {
+  return (
+    typeof message === 'object' &&
+    message !== null &&
+    key in message &&
+    message[key] !== null &&
+    message[key] !== undefined
+  )
+}
 
-        if (options.font) {
-            extContent.font = options.font
-        }
+function hasOptionalProperty(obj, key) {
+  return (
+    typeof obj === 'object' &&
+    obj !== null &&
+    key in obj &&
+    obj[key] !== null
+  )
+}
 
-        extContent.contextInfo = {
-             ...(message.contextInfo || {}),
-             ...(message.mentions ? { mentionedJid: message.mentions } : {})
-         }
+const generateWAMessageContent = async (message, options) => {
+    const hasMedia = [
+        "image",
+        "video",
+        "audio",
+        "sticker",
+        "document",
+    ].some((key) => hasNonNullishProperty(message, key))
 
-        m.extendedTextMessage = extContent
-    }
+    let m = {}
 
-    else if ('contacts' in message) {
+    if (hasNonNullishProperty(message, "contacts")) {
         const contactLen = message.contacts.contacts.length
 
         let contactMessage
 
         if (!contactLen) {
-            throw new boom_1.Boom('require atleast 1 contact', { statusCode: 400 })
+            throw new Boom("require atleast 1 contact", { statusCode: 400 })
         }
 
         if (contactLen === 1) {
             contactMessage = {
-                    contactMessage: Types_1.WAProto.Message.ContactMessage.fromObject(message.contacts.contacts[0])
+                contactMessage: WAProto.Message.ContactMessage.fromObject(
+                    message.contacts.contacts[0]
+                ),
             }
-        }
-
-        else {
+        } else {
             contactMessage = {
-                    contactsArrayMessage: Types_1.WAProto.Message.ContactsArrayMessage.fromObject(message.contacts)
+                contactsArrayMessage: WAProto.Message.ContactsArrayMessage.fromObject(
+                    message.contacts
+                ),
             }
         }
 
-        const [type] = Object.keys(contactMessage) 
-
-        contactMessage[type].contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
-
         m = contactMessage
-    }
+    } else if (hasNonNullishProperty(message, "contacts")) {
+        const contactLen = message.contacts.contacts.length
 
-    else if ('location' in message) {
-            let locationMessage
+        let contactMessage
 
-            if (message.live) {
-                locationMessage = {
-                    liveLocationMessage: Types_1.WAProto.Message.LiveLocationMessage.fromObject(message.location) 
-            }
+        if (!contactLen) {
+            throw new Boom("require atleast 1 contact", { statusCode: 400 })
         }
 
-        else {
-                locationMessage = {
-                    locationMessage: Types_1.WAProto.Message.LocationMessage.fromObject(message.location) 
+        if (contactLen === 1) {
+            contactMessage = {
+                contactMessage: WAProto.Message.ContactMessage.fromObject(
+                    message.contacts.contacts[0]
+                ),
+            }
+        } else {
+            contactMessage = {
+                contactsArrayMessage: WAProto.Message.ContactsArrayMessage.fromObject(
+                    message.contacts
+                ),
             }
         }
 
-        const [type] = Object.keys(locationMessage)
-
-        locationMessage[type].contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        m = contactMessage
+    } else if (hasNonNullishProperty(message, "location")) {
+        let locationMessage
+
+        if (message.live) {
+            locationMessage = {
+                liveLocationMessage: WAProto.Message.LiveLocationMessage.fromObject(
+                    message.location
+                ),
+            }
+        } else {
+            locationMessage = {
+                locationMessage: WAProto.Message.LocationMessage.fromObject(
+                    message.location
+                ),
+            }
         }
 
         m = locationMessage
-    }
-
-    else if ('react' in message) {
+    } else if (hasNonNullishProperty(message, "react")) {
         if (!message.react.senderTimestampMs) {
             message.react.senderTimestampMs = Date.now()
         }
 
-        m.reactionMessage = Types_1.WAProto.Message.ReactionMessage.fromObject(message.react)
-    }
-
-    else if ('delete' in message) {
+        m.reactionMessage = WAProto.Message.ReactionMessage.fromObject(
+            message.react
+        )
+    } else if (hasNonNullishProperty(message, "delete")) {
         m.protocolMessage = {
             key: message.delete,
-            type: Types_1.WAProto.Message.ProtocolMessage.Type.REVOKE
+            type: WAProto.Message.ProtocolMessage.Type.REVOKE,
         }
-    } 
-
-    else if ('forward' in message) {
-        const mess = generateForwardMessageContent(message.forward, message.force)
-        const [type] = Object.keys(mess) 
-
-        mess[type].contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+    } else if (hasNonNullishProperty(message, "sharePhoneNumber")) {
+        m.protocolMessage = {
+            type: WAProto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER,
         }
-
-        m = mess
-    }
-
-    else if ('disappearingMessagesInChat' in message) {
-        const exp = typeof message.disappearingMessagesInChat === 'boolean' ?
-            (message.disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
-            message.disappearingMessagesInChat
+    } else if (hasNonNullishProperty(message, "requestPhoneNumber")) {
+        m.requestPhoneNumberMessage = {}
+    } else if (hasNonNullishProperty(message, "forward")) {
+        m = generateForwardMessageContent(message.forward, message.force)
+    } else if (hasNonNullishProperty(message, "disappearingMessagesInChat")) {
+        const exp =
+            typeof message.disappearingMessagesInChat === "boolean"
+                ? message.disappearingMessagesInChat
+                    ? WA_DEFAULT_EPHEMERAL
+                    : 0
+                : message.disappearingMessagesInChat
         m = prepareDisappearingMessageSettingContent(exp)
-    }
-
-    else if ('groupInvite' in message) {
-        m.groupInviteMessage = {} 
+    } else if (hasNonNullishProperty(message, "groupInvite")) {
+        m.groupInviteMessage = {}
 
         m.groupInviteMessage.inviteCode = message.groupInvite.code
         m.groupInviteMessage.inviteExpiration = message.groupInvite.expiration
         m.groupInviteMessage.caption = message.groupInvite.caption
         m.groupInviteMessage.groupJid = message.groupInvite.jid
-        m.groupInviteMessage.groupName = message.groupInvite.name 
-        m.groupInviteMessage.contextInfo = message.contextInfo    
+        m.groupInviteMessage.groupName = message.groupInvite.name
+        m.groupInviteMessage.contextInfo = message.contextInfo
 
         if (options.getProfilePicUrl) {
-            const pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid)
-            const { thumbnail } = await messages_media_1.generateThumbnail(pfpUrl, 'image') 
+            const pfpUrl = await options.getProfilePicUrl(
+                message.groupInvite.jid
+            )
+            const { thumbnail } = await generateThumbnail(pfpUrl, "image")
             m.groupInviteMessage.jpegThumbnail = thumbnail
         }
-
-        m.groupInviteMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
-    }
-
-    else if ('adminInvite' in message) {
-        m.newsletterAdminInviteMessage = {} 
+    } else if (hasNonNullishProperty(message, "adminInvite")) {
+        m.newsletterAdminInviteMessage = {}
 
         m.newsletterAdminInviteMessage.newsletterJid = message.adminInvite.jid
-        m.newsletterAdminInviteMessage.newsletterName= message.adminInvite.name
+        m.newsletterAdminInviteMessage.newsletterName =
+            message.adminInvite.name
         m.newsletterAdminInviteMessage.caption = message.adminInvite.caption
-        m.newsletterAdminInviteMessage.inviteExpiration = message.adminInvite.expiration
-        m.newsletterAdminInviteMessage.contextInfo = message.contextInfo 
+        m.newsletterAdminInviteMessage.inviteExpiration =
+            message.adminInvite.expiration
+        m.newsletterAdminInviteMessage.contextInfo = message.contextInfo
 
         if (options.getProfilePicUrl) {
-            const pfpUrl = await options.getProfilePicUrl(message.adminInvite.jid)
-            const { thumbnail } = await messages_media_1.generateThumbnail(pfpUrl, 'image') 
+            const pfpUrl = await options.getProfilePicUrl(
+                message.adminInvite.jid
+            )
+            const { thumbnail } = await generateThumbnail(pfpUrl, "image")
             m.newsletterAdminInviteMessage.jpegThumbnail = thumbnail
         }
-
-        m.newsletterAdminInviteMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
-   }
-
-   else if ('pin' in message) {
-        m.pinInChatMessage = {}
-        m.messageContextInfo = {}
-
-        m.pinInChatMessage.key = message.pin.key
-        m.pinInChatMessage.type = message.pin?.type || 1
-        m.pinInChatMessage.senderTimestampMs = message.pin?.time || Date.now()
-        m.messageContextInfo.messageAddOnDurationInSecs = message.pin.type === 1 ? message.pin.time || 86400 : 0
-        m.messageContextInfo.messageAddOnExpiryType = WAProto_1.proto.MessageContextInfo.MessageAddonExpiryType.STATIC
-    }
-
-    else if ('keep' in message) {
+    } else if (hasNonNullishProperty(message, "keep")) {
         m.keepInChatMessage = {}
 
         m.keepInChatMessage.key = message.keep.key
         m.keepInChatMessage.keepType = message.keep?.type || 1
         m.keepInChatMessage.timestampMs = message.keep?.time || Date.now()
-    } 
-
-    else if ('call' in message) {
+    } else if (hasNonNullishProperty(message, "call")) {
         m.scheduledCallCreationMessage = {}
 
-        m.scheduledCallCreationMessage.scheduledTimestampMs = message.call?.time || Date.now()
+        m.scheduledCallCreationMessage.scheduledTimestampMs =
+            message.call?.time || Date.now()
         m.scheduledCallCreationMessage.callType = message.call?.type || 1
-        m.scheduledCallCreationMessage.title = message.call?.name || 'Call Creation'
+        m.scheduledCallCreationMessage.title =
+            message.call?.name || "Call Creation"
+    } else if (hasNonNullishProperty(message, "paymentInvite")) {
+        m.messageContextInfo = {}
+        m.paymentInviteMessage = {}
+
+        m.paymentInviteMessage.expiryTimestamp =
+            message.paymentInvite?.expiry || 0
+        m.paymentInviteMessage.serviceType = message.paymentInvite?.type || 2
+    } else if (hasNonNullishProperty(message, "ptv")) {
+        const { videoMessage } = await prepareWAMessageMedia(
+            { video: message.video },
+            options
+        )
+
+        m.ptvMessage = videoMessage
+    } else if (hasNonNullishProperty(message, "order")) {
+        m.orderMessage = WAProto.Message.OrderMessage.fromObject(message.order)
+    } else if (hasNonNullishProperty(message, "product")) {
+        const { imageMessage } = await prepareWAMessageMedia(
+            { image: message.product.productImage },
+            options
+        )
+
+        m.productMessage = WAProto.Message.ProductMessage.fromObject({
+            ...message,
+            product: {
+                ...message.product,
+                productImage: imageMessage,
+            },
+        })
+    } else if (hasNonNullishProperty(message, "album")) {
+        const imageMessages = message.album.filter((item) => "image" in item)
+        const videoMessages = message.album.filter((item) => "video" in item)
 
-        m.scheduledCallCreationMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        m.albumMessage = WAProto.Message.AlbumMessage.fromObject({
+            expectedImageCount: imageMessages.length,
+            expectedVideoCount: videoMessages.length,
+        })
+    } else if (hasNonNullishProperty(message, "event")) {
+        m.eventMessage = WAProto.Message.EventMessage.fromObject(message.event)
+
+        if (!message.event.startTime) {
+            m.eventMessage.startTime = unixTimestampSeconds() + 86400
         }
-    }
 
-    else if ('paymentInvite' in message) {
-            m.messageContextInfo = {}
-            m.paymentInviteMessage = {}
+        if (options.getCallLink && message.event.call) {
+            const link = await options.getCallLink(
+                message.event.call,
+                m.eventMessage.startTime
+            )
+            m.eventMessage.joinLink = link
+        }
+    } else if (hasNonNullishProperty(message, "pollResult")) {
+        if (!Array.isArray(message.pollResult.values)) {
+            throw new Boom("Invalid pollResult values", { statusCode: 400 })
+        }
 
-        m.paymentInviteMessage.expiryTimestamp = message.paymentInvite?.expiry || 0
-        m.paymentInviteMessage.serviceType = message.paymentInvite?.type || 2
+        const pollResultSnapshotMessage = {
+            name: message.pollResult.name,
+            pollVotes: message.pollResult.values.map(
+                ([optionName, optionVoteCount]) => ({
+                    optionName,
+                    optionVoteCount,
+                })
+            ),
+        }
+
+        m.pollResultSnapshotMessage = pollResultSnapshotMessage
+    } else if (hasNonNullishProperty(message, "poll")) {
+        if (!Array.isArray(message.poll.values)) {
+            throw new Boom("Invalid poll values", { statusCode: 400 })
+        }
+
+        if (
+            message.poll.selectableCount < 0 ||
+            message.poll.selectableCount > message.poll.values.length
+        ) {
+            throw new Boom(
+                `poll.selectableCount in poll should be >= 0 and <= ${message.poll.values.length}`,
+                { statusCode: 400 }
+            )
+        }
 
-        m.paymentInviteMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        const pollCreationMessage = {
+            name: message.poll.name,
+            selectableOptionsCount: message.poll?.selectableCount || 0,
+            options: message.poll.values.map((optionName) => ({ optionName })),
+        }
+
+        if (message.poll?.toAnnouncementGroup) {
+            m.pollCreationMessageV2 = pollCreationMessage
+        } else {
+            if (message.poll.selectableCount > 0) {
+                m.pollCreationMessageV3 = pollCreationMessage
+            } else {
+                m.pollCreationMessage = pollCreationMessage
+            }
         }
-   }
+    } else if (hasNonNullishProperty(message, "payment")) {
+        const requestPaymentMessage = {
+            amount: {
+                currencyCode: message.payment?.currency || "IDR",
+                offset: message.payment?.offset || 0,
+                value: message.payment?.amount || 999999999,
+            },
+            expiryTimestamp: message.payment?.expiry || 0,
+            amount1000: message.payment?.amount || 999999999 * 1000,
+            currencyCodeIso4217: message.payment?.currency || "IDR",
+            requestFrom: message.payment?.from || "0@s.whatsapp.net",
+            noteMessage: {
+                extendedTextMessage: {
+                    text: message.payment?.note || "Notes",
+                },
+            },
+            background: {
+                placeholderArgb:
+                    message.payment?.image?.placeholderArgb || 4278190080,
+                textArgb: message.payment?.image?.textArgb || 4294967295,
+                subtextArgb: message.payment?.image?.subtextArgb || 4294967295,
+                type: 1,
+            },
+        }
+
+        m.requestPaymentMessage = requestPaymentMessage
+    } else if (hasNonNullishProperty(message, "stickerPack")) {
+        const {
+            stickers,
+            cover,
+            name,
+            publisher,
+            packId,
+            description,
+        } = message.stickerPack
+
+        const { zip } = require("fflate")
+
+        const stickerData = {}
+        const stickerPromises = stickers.map(async (s, i) => {
+            const { stream } = await getStream(s.sticker)
+            const buffer = await toBuffer(stream)
+            const hash = sha256(buffer).toString("base64url")
+            const fileName = `${i.toString().padStart(2, "0")}_${hash}.webp`
+
+            stickerData[fileName] = [new Uint8Array(buffer), { level: 0 }]
+
+            return {
+                fileName,
+                mimetype: "image/webp",
+                isAnimated: s.isAnimated || false,
+                isLottie: s.isLottie || false,
+                emojis: s.emojis || [],
+                accessibilityLabel: s.accessibilityLabel || "",
+            }
+        })
+
+        const stickerMetadata = await Promise.all(stickerPromises)
+
+        const zipBuffer = await new Promise((resolve, reject) => {
+            zip(stickerData, (err, data) => {
+                if (err) {
+                    reject(err)
+                } else {
+                    resolve(Buffer.from(data))
+                }
+            })
+        })
 
-    else if ('buttonReply' in message) {
+        const coverBuffer = await toBuffer((await getStream(cover)).stream)
+
+        const [stickerPackUpload, coverUpload] = await Promise.all([
+            encryptedStream(zipBuffer, "sticker-pack", {
+                logger: options.logger,
+                opts: options.options,
+            }),
+            prepareWAMessageMedia(
+                { image: coverBuffer },
+                { ...options, mediaTypeOverride: "image" }
+            ),
+        ])
+
+        const stickerPackUploadResult = await options.upload(
+            stickerPackUpload.encFilePath,
+            {
+                fileEncSha256B64: stickerPackUpload.fileEncSha256.toString(
+                    "base64"
+                ),
+                mediaType: "sticker-pack",
+                timeoutMs: options.mediaUploadTimeoutMs,
+            }
+        )
+
+        const coverImage = coverUpload.imageMessage
+        const imageDataHash = sha256(coverBuffer).toString("base64")
+        const stickerPackId = packId || generateMessageID()
+
+        m.stickerPackMessage = {
+            name,
+            publisher,
+            stickerPackId,
+            packDescription: description,
+            stickerPackOrigin:
+                proto.Message.StickerPackMessage.StickerPackOrigin.THIRD_PARTY,
+            stickerPackSize: stickerPackUpload.fileLength,
+            stickers: stickerMetadata,
+            fileSha256: stickerPackUpload.fileSha256,
+            fileEncSha256: stickerPackUpload.fileEncSha256,
+            mediaKey: stickerPackUpload.mediaKey,
+            directPath: stickerPackUploadResult.directPath,
+            fileLength: stickerPackUpload.fileLength,
+            mediaKeyTimestamp: unixTimestampSeconds(),
+            trayIconFileName: `${stickerPackId}.png`,
+            imageDataHash,
+            thumbnailDirectPath: coverImage.directPath,
+            thumbnailFileSha256: coverImage.fileSha256,
+            thumbnailFileEncSha256: coverImage.fileEncSha256,
+            thumbnailHeight: coverImage.height,
+            thumbnailWidth: coverImage.width,
+        }
+    } else if (hasNonNullishProperty(message, "buttonReply")) {
         switch (message.type) {
-                case 'list':
+            case "list":
                 m.listResponseMessage = {
                     title: message.buttonReply.title,
                     description: message.buttonReply.description,
                     singleSelectReply: {
-                            selectedRowId: message.buttonReply.rowId
-                    }, 
-                    lisType: WAProto_1.proto.Message.ListResponseMessage.ListType.SINGLE_SELECT
+                        selectedRowId: message.buttonReply.rowId,
+                    },
+                    lisType:
+                        proto.Message.ListResponseMessage.ListType
+                            .SINGLE_SELECT,
                 }
                 break
-            case 'template':
+            case "template":
                 m.templateButtonReplyMessage = {
                     selectedDisplayText: message.buttonReply.displayText,
                     selectedId: message.buttonReply.id,
-                    selectedIndex: message.buttonReply.index
+                    selectedIndex: message.buttonReply.index,
                 }
                 break
-            case 'plain':
+            case "plain":
                 m.buttonsResponseMessage = {
                     selectedButtonId: message.buttonReply.id,
                     selectedDisplayText: message.buttonReply.displayText,
-                    type: WAProto_1.proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT
+                    type:
+                        proto.Message.ButtonsResponseMessage.Type.DISPLAY_TEXT,
                 }
                 break
-            case 'interactive':
+            case "interactive":
                 m.interactiveResponseMessage = {
                     body: {
-                       text: message.buttonReply.displayText,
-                       format: WAProto_1.proto.Message.InteractiveResponseMessage.Body.Format.EXTENSIONS_1 
-                    }, 
+                        text: message.buttonReply.displayText,
+                        format:
+                            proto.Message.InteractiveResponseMessage.Body.Format
+                                .EXTENSIONS_1,
+                    },
                     nativeFlowResponseMessage: {
-                            name: message.buttonReply.nativeFlows.name, 
-                        paramsJson: message.buttonReply.nativeFlows.paramsJson, 
-                        version: message.buttonReply.nativeFlows.version
-                    }
+                        name: message.buttonReply.nativeFlows.name,
+                        paramsJson: message.buttonReply.nativeFlows.paramsJson,
+                        version: message.buttonReply.nativeFlows.version,
+                    },
                 }
-                break          
+                break
+        }
+    } else if (hasNonNullishProperty(message, "sections")) {
+        m.listMessage = {
+            title: message.title,
+            buttonText: message.buttonText,
+            footerText: message.footer,
+            description: message.text,
+            sections: message.sections,
+            listType: proto.Message.ListMessage.ListType.SINGLE_SELECT,
+        }
+    } else if (hasNonNullishProperty(message, "productList")) {
+        const thumbnail = message.thumbnail
+            ? await generateThumbnail(message.thumbnail, "image")
+            : null
+
+        m.listMessage = {
+            title: message.title,
+            buttonText: message.buttonText,
+            footerText: message.footer,
+            description: message.text,
+            productListInfo: {
+                productSections: message.productList,
+                headerImage: {
+                    productId: message.productList[0].products[0].productId,
+                    jpegThumbnail: thumbnail?.thumbnail || null,
+                },
+                businessOwnerJid: message.businessOwnerJid,
+            },
+            listType: proto.Message.ListMessage.ListType.PRODUCT_LIST,
+        }
+    } else if (hasNonNullishProperty(message, "buttons")) {
+        const buttonsMessage = {
+            buttons: message.buttons.map((b) => ({
+                ...b,
+                type: proto.Message.ButtonsMessage.Button.Type.RESPONSE,
+            })),
         }
-    }
-
-    else if ('ptv' in message && message.ptv) {
-        const { videoMessage } = await prepareWAMessageMedia({ video: message.video }, options)
-
-        m.ptvMessage = videoMessage
-    }
 
-    else if ('album' in message) {
-            const imageMessages = message.album.filter(item => 'image' in item) 
-            const videoMessages = message.album.filter(item => 'video' in item) 
+        if (hasNonNullishProperty(message, "text")) {
+            buttonsMessage.contentText = message.text
+            buttonsMessage.headerType =
+                proto.Message.ButtonsMessage.HeaderType.EMPTY
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                buttonsMessage.contentText = message.caption
+            }
 
-            m.albumMessage = Types_1.WAProto.Message.AlbumMessage.fromObject({
-                    expectedImageCount: imageMessages.length, 
-                    expectedVideoCount: videoMessages.length
-            }) 
-    }
+            const type = Object.keys(m)[0].replace("Message", "").toUpperCase()
 
-    else if ('order' in message) {
-            m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject(message.order) 
+            buttonsMessage.headerType =
+                proto.Message.ButtonsMessage.HeaderType[type]
 
-        m.orderMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+            Object.assign(buttonsMessage, m)
         }
-    }
-
-    else if ('event' in message) { 
-       m.eventMessage = Types_1.WAProto.Message.EventMessage.fromObject(message.event) 
-
-       if (!message.event.startTime) {
-           m.eventMessage.startTime = generics_1.unixTimestampSeconds() + 86400
-       }
-
-       if (options.getCallLink && message.event.call) {
-           const link = await options.getCallLink(message.event.call, m.eventMessage.startTime) 
-           m.eventMessage.joinLink = link
-       }
 
+        if (hasNonNullishProperty(message, "title")) {
+            buttonsMessage.text = message.title
+            buttonsMessage.headerType =
+                proto.Message.ButtonsMessage.HeaderType.TEXT
+        }
 
-       m.eventMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        if (hasNonNullishProperty(message, "footer")) {
+            buttonsMessage.footerText = message.footer
         }
-   }   
 
-    else if ('product' in message) {
-        const { imageMessage } = await prepareWAMessageMedia({ image: message.product.productImage }, options)
+        m = { buttonsMessage }
+    } else if (hasNonNullishProperty(message, "templateButtons")) {
+        const hydratedTemplate = {
+            hydratedButtons: message.templateButtons,
+        }
 
-        m.productMessage = Types_1.WAProto.Message.ProductMessage.fromObject({
-            ...message,
-            product: {
-                ...message.product,
-                productImage: imageMessage,
+        if (hasNonNullishProperty(message, "text")) {
+            hydratedTemplate.hydratedContentText = message.text
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                hydratedTemplate.hydratedContentText = message.caption
             }
-        })
 
-        m.productMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+            Object.assign(msg, m)
         }
-    }
 
-    else if ('pollResult' in message) {
-            if (!Array.isArray(message.pollResult.values)) {
-            throw new boom_1.Boom('Invalid pollResult values', { statusCode: 400 })
+        if (hasNonNullishProperty(message, "footer")) {
+            hydratedTemplate.hydratedFooterText = message.footer
         }
 
-            const pollResultSnapshotMessage = {
-           name: message.pollResult.name,
-           pollVotes: message.pollResult.values.map(([optionName, optionVoteCount]) => ({
-               optionName,
-               optionVoteCount
-           }))
-       }
-
-       pollResultSnapshotMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        m = { templateMessage: { hydratedTemplate } }
+    } else if (hasNonNullishProperty(message, "interactiveButtons")) {
+        const interactiveMessage = {
+            nativeFlowMessage: {
+                buttons: message.interactiveButtons,
+            },
         }
 
-        m.pollResultSnapshotMessage = pollResultSnapshotMessage
-    } 
-
-    else if ('poll' in message) {
-        if (!Array.isArray(message.poll.values)) {
-            throw new boom_1.Boom('Invalid poll values', { statusCode: 400 })
+        if (hasNonNullishProperty(message, "text")) {
+            interactiveMessage.body = {
+                text: message.text,
+            }
         }
 
-        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 (hasNonNullishProperty(message, "title")) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: null,
+                hasMediaAttachment: false,
+            }
 
-        const pollCreationMessage = {
-            name: message.poll.name,
-            selectableOptionsCount: message.poll?.selectableCount || 0,
-            options: message.poll.values.map(optionName => ({ optionName })),
-         }
+            if (hasNonNullishProperty(message, "subtitle")) {
+                interactiveMessage.header.subtitle = message.subtitle
+            }
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                interactiveMessage.body = {
+                    text: message.caption,
+                }
 
-         pollCreationMessage.contextInfo = {
-             ...(message.contextInfo || {}),
-             ...(message.mentions ? { mentionedJid: message.mentions } : {})
-         }
+                interactiveMessage.header = {
+                    title: null,
+                    subtitle: null,
+                    hasMediaAttachment: false,
+                    ...Object.assign(interactiveMessage, m),
+                }
 
-         if(message.poll?.toAnnouncementGroup) {
-                        m.pollCreationMessageV2 = pollCreationMessage
-                } else {
-                        if(message.poll.selectableCount > 0) {
-                                m.pollCreationMessageV3 = pollCreationMessage
-                        } else {
-                                m.pollCreationMessage = pollCreationMessage
-                        }
+                if (hasNonNullishProperty(message, "title")) {
+                    interactiveMessage.header.title = message.title
                 }
-    } 
-
-   else if ('payment' in message) {           
-      const requestPaymentMessage = { 
-               amount: {
-                        currencyCode: message.payment?.currency || 'IDR',
-                        offset: message.payment?.offset || 0,
-                        value: message.payment?.amount || 999999999
-                },
-                expiryTimestamp: message.payment?.expiry || 0,
-                amount1000: message.payment?.amount || 999999999 * 1000,
-                currencyCodeIso4217: message.payment?.currency || 'IDR',
-                requestFrom: message.payment?.from || '0@s.whatsapp.net',
-                noteMessage: {
-                extendedTextMessage: {
-                          text: message.payment?.note || 'Notes'
-                    }
-             },
-             background: {                 
-                 placeholderArgb: message.payment?.image?.placeholderArgb || 4278190080, 
-                 textArgb: message.payment?.image?.textArgb || 4294967295, 
-                 subtextArgb: message.payment?.image?.subtextArgb || 4294967295,                  
-                 type: 1
-           }
-       }
 
-       requestPaymentMessage.noteMessage.extendedTextMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
+                if (hasNonNullishProperty(message, "subtitle")) {
+                    interactiveMessage.header.subtitle = message.subtitle
+                }
 
-        m.requestPaymentMessage = requestPaymentMessage
-   }
-
-   else if ('stickerPack' in message) {           
-       const { stickers, cover, name, publisher, packId, description } = message.stickerPack
-
-       const { zip } = require('fflate') 
-
-       const stickerData = {}
-       const stickerPromises = stickers.map(async (s, i) => {
-           const { stream } = await messages_media_1.getStream(s.sticker) 
-           const buffer = await messages_media_1.toBuffer(stream) 
-           const hash = crypto_2.sha256(buffer).toString('base64url') 
-           const fileName = `${i.toString().padStart(2, '0')}_${hash}.webp`
-           stickerData[fileName] = [new Uint8Array(buffer), { level: 0 }]
-
-           return {
-               fileName, 
-               mimetype: 'image/webp', 
-               isAnimated: s.isAnimated || false, 
-               isLottie: s.isLottie || false, 
-               emojis: s.emojis || [], 
-               accessibilityLabel: s.accessibilityLabel || ''
-           }
-       }) 
-
-       const stickerMetadata = await Promise.all(stickerPromises) 
-
-       const zipBuffer = await new Promise((resolve, reject) => {
-               zip(stickerData, (err, data) => {
-               if (err) {
-                   reject(err) 
-               } else {
-                   resolve(Buffer.from(data)) 
-               }
-           }) 
-       }) 
-
-       const coverBuffer = await messages_media_1.toBuffer((await messages_media_1.getStream(cover)).stream) 
-
-       const [stickerPackUpload, coverUpload] = await Promise.all([
-           messages_media_1.encryptedStream(zipBuffer, 'sticker-pack', { logger: options.logger, opts: options.options }), 
-           prepareWAMessageMedia({ image: coverBuffer }, { ...options, mediaTypeOverride: 'image' })
-       ]) 
-
-      const stickerPackUploadResult = await options.upload(stickerPackUpload.encFilePath, {
-          fileEncSha256B64: stickerPackUpload.fileEncSha256.toString('base64'), 
-          mediaType: 'sticker-pack', 
-          timeoutMs: options.mediaUploadTimeoutMs
-      }) 
-
-
-       const coverImage = coverUpload.imageMessage
-       const imageDataHash = crypto_2.sha256(coverBuffer).toString('base64') 
-       const stickerPackId = packId || generics_1.generateMessageID() 
-
-       m.stickerPackMessage = {
-            name, 
-            publisher, 
-            stickerPackId, 
-            packDescription: description, 
-            stickerPackOrigin: WAProto_1.proto.Message.StickerPackMessage.StickerPackOrigin.THIRD_PARTY, 
-            stickerPackSize: stickerPackUpload.fileLength, 
-            stickers: stickerMetadata, 
-            fileSha256: stickerPackUpload.fileSha256, 
-            fileEncSha256: stickerPackUpload.fileEncSha256, 
-            mediaKey: stickerPackUpload.mediaKey, 
-            directPath: stickerPackUploadResult.directPath, 
-            fileLength: stickerPackUpload.fileLength, 
-            mediaKeyTimestamp: generics_1.unixTimestampSeconds(), 
-            trayIconFileName: `${stickerPackId}.png`, 
-            imageDataHash, 
-            thumbnailDirectPath: coverImage.directPath, 
-            thumbnailFileSha256: coverImage.fileSha256, 
-            thumbnailFileEncSha256: coverImage.fileEncSha256, 
-            thumbnailHeight: coverImage.height, 
-            thumbnailWidth: coverImage.width
-        } 
-
-        m.stickerPackMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
-   }
-
-   else if ('sharePhoneNumber' in message) {
-        m.protocolMessage = {
-            type: Types_1.WAProto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
+                if (hasNonNullishProperty(message, "hasMediaAttachment")) {
+                    interactiveMessage.header.hasMediaAttachment = Boolean(
+                        message.hasMediaAttachment
+                    )
+                }
+            }
         }
-    }
 
-    else if ('requestPhoneNumber' in message) {
-        m.requestPhoneNumberMessage = {}
-    }
+        if (hasNonNullishProperty(message, "footer")) {
+            interactiveMessage.footer = {
+                text: message.footer,
+            }
+        }
 
-    else {
-        const mess = await prepareWAMessageMedia(message, options)
-        const [type] = Object.keys(mess) 
+        m = { interactiveMessage }
+    } else if (hasNonNullishProperty(message, "shop")) {
+        const interactiveMessage = {
+            shopStorefrontMessage: {
+                surface: message.shop.surface,
+                id: message.shop.id,
+            },
+        }
 
-        mess[type].contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        if (hasNonNullishProperty(message, "text")) {
+            interactiveMessage.body = {
+                text: message.text,
+            }
         }
 
-        m = mess
-    }
+        if (hasNonNullishProperty(message, "title")) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: null,
+                hasMediaAttachment: false,
+            }
 
-    if ('sections' in message && !!message.sections) {
-        const listMessage = {
-            title: message.title, 
-            buttonText: message.buttonText, 
-            footerText: message.footer, 
-            description: message.text, 
-            sections: message.sections, 
-            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
-        }
+            if (hasNonNullishProperty(message, "subtitle")) {
+                interactiveMessage.header.subtitle = message.subtitle
+            }
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                interactiveMessage.body = {
+                    text: message.caption,
+                }
 
-        listMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
-        }
+                interactiveMessage.header = {
+                    title: null,
+                    subtitle: null,
+                    hasMediaAttachment: false,
+                    ...Object.assign(interactiveMessage, m),
+                }
 
-        m = { listMessage }
-    }
+                if (hasNonNullishProperty(message, "title")) {
+                    interactiveMessage.header.title = message.title
+                }
 
-    else if ('productList' in message && !!message.productList) {
-            const thumbnail = message.thumbnail ? await messages_media_1.generateThumbnail(message.thumbnail, 'image') : null
+                if (hasNonNullishProperty(message, "subtitle")) {
+                    interactiveMessage.header.subtitle = message.subtitle
+                }
 
-        const listMessage = {
-            title: message.title, 
-            buttonText: message.buttonText, 
-            footerText: message.footer, 
-            description: message.text, 
-                productListInfo: {
-                    productSections: message.productList, 
-                headerImage: {
-                        productId: message.productList[0].products[0].productId, 
-                    jpegThumbnail: thumbnail?.thumbnail || null
-                }, 
-                businessOwnerJid: message.businessOwnerJid
-            }, 
-            listType: WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
+                if (hasNonNullishProperty(message, "hasMediaAttachment")) {
+                    interactiveMessage.header.hasMediaAttachment = Boolean(
+                        message.hasMediaAttachment
+                    )
+                }
+            }
         }
 
-        listMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        if (hasNonNullishProperty(message, "footer")) {
+            interactiveMessage.footer = {
+                text: message.footer,
+            }
         }
 
-        m = { listMessage }
-    }
-
-    else if ('buttons' in message && !!message.buttons) {        
-        const buttonsMessage = {
-            buttons: message.buttons.map(b => ({ ...b, type: WAProto_1.proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
+        m = { interactiveMessage }
+    } else if (hasNonNullishProperty(message, "collection")) {
+        const interactiveMessage = {
+            collectionMessage: {
+                bizJid: message.collection.bizJid,
+                id: message.collection.id,
+                messageVersion: message?.collection?.version,
+            },
         }
 
-        if ('text' in message) {
-            buttonsMessage.contentText = message.text
-            buttonsMessage.headerType = WAProto_1.proto.Message.ButtonsMessage.HeaderType.EMPTY
+        if (hasNonNullishProperty(message, "text")) {
+            interactiveMessage.body = {
+                text: message.text,
+            }
         }
 
-        else {
-            if ('caption' in message) {
-                buttonsMessage.contentText = message.caption
+        if (hasNonNullishProperty(message, "title")) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: null,
+                hasMediaAttachment: false,
             }
 
-            const type = Object.keys(m)[0].replace('Message', '').toUpperCase()
-
-            buttonsMessage.headerType = WAProto_1.proto.Message.ButtonsMessage.HeaderType[type]
+            if (hasNonNullishProperty(message, "subtitle")) {
+                interactiveMessage.header.subtitle = message.subtitle
+            }
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                interactiveMessage.body = {
+                    text: message.caption,
+                }
 
-            Object.assign(buttonsMessage, m)
-        }
+                interactiveMessage.header = {
+                    title: null,
+                    subtitle: null,
+                    hasMediaAttachment: false,
+                    ...Object.assign(interactiveMessage, m),
+                }
 
-        if ('footer' in message && !!message.footer) {
-            buttonsMessage.footerText = message.footer
-        }
+                if (hasNonNullishProperty(message, "title")) {
+                    interactiveMessage.header.title = message.title
+                }
 
-        if ('title' in message && !!message.title) {
-                buttonsMessage.text = message.title
-            buttonsMessage.headerType = WAProto_1.proto.Message.ButtonsMessage.HeaderType.TEXT
-        }
+                if (hasNonNullishProperty(message, "subtitle")) {
+                    interactiveMessage.header.subtitle = message.subtitle
+                }
 
-        buttonsMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+                if (hasNonNullishProperty(message, "hasMediaAttachment")) {
+                    interactiveMessage.header.hasMediaAttachment = Boolean(
+                        message.hasMediaAttachment
+                    )
+                }
+            }
         }
 
-        m = { buttonsMessage }
-    }
-
-    else if ('templateButtons' in message && !!message.templateButtons) {
-        const hydratedTemplate = {
-            hydratedButtons: message.templateButtons
+        if (hasNonNullishProperty(message, "footer")) {
+            interactiveMessage.footer = {
+                text: message.footer,
+            }
         }
 
-        if ('text' in message) {
-            hydratedTemplate.hydratedContentText = message.text
-        }
+        m = { interactiveMessage }
+    } else if (hasNonNullishProperty(message, "cards")) {
+        const slides = await Promise.all(
+            message.cards.map(async (slide) => {
+                const {
+                    image,
+                    video,
+                    product,
+                    title,
+                    body,
+                    footer,
+                    buttons,
+                } = slide
+
+                let header
+
+                if (product) {
+                    const { imageMessage } = await prepareWAMessageMedia(
+                        { image: product.productImage, ...options },
+                        options
+                    )
+                    header = {
+                        productMessage: {
+                            product: {
+                                ...product,
+                                productImage: imageMessage,
+                            },
+                            ...slide,
+                        },
+                    }
+                } else if (image) {
+                    header = await prepareWAMessageMedia(
+                        { image: image, ...options },
+                        options
+                    )
+                } else if (video) {
+                    header = await prepareWAMessageMedia(
+                        { video: video, ...options },
+                        options
+                    )
+                }
 
-        else {
-            if ('caption' in message) {
-                hydratedTemplate.hydratedContentText = message.caption
-            }
+                const msg = {
+                    header: {
+                        title,
+                        hasMediaAttachment: true,
+                        ...header,
+                    },
+                    body: {
+                        text: body,
+                    },
+                    footer: {
+                        text: footer,
+                    },
+                    nativeFlowMessage: {
+                        buttons,
+                    },
+                }
 
-            Object.assign(msg, m)
-        }
+                return msg
+            })
+        )
 
-        if ('footer' in message && !!message.footer) {
-            hydratedTemplate.hydratedFooterText = message.footer
+        const interactiveMessage = {
+            carouselMessage: {
+                cards: slides,
+            },
         }
 
-        hydratedTemplate.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        if (hasNonNullishProperty(message, "text")) {
+            interactiveMessage.body = {
+                text: message.text,
+            }
         }
 
-        m = { templateMessage: { hydratedTemplate }}
-    }
-
-    else if ('interactiveButtons' in message && !!message.interactiveButtons) {            
-            const interactiveMessage = {
-               nativeFlowMessage: {
-                 buttons: message.interactiveButtons
-          }
-      }
-
-      if ('text' in message) {
-              interactiveMessage.body = {
-             text: message.text
-          }, 
-          interactiveMessage.header = {
-             title: message.title,
-             subtitle: message.subtitle, 
-             hasMediaAttachment: false            
-          }
-      }
-
-      else {
-              if ('caption' in message) {
-              interactiveMessage.body = {
-              text: message.caption
-           }
-
-           interactiveMessage.header = {
-             title: message.title, 
-             subtitle: message.subtitle, 
-             hasMediaAttachment: message.hasMediaAttachment ? message.hasMediaAttachment : false, 
-             ...Object.assign(interactiveMessage, m)
-            }
-         }
-      } 
-
-      if ('footer' in message && !!message.footer) {
-              interactiveMessage.footer = {
-             text: message.footer
-          }
-      }
-
-      interactiveMessage.contextInfo = {
-          ...(message.contextInfo || {}),
-          ...(message.mentions ? { mentionedJid: message.mentions } : {})
-      } 
-
-      m = { interactiveMessage }
-   } 
-
-   else if ('shop' in message && !!message.shop) {
-            const interactiveMessage = {
-               shopStorefrontMessage: {
-                 surface: message.shop.surface, 
-             id: message.shop.id
-          }
-      } 
-
-      if ('text' in message) {
-              interactiveMessage.body = {
-             text: message.text
-          }, 
-          interactiveMessage.header = {
-             title: message.title,
-             subtitle: message.subtitle, 
-             hasMediaAttachment: false            
-          }
-      }
-
-      else {
-              if ('caption' in message) {
-              interactiveMessage.body = {
-              text: message.caption
-           }
-
-           interactiveMessage.header = {
-             title: message.title, 
-             subtitle: message.subtitle, 
-             hasMediaAttachment: message.hasMediaAttachment ? message.hasMediaAttachment : false, 
-             ...Object.assign(interactiveMessage, m)
+        if (hasNonNullishProperty(message, "title")) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: null,
+                hasMediaAttachment: false,
             }
-         }
-      } 
-
-      if ('footer' in message && !!message.footer) {
-              interactiveMessage.footer = {
-             text: message.footer
-          }
-      }
-
-      interactiveMessage.contextInfo = {
-          ...(message.contextInfo || {}),
-          ...(message.mentions ? { mentionedJid: message.mentions } : {})
-      } 
-
-      m = { interactiveMessage }
-    }  
-
-    else if ('collection' in message && !!message.collection) {
-            const interactiveMessage = {
-               collectionMessage: {
-                 bizJid: message.collection.bizJid, 
-             id: message.collection.id, 
-             messageVersion: message?.collection?.version
-          }
-      } 
-
-      if ('text' in message) {
-              interactiveMessage.body = {
-             text: message.text
-          }, 
-          interactiveMessage.header = {
-             title: message.title,
-             subtitle: message.subtitle, 
-             hasMediaAttachment: false            
-          }
-      }
-
-      else {
-              if ('caption' in message) {
-              interactiveMessage.body = {
-              text: message.caption
-           }
-           interactiveMessage.header = {
-             title: message.title, 
-             subtitle: message.subtitle, 
-             hasMediaAttachment: message.hasMediaAttachment ? message.hasMediaAttachment : false, 
-             ...Object.assign(interactiveMessage, m)
+
+            if (hasNonNullishProperty(message, "subtitle")) {
+                interactiveMessage.header.subtitle = message.subtitle
             }
-         }
-      } 
+        } else {
+            if (hasNonNullishProperty(message, "caption")) {
+                interactiveMessage.body = {
+                    text: message.caption,
+                }
 
-      if ('footer' in message && !message.footer) {
-              interactiveMessage.footer = {
-             text: message.footer
-          }
-      }
+                interactiveMessage.header = {
+                    title: null,
+                    subtitle: null,
+                    hasMediaAttachment: false,
+                    ...Object.assign(interactiveMessage, m),
+                }
 
-      interactiveMessage.contextInfo = {
-          ...(message.contextInfo || {}),
-          ...(message.mentions ? { mentionedJid: message.mentions } : {})
-      }
+                if (hasNonNullishProperty(message, "title")) {
+                    interactiveMessage.header.title = message.title
+                }
 
-      m = { interactiveMessage }
-    }
+                if (hasNonNullishProperty(message, "subtitle")) {
+                    interactiveMessage.header.subtitle = message.subtitle
+                }
 
-    else if ('cards' in message && !!message.cards) {
-        const slides = await Promise.all(message.cards.map(async (slide) => {
-            const { image, video, product, title, body, footer, buttons } = slide
-            let header
-
-            if (product) {
-                const { imageMessage } = await prepareWAMessageMedia({ image: product.productImage, ...options }, options)
-                header = {
-                    productMessage: {
-                        product: {
-                            ...product,
-                            productImage: imageMessage,
-                        },
-                        ...slide
-                    }
+                if (hasNonNullishProperty(message, "hasMediaAttachment")) {
+                    interactiveMessage.header.hasMediaAttachment = Boolean(
+                        message.hasMediaAttachment
+                    )
                 }
             }
+        }
 
-            else if (image) {
-                header = await prepareWAMessageMedia({ image: image, ...options }, options)
+        if (hasNonNullishProperty(message, "footer")) {
+            interactiveMessage.footer = {
+                text: message.footer,
             }
+        }
 
-            else if (video) {
-                header = await prepareWAMessageMedia({ video: video, ...options }, options)
-            }
+        m = { interactiveMessage }
+    } else if (hasNonNullishProperty(message, "text")) {
+        const extContent = { text: message.text }
 
-            const msg = {
-                header: {
-                    title,
-                    hasMediaAttachment: true,
-                    ...header
-                },
-                body: {
-                    text: body
-                },
-                footer: {
-                    text: footer
-                },
-                nativeFlowMessage: {
-                    buttons,
-                }
-            }
+        let urlInfo = message.linkPreview
 
-            return msg
-        }))
+        if (typeof urlInfo === "undefined") {
+            urlInfo = await generateLinkPreviewIfRequired(
+                message.text,
+                options.getUrlInfo,
+                options.logger
+            )
+        }
 
-        const interactiveMessage = {
-            carouselMessage: {
-                cards: slides
+        if (urlInfo) {
+            extContent.canonicalUrl = urlInfo["canonical-url"]
+            extContent.matchedText = urlInfo["matched-text"]
+            extContent.jpegThumbnail = urlInfo.jpegThumbnail
+            extContent.description = urlInfo.description
+            extContent.title = urlInfo.title
+            extContent.previewType = 0
+
+            const img = urlInfo.highQualityThumbnail
+
+            if (img) {
+                extContent.thumbnailDirectPath = img.directPath
+                extContent.mediaKey = img.mediaKey
+                extContent.mediaKeyTimestamp = img.mediaKeyTimestamp
+                extContent.thumbnailWidth = img.width
+                extContent.thumbnailHeight = img.height
+                extContent.thumbnailSha256 = img.fileSha256
+                extContent.thumbnailEncSha256 = img.fileEncSha256
             }
         }
 
-        if ('text' in message) {
-                interactiveMessage.body = {
-               text: message.text
-            }, 
-            interactiveMessage.header = {
-               title: message.title,
-               subtitle: message.subtitle, 
-               hasMediaAttachment: false            
-            }
+        if (options.backgroundColor) {
+            extContent.backgroundArgb = await assertColor(
+                options.backgroundColor
+            )
         }
 
-        if ('footer' in message && !!message.footer) {
-                interactiveMessage.footer = {
-               text: message.footer
-            }
+        if (options.textColor) {
+            extContent.textArgb = await assertColor(options.textColor)
         }
 
-        interactiveMessage.contextInfo = {
-            ...(message.contextInfo || {}),
-            ...(message.mentions ? { mentionedJid: message.mentions } : {})
+        if (options.font) {
+            extContent.font = options.font
         }
 
-        m = { interactiveMessage }
+        m.extendedTextMessage = extContent
+    } else if (hasMedia) {
+        m = await prepareWAMessageMedia(message, options)
     }
 
-    if ('ephemeral' in message && !!message.ephemeral) {
-            m = { ephemeralMessage: { message: m } }
-    }   
+    if (hasOptionalProperty(message, "ephemeral")) {
+        m = { ephemeralMessage: { message: m } }
+    }
 
-    if ('viewOnce' in message && !!message.viewOnce) {
-        m = { viewOnceMessageV2: { message: m } }
+    if (hasOptionalProperty(message, "mentions") && 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 ('viewOnceExt' in message && !!message.viewOnceExt) {
-        m = { viewOnceMessageV2Extension: { message: m } }
+    if (hasOptionalProperty(message, "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
+        }
     }
 
-    if ('edit' in message) {
+    if (hasOptionalProperty(message, "edit")) {
         m = {
             protocolMessage: {
                 key: message.edit,
                 editedMessage: m,
                 timestampMs: Date.now(),
-                type: Types_1.WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT
-            }
+                type: WAProto.Message.ProtocolMessage.Type.MESSAGE_EDIT,
+            },
         }
     }
 
-    return Types_1.WAProto.Message.fromObject(m)
+    return WAProto.Message.fromObject(m)
 }
 
 const generateWAMessageFromContent = (jid, message, options) => {
@@ -1265,11 +1338,11 @@ const generateWAMessageFromContent = (jid, message, options) => {
 
     const innerMessage = normalizeMessageContent(message)
     const key = getContentType(innerMessage)
-    const timestamp = generics_1.unixTimestampSeconds(options.timestamp)
+    const timestamp = unixTimestampSeconds(options.timestamp)
     const threadId = []
     const { quoted, userJid } = options
 
-    if (quoted && !WABinary_1.isJidNewsletter(jid)) {
+    if (quoted && !isJidNewsletter(jid)) {
         const participant = quoted.key.fromMe
             ? userJid
             : quoted.participant || quoted.key.participant || quoted.key.remoteJid
@@ -1277,7 +1350,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         let quotedMsg = normalizeMessageContent(quoted.message)
         const msgType = getContentType(quotedMsg)
 
-        quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] })
+        quotedMsg = proto.Message.fromObject({ [msgType]: quotedMsg[msgType] })
 
         const quotedContent = quotedMsg[msgType]
 
@@ -1297,7 +1370,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
 
         const contextInfo = (key === 'requestPaymentMessage' ? requestPayment?.contextInfo : innerMessage[key].contextInfo) || {}
 
-        contextInfo.participant = WABinary_1.jidNormalizedUser(participant)
+        contextInfo.participant = jidNormalizedUser(participant)
         contextInfo.stanzaId = quoted.key.id
         contextInfo.quotedMessage = quotedMsg
 
@@ -1306,16 +1379,16 @@ const generateWAMessageFromContent = (jid, message, options) => {
         }
 
         if (contextInfo.quotedMessage) {
-            contextInfo.quotedType = WAProto_1.proto.ContextInfo.QuotedType.EXPLICIT
+            contextInfo.quotedType = proto.ContextInfo.QuotedType.EXPLICIT
         }
 
-        if (contextInfo.quotedMessage && WABinary_1.isJidGroup(jid)) {
+        if (contextInfo.quotedMessage && isJidGroup(jid)) {
             threadId.push({
-                threadType: WAProto_1.proto.ThreadID.ThreadType.VIEW_REPLIES, 
+                threadType: proto.ThreadID.ThreadType.VIEW_REPLIES, 
                 threadKey: {
                     remoteJid: quoted?.key?.remoteJid, 
                     fromMe: quoted?.key?.fromMe, 
-                    id: generics_1.generateMessageID(), 
+                    id: generateMessageID(), 
                     ...(quoted?.key?.fromMe ? {} : { participant: quoted?.key?.participant }) 
                 }
             })  
@@ -1330,10 +1403,10 @@ const generateWAMessageFromContent = (jid, message, options) => {
 
     if (key !== 'protocolMessage' &&
         key !== 'ephemeralMessage' &&
-        !WABinary_1.isJidNewsletter(jid)) { 
+        !isJidNewsletter(jid)) { 
         message.messageContextInfo = {
             threadId: threadId.length > 0 ? threadId : [], 
-            messageSecret: crypto_1.randomBytes(32), 
+            messageSecret: randomBytes(32), 
             ...message.messageContextInfo
         }
         innerMessage[key].contextInfo = {
@@ -1342,34 +1415,34 @@ const generateWAMessageFromContent = (jid, message, options) => {
         }
     }
 
-    message = Types_1.WAProto.Message.fromObject(message)
+    message = WAProto.Message.fromObject(message)
 
     const messageJSON = {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: options?.messageId || generics_1.generateMessageID()
+            id: options?.messageId || generateMessageID()
         },
         message: message,
         messageTimestamp: timestamp,
         messageStubParameters: [],
-        participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? userJid : undefined,
-        status: Types_1.WAMessageStatus.PENDING
+        participant: isJidGroup(jid) || isJidStatusBroadcast(jid) ? userJid : undefined,
+        status: WAMessageStatus.PENDING
     }
 
-    return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
+    return WAProto.WebMessageInfo.fromObject(messageJSON)
 }
 
 const generateWAMessage = async (jid, content, options) => {
     options.logger = options?.logger?.child({ msgId: options.messageId })
 
-    return generateWAMessageFromContent(jid, await generateWAMessageContent(content, { newsletter: WABinary_1.isJidNewsletter(jid), ...options }), options)
+    return generateWAMessageFromContent(jid, await generateWAMessageContent(content, { newsletter: isJidNewsletter(jid), ...options }), options)
 }
 
 const getContentType = (content) => {
     if (content) {
         const keys = Object.keys(content)
-        const key = keys.find(k => (k === 'conversation' || k.endsWith('Message') || k.endsWith('V2') || k.endsWith('V3') || k.endsWith('V4') || k.endsWith('V5')) && k !== 'senderKeyDistributionMessage' && k !== 'messageContextInfo')
+        const key = keys.find(k => (k === 'conversation' || k.endsWith('Message') || k.endsWith('V2') || k.endsWith('V3') || k.endsWith('V4')) && k !== 'senderKeyDistributionMessage' && k !== 'messageContextInfo')
 
         return key
     }
@@ -1416,7 +1489,6 @@ const normalizeMessageContent = (content) => {
             || (message?.statusMentionMessage)
             || (message?.groupStatusMessageV2) 
             || (message?.pollCreationMessageV4)
-            || (message?.pollCreationMessageV5)             
             || (message?.associatedChildMessage)
             || (message?.groupMentionedMessage)             
             || (message?.groupStatusMentionMessage) 
@@ -1517,9 +1589,9 @@ const updateMessageWithReceipt = (msg, receipt) => {
 
 /** Update the message with a new reaction */
 const updateMessageWithReaction = (msg, reaction) => {
-    const authorID = generics_1.getKeyAuthor(reaction.key)
+    const authorID = getKeyAuthor(reaction.key)
     const reactions = (msg.reactions || [])
-        .filter(r => generics_1.getKeyAuthor(r.key) !== authorID)
+        .filter(r => getKeyAuthor(r.key) !== authorID)
 
     reaction.text = reaction.text || ''
     reactions.push(reaction) 
@@ -1528,9 +1600,9 @@ const updateMessageWithReaction = (msg, reaction) => {
 
 /** Update the message with a new poll update */
 const updateMessageWithPollUpdate = (msg, update) => {
-    const authorID = generics_1.getKeyAuthor(update.pollUpdateMessageKey)
+    const authorID = getKeyAuthor(update.pollUpdateMessageKey)
     const votes = (msg.pollUpdates || [])
-        .filter(r => generics_1.getKeyAuthor(r.pollUpdateMessageKey) !== authorID)
+        .filter(r => getKeyAuthor(r.pollUpdateMessageKey) !== authorID)
 
     if (update.vote?.selectedOptions?.length) {
         votes.push(update)
@@ -1541,10 +1613,10 @@ const updateMessageWithPollUpdate = (msg, update) => {
 
 /** Update the message with a new event response*/
 const updateMessageWithEventResponse = (msg, update) => {
-    const authorID = generics_1.getKeyAuthor(update.eventResponseMessageKey)
+    const authorID = getKeyAuthor(update.eventResponseMessageKey)
     const responses = (msg.eventResponses || [])
-    	.filter(r => generics_1.getKeyAuthor(r.eventResponseMessageKey) !== authorID)
-    
+            .filter(r => getKeyAuthor(r.eventResponseMessageKey) !== authorID)
+
     responses.push(update) 
     msg.eventResponses = responses
 }
@@ -1561,7 +1633,7 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     const opts = message?.pollCreationMessage?.options || message?.pollCreationMessageV2?.options || message?.pollCreationMessageV3?.options || []
 
     const voteHashMap = opts.reduce((acc, opt) => {
-        const hash = crypto_2.sha256(Buffer.from(opt.optionName || '')).toString()
+        const hash = sha256(Buffer.from(opt.optionName || '')).toString()
         acc[hash] = {
             name: opt.optionName || '',
             voters: []
@@ -1590,7 +1662,7 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
                 data = voteHashMap[hash]
             }
 
-            voteHashMap[hash].voters.push(generics_1.getKeyAuthor(update.pollUpdateMessageKey, meId))
+            voteHashMap[hash].voters.push(getKeyAuthor(update.pollUpdateMessageKey, meId))
         }
     }
 
@@ -1608,18 +1680,18 @@ function getAggregateResponsesInEventMessage({ eventResponses }, meLid) {
     const responseMap = {}
 
     for (const type of responseTypes) {
-    	responseMap[type] = {
-    		response: type, 
-    		responders: []
-    	}
+            responseMap[type] = {
+                    response: type, 
+                    responders: []
+            }
     }
-    
+
     for (const update of eventResponses) {
-    	const { response } = update.response || 0
-    	const responseType = WAProto_1.proto.Message.EventResponseMessage.EventResponseType[response]
-    	if (responseType !== 'UNKNOWN' && responseMap[responseType]) {
-    		responseMap[responseType].responders.push(generics_1.getKeyAuthor(update.eventResponseMessageKey, meLid)) 
-    	}
+            const { response } = update.response || 0
+            const responseType = proto.Message.EventResponseMessage.EventResponseType[response]
+            if (responseType !== 'UNKNOWN' && responseMap[responseType]) {
+                    responseMap[responseType].responders.push(getKeyAuthor(update.eventResponseMessageKey, meLid)) 
+            }
     }
 
     return Object.values(responseMap)
@@ -1655,40 +1727,42 @@ const REUPLOAD_REQUIRED_STATUS = [410, 404]
  */
 const downloadMediaMessage = async (message, type, options, ctx) => {
     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)) {
+        if (ctx &&
+            typeof error?.status === 'number' && // treat errors with status as HTTP failures requiring reupload
+            REUPLOAD_REQUIRED_STATUS.includes(error.status)) {
             ctx.logger.info({ key: message.key }, 'sending reupload media request...')
-
+            
             // request reupload
             message = await ctx.reuploadRequest(message)
-
+            
             const result = await downloadMsg()
-
             return result
         }
-
+        
         throw error
     })
-
+    
     return result
-
+    
     async function downloadMsg() {
         const mContent = extractMessageContent(message.message)
-
+        
         if (!mContent) {
-            throw new boom_1.Boom('No message present', { statusCode: 400, data: message })
+            throw new Boom('No message present', { statusCode: 400, data: message })
         }
-
+        
         const contentType = getContentType(mContent)
+        
         let mediaType = contentType?.replace('Message', '')
+        
         const media = contentType === 'productMessage' ? mContent[contentType]?.product?.productImage : 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`)
+            throw new Boom(`"${contentType}" message is not a media message`)
         }
-
+        
         let download
-
+        
         if ('thumbnailDirectPath' in media && !('url' in media)) {
             download = {
                 directPath: media.thumbnailDirectPath,
@@ -1696,68 +1770,40 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
             }
             mediaType = 'thumbnail-link'
         }
-
         else {
             download = media
         }
-
-        const stream = await messages_media_1.downloadContentFromMessage(download, mediaType, options)
-
+        
+        const stream = await downloadContentFromMessage(download, mediaType, options)
+        
         if (type === 'buffer') {
             const bufferArray = []
-
             for await (const chunk of stream) {
-                bufferArray.push(chunk)
+                bufferArray.push(chunk);
             }
-
-            return Buffer.concat(bufferArray)
+            return Buffer.concat(bufferArray);
         }
-
         return stream
     }
 }
 
-/** Checks whether the given message is a media message if it is returns the inner content */
+/** Checks whether the given message is a media message; if it is returns the inner content */
 const assertMediaContent = (content) => {
     content = extractMessageContent(content)
-
-    const mediaContent = content?.documentMessage
-                || content?.imageMessage
-                || content?.videoMessage
-                || content?.audioMessage
-                || 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 })
+        throw new Boom('given message is not a media message', { statusCode: 400, data: content });
     }
+    
     return mediaContent
 }
 
-/**
- * this is an experimental patch to make buttons work
- * Don't know how it works, but it does for now
- */
-const patchMessageForMdIfRequired = (message) => {
-        if (message?.buttonsMessage || 
-            message?.templateMessage ||
-            message?.listMessage ||
-            message?.interactiveMessage?.nativeFlowMesaage
-        ) {
-        message = {
-            viewOnceMessageV2Extension: {
-                message: {
-                    messageContextInfo: {
-                       deviceListMetadataVersion: 2,
-                         deviceListMetadata: {}
-                       }, 
-                    ...message
-                }
-            }
-        }
-    }
-    return message
-}
-
 module.exports = {
   extractUrlFromText, 
   generateLinkPreviewIfRequired, 
@@ -1769,6 +1815,7 @@ module.exports = {
   generateWAMessageFromContent, 
   generateWAMessage, 
   getContentType, 
+  hasNonNullishProperty, 
   normalizeMessageContent, 
   extractMessageContent, 
   getDevice,  
@@ -1780,6 +1827,5 @@ module.exports = {
   getAggregateResponsesInEventMessage, 
   aggregateMessageKeysNotFromMe, 
   downloadMediaMessage, 
-  assertMediaContent, 
-  patchMessageForMdIfRequired
+  assertMediaContent
 }