@nexustechpro/baileys 1.1.4 → 1.1.5

package/lib/Socket/messages-send.js

@@ -17,13 +17,13 @@ const {
     extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage,
     getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager,
     normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds,
-    generateWAMessageFromContent, delay, generateMessageID
+    generateWAMessageFromContent, delay
 } = Utils
 
 const {
     areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser,
     isJidGroup, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET,
-    getBinaryFilteredButtons, STORIES_JID, isJidUser, isJidNewsletter, getButtonArgs, getButtonType
+    getBinaryFilteredButtons, STORIES_JID, isJidUser, getButtonArgs, getButtonType
 } = WABinary
 
 export const makeMessagesSocket = (config) => {
@@ -282,183 +282,195 @@ export const makeMessagesSocket = (config) => {
     }
 
     // ===== RELAY MESSAGE =====
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList } = {}) => {
-        const meId = authState.creds.me.id
-        const meLid = authState.creds.me?.lid
-        const isRetryResend = Boolean(participant?.jid)
-        let shouldIncludeDeviceIdentity = isRetryResend
-
-        const { user, server } = jidDecode(jid)
-        const isGroup = server === 'g.us'
-        const isStatus = jid === 'status@broadcast'
-        const isLid = server === 'lid'
-        const isNewsletter = server === 'newsletter'
-
-        msgId = msgId || generateMessageIDV2(meId)
-        useUserDevicesCache = useUserDevicesCache !== false
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
+const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, quoted } = {}) => {
+    const meId = authState.creds.me.id
+    const meLid = authState.creds.me?.lid
+    const isRetryResend = Boolean(participant?.jid)
+    let shouldIncludeDeviceIdentity = isRetryResend
+    let finalMsgId = msgId
+
+    // Check if message is already in proper WAMessage format
+    const hasProtoMessageType = Object.keys(message).some(key => key.endsWith('Message') || key === 'conversation')
+    
+    if (!hasProtoMessageType) {
+        logger.debug({ jid }, 'relayMessage: auto-generating message from raw content')
+        const generatedMsg = await generateWAMessage(jid, message, { logger, userJid: meId, getUrlInfo: text => getUrlInfo(text, { thumbnailWidth: linkPreviewImageThumbnailWidth, fetchOpts: { timeout: 3000, ...(httpRequestOptions || {}) }, logger, uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined }), getProfilePicUrl: sock.profilePictureUrl, getCallLink: sock.createCallLink, upload: waUploadToServer, mediaCache: config.mediaCache, options: config.options, messageId: finalMsgId || generateMessageIDV2(meId), quoted: quoted })
+        message = generatedMsg.message
+        if (!finalMsgId) finalMsgId = generatedMsg.key.id
+        logger.debug({ msgId: finalMsgId, jid }, 'message auto-generated successfully')
+    }
 
-        const participants = []
-        const destinationJid = !isStatus ? jid : 'status@broadcast'
-        const binaryNodeContent = []
-        const devices = []
+    const { user, server } = jidDecode(jid)
+    const isGroup = server === 'g.us'
+    const isStatus = jid === 'status@broadcast'
+    const isLid = server === 'lid'
+    const isNewsletter = server === 'newsletter'
+
+    finalMsgId = finalMsgId || generateMessageIDV2(meId)
+    useUserDevicesCache = useUserDevicesCache !== false
+    useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
+
+    const participants = []
+    const destinationJid = !isStatus ? jid : 'status@broadcast'
+    const binaryNodeContent = []
+    const devices = []
+
+    const meMsg = { deviceSentMessage: { destinationJid, message }, messageContextInfo: message.messageContextInfo }
+    const extraAttrs = {}
+    const messages = normalizeMessageContent(message)
+    const buttonType = getButtonType(messages)
+
+    if (participant) {
+        if (!isGroup && !isStatus) additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
+        const { user, device } = jidDecode(participant.jid)
+        devices.push({ user, device, jid: participant.jid })
+    }
 
-        const meMsg = { deviceSentMessage: { destinationJid, message }, messageContextInfo: message.messageContextInfo }
-        const extraAttrs = {}
-        const messages = normalizeMessageContent(message)
-        const buttonType = getButtonType(messages)
+    await authState.keys.transaction(async () => {
+        const mediaType = getMediaType(message)
+        if (mediaType) extraAttrs.mediatype = mediaType
 
-        if (participant) {
-            if (!isGroup && !isStatus) additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
-            const { user, device } = jidDecode(participant.jid)
-            devices.push({ user, device, jid: participant.jid })
+        if (isNewsletter) {
+            const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message
+            const bytes = encodeNewsletterMessage(patched)
+            binaryNodeContent.push({ tag: 'plaintext', attrs: {}, content: bytes })
+            const stanza = { tag: 'message', attrs: { to: jid, id: finalMsgId, type: getMessageType(message), ...(additionalAttributes || {}) }, content: binaryNodeContent }
+            logger.debug({ msgId: finalMsgId }, `sending newsletter message to ${jid}`)
+            await sendNode(stanza)
+            return
         }
 
-        await authState.keys.transaction(async () => {
-            const mediaType = getMediaType(message)
-            if (mediaType) extraAttrs.mediatype = mediaType
-
-            if (isNewsletter) {
-                const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message
-                const bytes = encodeNewsletterMessage(patched)
-                binaryNodeContent.push({ tag: 'plaintext', attrs: {}, content: bytes })
-                const stanza = { tag: 'message', attrs: { to: jid, id: msgId, type: getMessageType(message), ...(additionalAttributes || {}) }, content: binaryNodeContent }
-                logger.debug({ msgId }, `sending newsletter message to ${jid}`)
-                await sendNode(stanza)
-                return
-            }
-
-            if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) extraAttrs['decrypt-fail'] = 'hide'
-
-            if (isGroup || isStatus) {
-                const [groupData, senderKeyMap] = await Promise.all([
-                    (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
-                        if (groupData?.participants) logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
-                        else if (!isStatus) groupData = await groupMetadata(jid)
-                        return groupData
-                    })(),
-                    (async () => !participant && !isStatus ? (await authState.keys.get('sender-key-memory', [jid]))[jid] || {} : {})()
-                ])
-
-                if (!participant) {
-                    const participantsList = []
-                    if (isStatus) { if (statusJidList?.length) participantsList.push(...statusJidList) } 
-                    else {
-                        let groupAddressingMode = 'lid'
-                        if (groupData) { participantsList.push(...groupData.participants.map(p => p.id)); groupAddressingMode = groupData?.addressingMode || groupAddressingMode }
-                        additionalAttributes = { ...additionalAttributes, addressing_mode: groupAddressingMode }
-                    }
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
-                    devices.push(...additionalDevices)
+        if (messages.pinInChatMessage || messages.keepInChatMessage || message.reactionMessage || message.protocolMessage?.editedMessage) extraAttrs['decrypt-fail'] = 'hide'
+
+        if (isGroup || isStatus) {
+            const [groupData, senderKeyMap] = await Promise.all([
+                (async () => {
+                    let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
+                    if (groupData?.participants) logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
+                    else if (!isStatus) groupData = await groupMetadata(jid)
+                    return groupData
+                })(),
+                (async () => !participant && !isStatus ? (await authState.keys.get('sender-key-memory', [jid]))[jid] || {} : {})()
+            ])
+
+            if (!participant) {
+                const participantsList = []
+                if (isStatus) { if (statusJidList?.length) participantsList.push(...statusJidList) } 
+                else {
+                    let groupAddressingMode = 'lid'
+                    if (groupData) { participantsList.push(...groupData.participants.map(p => p.id)); groupAddressingMode = groupData?.addressingMode || groupAddressingMode }
+                    additionalAttributes = { ...additionalAttributes, addressing_mode: groupAddressingMode }
                 }
+                const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
+                devices.push(...additionalDevices)
+            }
 
-                if (groupData?.ephemeralDuration > 0) additionalAttributes = { ...additionalAttributes, expiration: groupData.ephemeralDuration.toString() }
+            if (groupData?.ephemeralDuration > 0) additionalAttributes = { ...additionalAttributes, expiration: groupData.ephemeralDuration.toString() }
 
-                const patched = await patchMessageBeforeSending(message)
-                if (Array.isArray(patched)) throw new Boom('Per-jid patching not supported in groups')
+            const patched = await patchMessageBeforeSending(message)
+            if (Array.isArray(patched)) throw new Boom('Per-jid patching not supported in groups')
 
-                const bytes = encodeWAMessage(patched)
-                const groupAddressingMode = additionalAttributes?.addressing_mode || groupData?.addressingMode || 'lid'
-                const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId
+            const bytes = encodeWAMessage(patched)
+            const groupAddressingMode = additionalAttributes?.addressing_mode || groupData?.addressingMode || 'lid'
+            const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId
 
-                const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({ group: destinationJid, data: bytes, meId: groupSenderIdentity })
+            const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({ group: destinationJid, data: bytes, meId: groupSenderIdentity })
 
-                const senderKeyRecipients = []
-                for (const device of devices) {
-                    const deviceJid = device.jid
-                    const hasKey = !!senderKeyMap[deviceJid]
-                    if ((!hasKey || !!participant) && !isHostedLidUser(deviceJid) && !isHostedPnUser(deviceJid) && device.device !== 99) { senderKeyRecipients.push(deviceJid); senderKeyMap[deviceJid] = true }
-                }
+            const senderKeyRecipients = []
+            for (const device of devices) {
+                const deviceJid = device.jid
+                const hasKey = !!senderKeyMap[deviceJid]
+                if ((!hasKey || !!participant) && !isHostedLidUser(deviceJid) && !isHostedPnUser(deviceJid) && device.device !== 99) { senderKeyRecipients.push(deviceJid); senderKeyMap[deviceJid] = true }
+            }
 
-                if (senderKeyRecipients.length) {
-                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending sender key')
-                    const senderKeyMsg = { senderKeyDistributionMessage: { axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage, groupId: destinationJid } }
-                    await assertSessions(senderKeyRecipients)
-                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs)
-                    shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity
-                    participants.push(...result.nodes)
-                }
+            if (senderKeyRecipients.length) {
+                logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending sender key')
+                const senderKeyMsg = { senderKeyDistributionMessage: { axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage, groupId: destinationJid } }
+                await assertSessions(senderKeyRecipients)
+                const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs)
+                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity
+                participants.push(...result.nodes)
+            }
 
-                if (isRetryResend) {
-                    const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({ data: bytes, jid: participant?.jid })
-                    binaryNodeContent.push({ tag: 'enc', attrs: { v: '2', type, count: participant.count.toString() }, content: encryptedContent })
-                } else {
-                    binaryNodeContent.push({ tag: 'enc', attrs: { v: '2', type: 'skmsg', ...extraAttrs }, content: ciphertext })
-                    await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } })
-                }
+            if (isRetryResend) {
+                const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({ data: bytes, jid: participant?.jid })
+                binaryNodeContent.push({ tag: 'enc', attrs: { v: '2', type, count: participant.count.toString() }, content: encryptedContent })
             } else {
-                let ownId = meId
-                if (isLid && meLid) { ownId = meLid; logger.debug({ to: jid, ownId }, 'Using LID identity') }
-
-                const { user: ownUser } = jidDecode(ownId)
+                binaryNodeContent.push({ tag: 'enc', attrs: { v: '2', type: 'skmsg', ...extraAttrs }, content: ciphertext })
+                await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } })
+            }
+        } else {
+            let ownId = meId
+            if (isLid && meLid) { ownId = meLid; logger.debug({ to: jid, ownId }, 'Using LID identity') }
 
-                if (!participant) {
-                    const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
-                    devices.push({ user, device: 0, jid: jidEncode(user, targetUserServer, 0) })
+            const { user: ownUser } = jidDecode(ownId)
 
-                    if (user !== ownUser) {
-                        const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
-                        const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user
-                        devices.push({ user: ownUserForAddressing, device: 0, jid: jidEncode(ownUserForAddressing, ownUserServer, 0) })
-                    }
+            if (!participant) {
+                const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                devices.push({ user, device: 0, jid: jidEncode(user, targetUserServer, 0) })
 
-                    if (additionalAttributes?.category !== 'peer') {
-                        devices.length = 0
-                        const senderIdentity = isLid && meLid ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined) : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined)
-                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false)
-                        devices.push(...sessionDevices)
-                    }
+                if (user !== ownUser) {
+                    const ownUserServer = isLid ? 'lid' : 's.whatsapp.net'
+                    const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user
+                    devices.push({ user: ownUserForAddressing, device: 0, jid: jidEncode(ownUserForAddressing, ownUserServer, 0) })
                 }
 
-                const allRecipients = [], meRecipients = [], otherRecipients = []
-                const { user: mePnUser } = jidDecode(meId)
-                const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null }
-
-                for (const { user, jid } of devices) {
-                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
-                    if (isExactSenderDevice) continue
-                    const isMe = user === mePnUser || user === meLidUser
-                    if (isMe) meRecipients.push(jid)
-                    else otherRecipients.push(jid)
-                    allRecipients.push(jid)
+                if (additionalAttributes?.category !== 'peer') {
+                    devices.length = 0
+                    const senderIdentity = isLid && meLid ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined) : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined)
+                    const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false)
+                    devices.push(...sessionDevices)
                 }
+            }
 
-                await assertSessions(allRecipients)
-
-                const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
-                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
-                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
-                ])
+            const allRecipients = [], meRecipients = [], otherRecipients = []
+            const { user: mePnUser } = jidDecode(meId)
+            const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null }
 
-                participants.push(...meNodes, ...otherNodes)
-                if (meRecipients.length > 0 || otherRecipients.length > 0) extraAttrs.phash = generateParticipantHashV2([...meRecipients, ...otherRecipients])
-                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
+            for (const { user, jid } of devices) {
+                const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
+                if (isExactSenderDevice) continue
+                const isMe = user === mePnUser || user === meLidUser
+                if (isMe) meRecipients.push(jid)
+                else otherRecipients.push(jid)
+                allRecipients.push(jid)
             }
 
-            if (participants.length) {
-                if (additionalAttributes?.category === 'peer') { const peerNode = participants[0]?.content?.[0]; if (peerNode) binaryNodeContent.push(peerNode) } 
-                else binaryNodeContent.push({ tag: 'participants', attrs: {}, content: participants })
-            }
+            await assertSessions(allRecipients)
 
-            const stanza = { tag: 'message', attrs: { id: msgId, to: destinationJid, type: getMessageType(message), ...(additionalAttributes || {}) }, content: binaryNodeContent }
+            const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
+                createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
+                createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
+            ])
 
-            if (participant) {
-                if (isJidGroup(destinationJid)) { stanza.attrs.to = destinationJid; stanza.attrs.participant = participant.jid } 
-                else if (areJidsSameUser(participant.jid, meId)) { stanza.attrs.to = participant.jid; stanza.attrs.recipient = destinationJid } 
-                else stanza.attrs.to = participant.jid
-            } else stanza.attrs.to = destinationJid
+            participants.push(...meNodes, ...otherNodes)
+            if (meRecipients.length > 0 || otherRecipients.length > 0) extraAttrs.phash = generateParticipantHashV2([...meRecipients, ...otherRecipients])
+            shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
+        }
 
-            let additionalAlready = false
-            if (!isNewsletter && buttonType) {
-                const buttonsNode = getButtonArgs(messages)
-                const filteredButtons = getBinaryFilteredButtons(additionalNodes || [])
-                if (filteredButtons) { stanza.content.push(...additionalNodes); additionalAlready = true } 
-                else stanza.content.push(buttonsNode)
-            }
+        if (participants.length) {
+            if (additionalAttributes?.category === 'peer') { const peerNode = participants[0]?.content?.[0]; if (peerNode) binaryNodeContent.push(peerNode) } 
+            else binaryNodeContent.push({ tag: 'participants', attrs: {}, content: participants })
+        }
+
+        const stanza = { tag: 'message', attrs: { id: finalMsgId, to: destinationJid, type: getMessageType(message), ...(additionalAttributes || {}) }, content: binaryNodeContent }
+
+        if (participant) {
+            if (isJidGroup(destinationJid)) { stanza.attrs.to = destinationJid; stanza.attrs.participant = participant.jid } 
+            else if (areJidsSameUser(participant.jid, meId)) { stanza.attrs.to = participant.jid; stanza.attrs.recipient = destinationJid } 
+            else stanza.attrs.to = participant.jid
+        } else stanza.attrs.to = destinationJid
+
+        let additionalAlready = false
+        if (!isNewsletter && buttonType) {
+            const buttonsNode = getButtonArgs(messages)
+            const filteredButtons = getBinaryFilteredButtons(additionalNodes || [])
+            if (filteredButtons) { stanza.content.push(...additionalNodes); additionalAlready = true } 
+            else stanza.content.push(buttonsNode)
+        }
 
-            if (shouldIncludeDeviceIdentity) { stanza.content.push({ tag: 'device-identity', attrs: {}, content: encodeSignedDeviceIdentity(authState.creds.account, true) }); logger.debug({ jid }, 'adding device identity') }
-            if (additionalNodes?.length > 0 && !additionalAlready) stanza.content.push(...additionalNodes)
+        if (shouldIncludeDeviceIdentity) { stanza.content.push({ tag: 'device-identity', attrs: {}, content: encodeSignedDeviceIdentity(authState.creds.account, true) }); logger.debug({ jid }, 'adding device identity') }
+        if (additionalNodes?.length > 0 && !additionalAlready) stanza.content.push(...additionalNodes)
             // Add TCToken support
              const contactTcTokenData = !isGroup && !isRetryResend && !isStatus ? await authState.keys.get('tctoken', [destinationJid]) : {}
              const tcTokenBuffer = contactTcTokenData[destinationJid]?.token
@@ -469,7 +481,7 @@ export const makeMessagesSocket = (config) => {
             if (messageRetryManager && !participant) messageRetryManager.addRecentMessage(destinationJid, msgId, message)
         }, meId)
 
-        return msgId
+        return {key: {remoteJid: jid, fromMe: true, id: finalMsgId, participant: isGroup ? authState.creds.me.id : undefined}, messageId: finalMsgId}
     }
 
            const getPrivacyTokens = async (jids) => {
@@ -597,7 +609,7 @@ export const makeMessagesSocket = (config) => {
 
             const additionalAttributes = {}, additionalNodes = []
             if (content.delete) additionalAttributes.edit = isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe ? '8' : '7'
-            else if (content.edit && typeof content.edit === 'object') additionalAttributes.edit = '1'
+            else if (content.edit) additionalAttributes.edit = '1'
             else if (content.pin) additionalAttributes.edit = '2'
             if (content.poll) additionalNodes.push({ tag: 'meta', attrs: { polltype: 'creation' } })
             if (content.event) additionalNodes.push({ tag: 'meta', attrs: { event_type: 'creation' } })

package/lib/Utils/messages.js

@@ -486,18 +486,17 @@ export const generateWAMessageContent = async (message, options = {}) => {
 };
 
 
-export const generateWAMessageFromContent = (jid, message, options = {}) => {
+export const generateWAMessageFromContent = (jid, message, options) => {
     if (!options.timestamp) options.timestamp = new Date();
     const innerMessage = normalizeMessageContent(message);
     const key = getContentType(innerMessage);
     const timestamp = unixTimestampSeconds(options.timestamp);
     const { quoted, userJid } = options;
 
-    if (quoted && key && !isJidNewsletter(jid)) {
+    if (quoted && !isJidNewsletter(jid)) {
         const participant = quoted.key.fromMe ? userJid : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
         const quotedMsg = proto.Message.create({ [getContentType(normalizeMessageContent(quoted.message))]: normalizeMessageContent(quoted.message)[getContentType(normalizeMessageContent(quoted.message))] });
-        if (!innerMessage[key]) innerMessage[key] = {};
-        const contextInfo = innerMessage[key].contextInfo || {};
+        const contextInfo = (innerMessage[key]?.contextInfo) || {};
         contextInfo.participant = jidNormalizedUser(participant);
         contextInfo.stanzaId = quoted.key.id;
         contextInfo.quotedMessage = quotedMsg;
@@ -505,27 +504,12 @@ export const generateWAMessageFromContent = (jid, message, options = {}) => {
         innerMessage[key].contextInfo = contextInfo;
     }
 
-    if (options?.ephemeralExpiration && key && key !== 'protocolMessage' && key !== 'ephemeralMessage' && !isJidNewsletter(jid)) {
-        if (!innerMessage[key]) innerMessage[key] = {};
+    if (options?.ephemeralExpiration && key !== 'protocolMessage' && key !== 'ephemeralMessage' && !isJidNewsletter(jid)) {
         innerMessage[key].contextInfo = { ...(innerMessage[key].contextInfo || {}), expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL };
     }
 
-    const findMessageKey = (obj) => {
-        if (!obj || typeof obj !== 'object') return null;
-        if (obj.key?.id) return obj.key.id;
-        for (const value of Object.values(obj)) {
-            if (value && typeof value === 'object') {
-                const found = findMessageKey(value);
-                if (found) return found;
-            }
-        }
-        return null;
-    };
-    
-    const messageId = findMessageKey(innerMessage) || options?.messageId || generateMessageIDV2();
-
     return WAProto.WebMessageInfo.fromObject({
-        key: { remoteJid: jid, fromMe: true, id: messageId },
+        key: { remoteJid: jid, fromMe: true, id: options?.messageId || generateMessageIDV2() },
         message: WAProto.Message.create(message),
         messageTimestamp: timestamp,
         messageStubParameters: [],

package/lib/index.js

@@ -31,7 +31,7 @@ const banner = `
 const info = `
 ┌───────────────────────────────────────────────────────────────────────┐
 │  📦 Package: @nexustechpro/baileys                                   │
-│  🔖 Version: 1.1.4                                                   │
+│  🔖 Version: 1.1.5                                                   │
 │  ⚡ Status:  Production Ready                                        │
 ├───────────────────────────────────────────────────────────────────────┤
 │  🚀 Advanced WhatsApp Web API Client                                  │

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nexustechpro/baileys",
   "type": "module",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Advanced WhatsApp Web API client with interactive messages, product catalogs, carousels, events, payments, and polls.",
   "keywords": [
     "whatsapp",
@@ -134,4 +134,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}