@alannxd/baileys 6.0.5 → 6.0.9

package/lib/Socket/messages-send.js

@@ -2,16 +2,17 @@ import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
 import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
 import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, resolveTcTokenJid, shouldSendNewTcToken, storeTcTokensFromIqResult } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET, getAdditionalNode, getBinaryNodeFilter } from '../WABinary/index.js';
+import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET, getAdditionalNode, getBinaryNodeFilter, getBinaryFilteredBizBot, isInteropUser } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeNewsletterSocket } from './newsletter.js';
 import imup from './luxu.js';
 import * as Utils_1 from '../Utils/index.js';
+import { randomBytes } from 'crypto';
 export const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount, aiLabel } = config;
     const sock = makeNewsletterSocket(config);
@@ -427,494 +428,464 @@ export const makeMessagesSocket = (config) => {
         }
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
-        const meId = assertMeId(authState.creds);
-        const meLid = authState.creds.me?.lid;
-        const isRetryResend = Boolean(participant?.jid);
-        let shouldIncludeDeviceIdentity = isRetryResend;
-        const statusJid = 'status@broadcast';
-        const { user, server } = jidDecode(jid);
-        const isGroup = server === 'g.us';
-        const isStatus = jid === statusJid;
-        const isLid = server === 'lid';
-        const isNewsletter = server === 'newsletter';
-        const isGroupOrStatus = isGroup || isStatus;
-        const finalJid = jid;
-        msgId = msgId || generateMessageIDV2(meId);
-        useUserDevicesCache = useUserDevicesCache !== false;
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
-        const participants = [];
-        const destinationJid = !isStatus ? finalJid : statusJid;
-        const binaryNodeContent = [];
-        const devices = [];
-        const buttonType = getButtonType(message);
-        let didPushAdditional = false;
-        let reportingMessage;
-        const meMsg = {
-            deviceSentMessage: {
-                destinationJid,
-                message
-            },
-            messageContextInfo: message.messageContextInfo
-        };
-        const extraAttrs = {};
-        if (participant) {
-            if (!isGroup && !isStatus) {
-                additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };
-            }
-            const { user, device } = jidDecode(participant.jid);
-            devices.push({
-                user,
-                device,
-                jid: participant.jid
-            });
-        }
-        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 (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
-                extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
-            }
-            if (isGroupOrStatus && !isRetryResend) {
-                const [groupData, senderKeyMap] = await Promise.all([
-                    (async () => {
-                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined; // todo: should we rely on the cache specially if the cache is outdated and the metadata has new fields?
-                        if (groupData && Array.isArray(groupData?.participants)) {
-                            logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata');
-                        }
-                        else if (!isStatus) {
-                            groupData = await groupMetadata(jid); // TODO: start storing group participant list + addr mode in Signal & stop relying on this
-                        }
-                        return groupData;
-                    })(),
-                    (async () => {
-                        if (!participant && !isStatus) {
-                            // what if sender memory is less accurate than the cached metadata
-                            // on participant change in group, we should do sender memory manipulation
-                            const result = await authState.keys.get('sender-key-memory', [jid]); // TODO: check out what if the sender key memory doesn't include the LID stuff now?
-                            return result[jid] || {};
-                        }
-                        return {};
-                    })()
-                ]);
-                const participantsList = groupData ? groupData.participants.map(p => p.id) : [];
-                if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
-                    additionalAttributes = {
-                        ...additionalAttributes,
-                        expiration: groupData.ephemeralDuration.toString()
-                    };
-                }
-                if (isStatus && statusJidList) {
-                    participantsList.push(...statusJidList);
-                }
-                const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
-                devices.push(...additionalDevices);
-                if (isGroup) {
-                    additionalAttributes = {
-                        ...additionalAttributes,
-                        addressing_mode: groupData?.addressingMode || 'lid'
-                    };
-                }
-                const patched = await patchMessageBeforeSending(message);
-                if (Array.isArray(patched)) {
-                    throw new Boom('Per-jid patching is not supported in groups');
-                }
-                const bytes = encodeWAMessage(patched);
-                reportingMessage = 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 senderKeyRecipients = [];
-                for (const device of devices) {
-                    const deviceJid = device.jid;
-                    const hasKey = !!senderKeyMap[deviceJid];
-                    if ((!hasKey || !!participant) &&
-                        !isHostedLidUser(deviceJid) &&
-                        !isHostedPnUser(deviceJid) &&
-                        device.device !== 99) {
-                        //todo: revamp all this logic
-                        // the goal is to follow with what I said above for each group, and instead of a true false map of ids, we can set an array full of those the app has already sent pkmsgs
-                        senderKeyRecipients.push(deviceJid);
-                        senderKeyMap[deviceJid] = true;
-                    }
-                }
-                if (senderKeyRecipients.length) {
-                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key');
-                    const senderKeyMsg = {
-                        senderKeyDistributionMessage: {
-                            axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
-                            groupId: destinationJid
-                        }
-                    };
-                    const senderKeySessionTargets = senderKeyRecipients;
-                    await assertSessions(senderKeySessionTargets);
-                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
-                    shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || result.shouldIncludeDeviceIdentity;
-                    participants.push(...result.nodes);
-                }
-                binaryNodeContent.push({
-                    tag: 'enc',
-                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
-                    content: ciphertext
-                });
-                await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
-            }
-            else {
-                // ADDRESSING CONSISTENCY: Match own identity to conversation context
-                // TODO: investigate if this is true
-                let ownId = meId;
-                if (isLid && meLid) {
-                    ownId = meLid;
-                    logger.debug({ to: jid, ownId }, 'Using LID identity for @lid conversation');
-                }
-                else {
-                    logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation');
-                }
-                const { user: ownUser } = jidDecode(ownId);
-                if (!participant) {
-                    const patchedForReporting = await patchMessageBeforeSending(message, [jid]);
-                    reportingMessage = Array.isArray(patchedForReporting)
-                        ? patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0]
-                        : patchedForReporting;
-                }
-                if (!isRetryResend) {
-                    const targetUserServer = isLid ? 'lid' : 's.whatsapp.net';
-                    devices.push({
-                        user,
-                        device: 0,
-                        jid: jidEncode(user, targetUserServer, 0) // rajeh, todo: this entire logic is convoluted and weird.
-                    });
-                    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 (additionalAttributes?.['category'] !== 'peer') {
-                        // Clear placeholders and enumerate actual devices
-                        devices.length = 0;
-                        // Use conversation-appropriate sender identity
-                        const senderIdentity = isLid && meLid
-                            ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
-                            : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined);
-                        // Enumerate devices for sender and target with consistent addressing
-                        const sessionDevices = await getUSyncDevices([senderIdentity, jid], true, false);
-                        devices.push(...sessionDevices);
-                        logger.debug({
-                            deviceCount: devices.length,
-                            devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.jid)?.server}`)
-                        }, 'Device enumeration complete with unified addressing');
-                    }
-                }
-                const allRecipients = [];
-                const meRecipients = [];
-                const 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);
+    const relayMessage = async (
+	    jid,
+	    message,
+	    {
+		    messageId: msgId,
+        	participant = false,
+		    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 statusJid = 'status@broadcast'
+	    const { user, server } = jidDecode(jid)
+	    const isGroup = server === 'g.us'
+	    const isStatus = jid === statusJid
+	    const isLid = server === 'lid'
+	    const isNewsletter = server === 'newsletter'
+	    const isInterop = isInteropUser(jid)
+    	const isGroupOrStatus = isGroup || isStatus
+    	const finalJid = jid
+	    msgId = msgId || generateMessageIDV2(meId)
+    	useUserDevicesCache = useUserDevicesCache!== false
+    	useCachedGroupMetadata = useCachedGroupMetadata!== false &&!isStatus
+	    const participants = []
+	    const destinationJid =!isStatus? finalJid : statusJid
+    	const binaryNodeContent = []
+	    const devices = []
+    	let reportingMessage
+    	const meMsg = {
+	    	deviceSentMessage: { destinationJid, message },
+	    	messageContextInfo: message.messageContextInfo
+	    }
+	    const extraAttrs = {}
+    	const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
+	    const messages = normalizeMessageContent(message)
+	    const buttonType = getButtonType(messages)
+    	const pollMessage =
+	    	messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
+	    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 (normalizeMessageContent(message)?.pinInChatMessage || normalizeMessageContent(message)?.reactionMessage) {
+		    	extraAttrs['decrypt-fail'] = 'hide'
+        	}
+		    if (isGroupOrStatus &&!isRetryResend) {
+		    	const [groupData, senderKeyMap] = await Promise.all([
+		    		(async () => {
+			    		let groupData = useCachedGroupMetadata && cachedGroupMetadata? await cachedGroupMetadata(jid) : undefined
+			    		if (groupData && Array.isArray(groupData?.participants)) {
+		    				logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
+			    		} else if (!isStatus) {
+			    			groupData = await groupMetadata(jid)
+			    		}
+			    		return groupData
+			    	})(),
+		    		(async () => {
+		    			if (!participant &&!isStatus) {
+			    			const result = await authState.keys.get('sender-key-memory', [jid])
+				    		return result[jid] || {}
+			    		}
+			    		return {}
+			    	})()
+		    	])
+		    	const participantsList = groupData? groupData.participants.map(p => p.id) : []
+		    	if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
+		    		additionalAttributes = {...additionalAttributes, expiration: groupData.ephemeralDuration.toString() }
+		    	}
+		    	if (isStatus && statusJidList) participantsList.push(...statusJidList)
+		    	const additionalDevices = await getUSyncDevices(participantsList,!!useUserDevicesCache, false)
+		    	devices.push(...additionalDevices)
+		    	if (isGroup) {
+		    		additionalAttributes = {
+			    		...additionalAttributes,
+			    		addressing_mode: groupData?.addressingMode || 'lid'
+			    	}
+		    	}
+		    	if (message?.groupStatusMessageV2 &&!message?.messageContextInfo?.messageSecret) {
+		    		message = {
+			    		...message,
+			    		messageContextInfo: {
+				    		...(message.messageContextInfo || {}),
+			    			messageSecret: randomBytes(32)
+				    	},
+			    		groupStatusMessageV2: {
+				    		...message.groupStatusMessageV2,
+				    		message: {
+				    			...(message.groupStatusMessageV2.message || {}),
+					    		messageContextInfo: {
+				    				...(message.groupStatusMessageV2.message?.messageContextInfo || {}),
+				    				messageSecret: message.messageContextInfo?.messageSecret || randomBytes(32)
+				    			}
+				    		}
+			    		}
+		    		}
+		    	}
+		    	// list/buttons/template -> interactiveMessage
+			    if (message.listMessage) {
+		    		const list = message.listMessage
+			    	message = {
+			    		interactiveMessage: {
+				    		nativeFlowMessage: {
+				    			buttons: [
+					    			{
+				    					name: 'single_select',
+				    					buttonParamsJson: JSON.stringify({
+				    						title: list.buttonText || 'Select',
+					    					sections: (list.sections || []).map(section => ({
+					    						title: section.title || '',
+				    							highlight_label: '',
+				    							rows: (section.rows || []).map(row => ({
+					    							header: '',
+					    							title: row.title || '',
+				    								description: row.description || '',
+					    							id: row.rowId || row.id || ''
+				    							}))
+				    						}))
+					    				})
+					    			}
+				    			],
+				    			messageParamsJson: '',
+				    			messageVersion: 1
+				    		},
+					    	body: { text: list.description || '' },
+				    		footer: list.footerText? { text: list.footerText } : undefined,
+				    		header: list.title? { title: list.title, hasMediaAttachment: false, subtitle: '' } : undefined,
+				    		contextInfo: list.contextInfo
+				    	}
+			    	}
+		    	} else if (message.buttonsMessage) {
+			    	const bMsg = message.buttonsMessage
+			    	const buttons = (bMsg.buttons || []).map(btn => ({
+				    	name: 'quick_reply',
+			    		buttonParamsJson: JSON.stringify({
+				    		display_text: btn.buttonText?.displayText || btn.buttonText || '',
+			    			id: btn.buttonId || btn.buttonText?.displayText || ''
+			    		})
+			    	}))
+		    		message = {
+			    		interactiveMessage: {
+				    		nativeFlowMessage: { buttons, messageParamsJson: '', messageVersion: 1 },
+				    		body: { text: bMsg.contentText || bMsg.text || '' },
+				    		footer: bMsg.footerText? { text: bMsg.footerText } : undefined,
+				    		header: bMsg.text
+				    			? { title: bMsg.text, hasMediaAttachment: false, subtitle: '' }
+				    			: bMsg.imageMessage || bMsg.videoMessage || bMsg.documentMessage
+				    				? { hasMediaAttachment: true,...(bMsg.imageMessage? { imageMessage: bMsg.imageMessage } : {}),...(bMsg.videoMessage? { videoMessage: bMsg.videoMessage } : {}) }
+				    				: undefined,
+			    			contextInfo: bMsg.contextInfo
+			    		}
+			    	}
+		    	} else if (message.templateMessage) {
+			    	const tmpl = message.templateMessage.hydratedTemplate || message.templateMessage.fourRowTemplate
+			    	if (tmpl) {
+			    		const buttons = (tmpl.hydratedButtons || [])
+				    		.map(hBtn => {
+				    			if (hBtn.quickReplyButton) {
+				    				return { name: 'quick_reply', buttonParamsJson: JSON.stringify({ display_text: hBtn.quickReplyButton.displayText || '', id: hBtn.quickReplyButton.id || hBtn.quickReplyButton.displayText || '' }) }
+				    			} else if (hBtn.urlButton) {
+				    				return { name: 'cta_url', buttonParamsJson: JSON.stringify({ display_text: hBtn.urlButton.displayText || '', url: hBtn.urlButton.url || '', merchant_url: hBtn.urlButton.url || '' }) }
+				    			} else if (hBtn.callButton) {
+				    				return { name: 'cta_call', buttonParamsJson: JSON.stringify({ display_text: hBtn.callButton.displayText || '', phone_number: hBtn.callButton.phoneNumber || '' }) }
+					    		}
+					    		return null
+				    		})
+				    		.filter(Boolean)
+				    	message = {
+				    		interactiveMessage: {
+					    		nativeFlowMessage: { buttons, messageParamsJson: '', messageVersion: 1 },
+					    		body: { text: tmpl.hydratedContentText || tmpl.contentText || '' },
+				    			footer: tmpl.hydratedFooterText? { text: tmpl.hydratedFooterText } : undefined,
+					    		header: tmpl.hydratedTitleText
+					    			? { title: tmpl.hydratedTitleText, hasMediaAttachment: false, subtitle: '' }
+					    			: tmpl.imageMessage || tmpl.videoMessage || tmpl.documentMessage
+					    				? { hasMediaAttachment: true,...(tmpl.imageMessage? { imageMessage: tmpl.imageMessage } : {}),...(tmpl.videoMessage? { videoMessage: tmpl.videoMessage } : {}) }
+						    			: undefined,
+					    		contextInfo: tmpl.contextInfo
+				    		}
+				    	}
+			    	}
+		    	}
+
+		    	const patched = await patchMessageBeforeSending(message)
+		    	if (Array.isArray(patched)) throw new Boom('Per-jid patching is not supported in groups')
+		    	const bytes = encodeWAMessage(patched)
+		    	reportingMessage = 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 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 new 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)
+		    	}
+		    	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 for @lid conversation')
+	    		} else {
+		    		logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
+	    		}
+	    		const { user: ownUser } = jidDecode(ownId)
+		    	if (!participant) {
+	    			const patchedForReporting = await patchMessageBeforeSending(message, [jid])
+		    		reportingMessage = Array.isArray(patchedForReporting)
+		    			? patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0]
+		    			: patchedForReporting
+		    	}
+		    	if (!isRetryResend) {
+		    		const targetUserServer = isLid? 'lid' : isInterop? 'interop' : 's.whatsapp.net'
+		    		devices.push({ user, device: 0, jid: jidEncode(user, targetUserServer, 0) })
+		    		if (user!== ownUser &&!isInterop) {
+		    			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 (additionalAttributes?.['category']!== 'peer' &&!isInterop) {
+		    			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)
+		    			logger.debug({ deviceCount: devices.length, devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.jid)?.server}`) }, 'Device enumeration complete with unified addressing')
+		    		}
+		    	}
+	    		const allRecipients = []
+		    	const meRecipients = []
+		    	const otherRecipients = []
+	    		const { user: mePnUser } = jidDecode(meId)
+	    		const { user: meLidUser } = meLid? jidDecode(meLid) : { user: null }
+	    		for (const { user, jid } of devices) {
+	    		    /** participant method by Xzc || Tsm, who's delete the credits = love BBC */
+                    const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
                     if (isExactSenderDevice) {
-                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)');
-                        continue;
-                    }
-                    // Check if this is our device (could match either PN or LID user)
-                    const isMe = user === mePnUser || user === meLidUser;
-                    if (isMe) {
-                        meRecipients.push(jid);
+                        logger.debug({ jid, meId, meLid }, 'Skipping exact sender device (whatsmeow pattern)')
+                        continue
                     }
-                    else {
-                        otherRecipients.push(jid);
-                    }
-                    allRecipients.push(jid);
-                }
-                await assertSessions(allRecipients);
-                const [{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 }, { nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }] = await Promise.all([
-                    // For own devices: use DSM if available (1:1 chats only)
-                    createParticipantNodes(meRecipients, meMsg || message, extraAttrs),
-                    createParticipantNodes(otherRecipients, message, extraAttrs, meMsg)
-                ]);
-                participants.push(...meNodes);
-                participants.push(...otherNodes);
-                if (meRecipients.length > 0 || otherRecipients.length > 0) {
-                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
-                }
-                shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
-            }
-            if (isRetryResend) {
-                const isParticipantLid = isLidUser(participant.jid);
-                const isMe = areJidsSameUser(participant.jid, isParticipantLid ? meLid : meId);
-                let messageToSend = message;
-                if (isGroupOrStatus) {
-                    let groupSenderIdentity;
-                    if (meLid && (await signalRepository.hasSenderKey({ group: destinationJid, meId: meLid }))) {
-                        groupSenderIdentity = meLid;
-                    }
-                    else if (await signalRepository.hasSenderKey({ group: destinationJid, meId })) {
-                        groupSenderIdentity = meId;
-                    }
-                    if (groupSenderIdentity) {
-                        try {
-                            const skdm = await signalRepository.getSenderKeyDistributionMessage({
-                                group: destinationJid,
-                                meId: groupSenderIdentity
-                            });
-                            messageToSend = {
-                                ...message,
-                                senderKeyDistributionMessage: {
-                                    groupId: destinationJid,
-                                    axolotlSenderKeyDistributionMessage: skdm
-                                }
-                            };
-                        }
-                        catch (err) {
-                            logger.warn({ err, jid: destinationJid }, 'failed to build SKDM for retry, sending without it');
+                    const isMe = user === mePnUser || user === meLidUser
+                    let ptcp = false
+                    if (participant) {
+                        if (!isJidGroup(jid) && !isStatus) {
+                            if (!(!isMe)) ptcp = true
+                        } else {
+                            ptcp = false
                         }
                     }
-                }
-                const encodedMessageToSend = isMe
-                    ? encodeWAMessage({
-                        deviceSentMessage: {
-                            destinationJid,
-                            message: messageToSend
+                    if (!ptcp) {
+                        if (isMe) {
+                            meRecipients.push(jid)
+                        } else {
+                            otherRecipients.push(jid)
                         }
-                    })
-                    : encodeWAMessage(messageToSend);
-                const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
-                    data: encodedMessageToSend,
-                    jid: participant.jid
-                });
-                binaryNodeContent.push({
-                    tag: 'enc',
-                    attrs: {
-                        v: '2',
-                        type,
-                        count: participant.count.toString()
-                    },
-                    content: encryptedContent
-                });
-            }
-            if (participants.length) {
-                if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0];
-                    if (peerNode) {
-                        binaryNodeContent.push(peerNode); // push only enc
+                        allRecipients.push(jid)
                     }
                 }
-                else {
-                    binaryNodeContent.push({
-                        tag: 'participants',
-                        attrs: {},
-                        content: participants
-                    });
-                }
-            }
-            const stanza = {
-                tag: 'message',
-                attrs: {
-                    id: msgId,
-                    to: destinationJid,
-                    type: getMessageType(message),
-                    ...(additionalAttributes || {})
-                },
-                content: binaryNodeContent
-            };
-            // if the participant to send to is explicitly specified (generally retry recp)
-            // ensure the message is only sent to that person
-            // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
-            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;
-            }
-            if (shouldIncludeDeviceIdentity) {
-                ;
-                stanza.content.push({
-                    tag: 'device-identity',
-                    attrs: {},
-                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
-                });
-                logger.debug({ jid }, 'adding device identity');
-            }
-            if (!isNewsletter && buttonType && !isStatus) {
-                const content = getAdditionalNode(buttonType)
-                const filteredNode = getBinaryNodeFilter(additionalNodes)
+	    		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)
+		    	])
+	    		participants.push(...meNodes,...otherNodes)
+		    	if (meRecipients.length > 0 || otherRecipients.length > 0) {
+		    		extraAttrs.phash = generateParticipantHashV2([...meRecipients,...otherRecipients])
+		    	}
+	    		shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
+    	}
+	  	if (isRetryResend) {
+	   		const isParticipantLid = jidDecode(participant.jid).server === 'lid'
+	    	const isMe = areJidsSameUser(participant.jid, isParticipantLid? meLid : meId)
+	   		const encodedMessageToSend = isMe
+		   		? encodeWAMessage({ deviceSentMessage: { destinationJid, message } })
+		   		: encodeWAMessage(message)
+	    	const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
+		    	data: encodedMessageToSend,
+	    		jid: participant.jid
+		   	})
+		   	binaryNodeContent.push({
+		   		tag: 'enc',
+		   		attrs: { v: '2', type, count: (participant.count?? 0).toString() },
+	    		content: encryptedContent
+	    	})
+       	}
+		if (participants.length) {
+			if (additionalAttributes?.['category'] === 'peer') {
+				const peerNode = participants[0]?.content?.[0]
+				if (peerNode) binaryNodeContent.push(peerNode)
+			} else if (isInterop) {
+				const recipientNode = participants.find(p => isInteropUser(p?.attrs?.jid))
+				const encNode = (recipientNode?? participants[0])?.content?.[0]
+				if (encNode) binaryNodeContent.push(encNode)
+			} else {
+				binaryNodeContent.push({ tag: 'participants', attrs: {}, content: participants })
+			}
+    	}
+		const stanza = {
+			tag: 'message',
+			attrs: { id: msgId, to: destinationJid, type: getMessageType(message),...(additionalAttributes || {}) },
+			content: binaryNodeContent
+    	}
+		if (shouldIncludeDeviceIdentity) {
+			stanza.content.push({ tag: 'device-identity', attrs: {}, content: encodeSignedDeviceIdentity(authState.creds.account, true) })
+			logger.debug({ jid }, 'adding device identity')
+    	}
 
-                if (filteredNode) {
-                    didPushAdditional = true
-                    stanza.content.push(...additionalNodes)
-                } 
-                else {
-                    stanza.content.push(...content)
-                }
-                logger.debug({ jid }, 'adding business node')
-            }
-            if (!isNewsletter && !isGroupOrStatus && aiLabel) {
-                const botNode = {
-                    tag: 'bot', 
-                    attrs: {
-                        biz_bot: '1'
-                    }
-                }
-                const filteredBizBot = getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
-                if (filteredBizBot) {
-                    stanza.content.push(...additionalNodes) 
-                    didPushAdditional = true
-                }
-                else {
-                    stanza.content.push(botNode) 
-                }
-            }
-            if (!isNewsletter &&
-                !isRetryResend &&
-                reportingMessage?.messageContextInfo?.messageSecret &&
-                shouldIncludeReportingToken(reportingMessage)) {
-                try {
-                    const encoded = encodeWAMessage(reportingMessage);
-                    const reportingKey = {
-                        id: msgId,
-                        fromMe: true,
-                        remoteJid: destinationJid,
-                        participant: participant?.jid
-                    };
-                    const reportingNode = await getMessageReportingToken(encoded, reportingMessage, reportingKey);
-                    if (reportingNode) {
-                        ;
-                        stanza.content.push(reportingNode);
-                        logger.trace({ jid }, 'added reporting token to message');
-                    }
-                }
-                catch (error) {
-                    logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token');
-                }
-            }
-            // WA Web never attaches tctoken to peer (AppStateSync) messages — server rejects with 479
-            const isPeerMessage = additionalAttributes?.['category'] === 'peer';
-            const is1on1Send = !isGroup && !isRetryResend && !isStatus && !isNewsletter && !isPeerMessage;
-            // Resolve destination to LID for tctoken storage — matches Signal session key pattern
-            const tcTokenJid = is1on1Send ? await resolveTcTokenJid(destinationJid, getLIDForPN) : destinationJid;
-            const contactTcTokenData = is1on1Send ? await authState.keys.get('tctoken', [tcTokenJid]) : {};
-            const existingTokenEntry = contactTcTokenData[tcTokenJid];
-            let tcTokenBuffer = existingTokenEntry?.token;
-            // Treat expired tokens the same as missing — clear from cache
-            if (tcTokenBuffer?.length && isTcTokenExpired(existingTokenEntry?.timestamp)) {
-                logger.debug({ jid: destinationJid, timestamp: existingTokenEntry?.timestamp }, 'tctoken expired, clearing');
-                tcTokenBuffer = undefined;
-                // Preserve senderTimestamp so the fire-and-forget issuance dedupe survives cleanup.
-                const cleared = existingTokenEntry?.senderTimestamp !== undefined
-                    ? { token: Buffer.alloc(0), senderTimestamp: existingTokenEntry.senderTimestamp }
-                    : null;
-                try {
-                    await authState.keys.set({ tctoken: { [tcTokenJid]: cleared } });
-                }
-                catch (err) {
-                    logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup');
-                }
-            }
-            if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
-                ;
-                stanza.content.push({
-                    tag: 'tctoken',
-                    attrs: {},
-                    content: tcTokenBuffer
-                });
-            }
-            if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
-                ;
-                stanza.content.push(...additionalNodes);
-            }
-            logger.debug({ msgId }, `sending message to ${participants.length} devices`);
-            await sendNode(stanza);
-            // Fire-and-forget: issue our token to the contact AFTER message send.
-            // WA Web skips protocol messages and PSA/bot contacts (TcTokenChatAction: isRegularUser)
-            const isProtocolMsg = !!normalizeMessageContent(message)?.protocolMessage;
-            const isBotOrPSA = destinationJid === PSA_WID || isJidBot(destinationJid) || isJidMetaAI(destinationJid);
-            if (is1on1Send &&
-                !isProtocolMsg &&
-                !isBotOrPSA &&
-                shouldSendNewTcToken(existingTokenEntry?.senderTimestamp) &&
-                !inFlightTcTokenIssuance.has(tcTokenJid)) {
-                inFlightTcTokenIssuance.add(tcTokenJid);
-                const issueTimestamp = unixTimestampSeconds();
-                const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping);
-                resolveIssuanceJid(destinationJid, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID)
-                    .then(issueJid => issuePrivacyTokens([issueJid], issueTimestamp))
-                    .then(async (result) => {
-                    await storeTcTokensFromIqResult({
-                        result,
-                        fallbackJid: tcTokenJid,
-                        keys: authState.keys,
-                        getLIDForPN
-                    });
-                    const currentData = await authState.keys.get('tctoken', [tcTokenJid]);
-                    const currentEntry = currentData[tcTokenJid];
-                    const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [tcTokenJid]);
-                    await authState.keys.set({
-                        tctoken: {
-                            [tcTokenJid]: {
-                                token: Buffer.alloc(0),
-                                ...currentEntry,
-                                senderTimestamp: issueTimestamp
-                            },
-                            ...indexWrite
-                        }
-                    });
-                })
-                    .catch(err => {
-                    logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed');
-                })
-                    .finally(() => {
-                    inFlightTcTokenIssuance.delete(tcTokenJid);
-                });
-            }
-            // Add message to retry cache if enabled
-            if (messageRetryManager && !participant) {
-                messageRetryManager.addRecentMessage(destinationJid, msgId, message);
-            }
-        }, meId);
-        return msgId;
-    };
+		if (isGroup && regexGroupOld.test(jid) &&!message.reactionMessage) {
+			stanza.content.push({ tag: 'multicast', attrs: {} })
+    	}
+		if (pollMessage || messages.eventMessage) {
+			stanza.content.push({
+				tag: 'meta',
+				attrs: messages.eventMessage
+					? { event_type: 'creation' }
+					: isNewsletter
+						? { polltype: 'creation', contenttype: pollMessage?.pollContentType === 2? 'image' : 'text' }
+						: { polltype: 'creation' }
+			})
+    	}
+		if (!isNewsletter &&!isRetryResend && reportingMessage?.messageContextInfo?.messageSecret && shouldIncludeReportingToken(reportingMessage)) {
+			try {
+				const encoded = encodeWAMessage(reportingMessage)
+				const reportingKey = { id: msgId, fromMe: true, remoteJid: destinationJid, participant: participant?.jid }
+				const reportingNode = await getMessageReportingToken(encoded, reportingMessage, reportingKey)
+				if (reportingNode) {
+					stanza.content.push(reportingNode)
+					logger.trace({ jid }, 'added reporting token to message')
+				}
+			} catch (error) {
+				logger.warn({ jid, trace: error?.stack }, 'failed to attach reporting token')
+			}
+    	}
+		let didPushAdditional = false
+		if (!isNewsletter && buttonType) {
+			const buttonsNode = getButtonArgs(messages)
+			const filteredButtons = getBinaryNodeFilter(additionalNodes? additionalNodes : [])
+			if (filteredButtons) {
+				stanza.content.push(...additionalNodes)
+				didPushAdditional = true
+			} else {
+				stanza.content.push(buttonsNode)
+			}
+    	}
+		if (!aiLabel && isPnUser(destinationJid)) {
+			const alreadyHasBizBot = getBinaryFilteredBizBot(additionalNodes || []) || getBinaryFilteredBizBot(stanza.content)
+			if (!alreadyHasBizBot) stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
+	} else if (aiLabel &&!isGroup &&!isStatus &&!isNewsletter) {
+			const existingBizBot = getBinaryFilteredBizBot(additionalNodes || [])
+			if (!existingBizBot) stanza.content.push({ tag: 'bot', attrs: { biz_bot: '1' } })
+    	}
+		const isPeerMessage = additionalAttributes?.['category'] === 'peer'
+		const is1on1Send =!isGroup &&!isRetryResend &&!isStatus &&!isNewsletter &&!isPeerMessage
+		const tcTokenJid = is1on1Send? await resolveTcTokenJid(destinationJid, getLIDForPN) : destinationJid
+		const contactTcTokenData = is1on1Send? await authState.keys.get('tctoken', [tcTokenJid]) : {}
+		const existingTokenEntry = contactTcTokenData[tcTokenJid]
+		let tcTokenBuffer = existingTokenEntry?.token
+		if (tcTokenBuffer?.length && isTcTokenExpired(existingTokenEntry?.timestamp)) {
+			logger.debug({ jid: destinationJid, timestamp: existingTokenEntry?.timestamp }, 'tctoken expired, clearing')
+			tcTokenBuffer = undefined
+			const cleared = existingTokenEntry?.senderTimestamp!== undefined? { token: Buffer.alloc(0), senderTimestamp: existingTokenEntry.senderTimestamp } : null
+			try {
+				await authState.keys.set({ tctoken: { [tcTokenJid]: cleared } })
+			} catch (err) {
+				logger.debug({ jid: destinationJid, err: err?.message }, 'failed to persist tctoken expiry cleanup')
+			}
+	    }
+		if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
+			stanza.content.push({ tag: 'tctoken', attrs: {}, content: tcTokenBuffer })
+    	}
+		if (additionalNodes && additionalNodes.length > 0 &&!didPushAdditional) {
+			stanza.content.push(...additionalNodes)
+    	}
+		logger.debug({ msgId }, `sending message to ${participants.length} devices`)
+		await sendNode(stanza)
+		if (message.messageContextInfo?.messageSecret) {
+			setBotMessageSecret(msgId, message.messageContextInfo.messageSecret, destinationJid)
+    	}
+		const isProtocolMsg =!!normalizeMessageContent(message)?.protocolMessage
+		const isBotOrPSA = destinationJid === PSA_WID || isJidBot(destinationJid) || isJidMetaAI(destinationJid)
+		if (is1on1Send &&!isProtocolMsg &&!isBotOrPSA && shouldSendNewTcToken(existingTokenEntry?.senderTimestamp) &&!inFlightTcTokenIssuance.has(tcTokenJid)) {
+			inFlightTcTokenIssuance.add(tcTokenJid)
+			const issueTimestamp = unixTimestampSeconds()
+			const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping)
+			resolveIssuanceJid(destinationJid, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID)
+				.then(issueJid => issuePrivacyTokens([issueJid], issueTimestamp))
+				.then(async result => {
+					await storeTcTokensFromIqResult({ result, fallbackJid: tcTokenJid, keys: authState.keys, getLIDForPN })
+					const currentData = await authState.keys.get('tctoken', [tcTokenJid])
+					const currentEntry = currentData[tcTokenJid]
+					const indexWrite = await buildMergedTcTokenIndexWrite(authState.keys, [tcTokenJid])
+					await authState.keys.set({
+						tctoken: {
+							[tcTokenJid]: { token: Buffer.alloc(0),...currentEntry, senderTimestamp: issueTimestamp },
+							...indexWrite
+						}
+					})
+				})
+				.catch(err => logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed'))
+				.finally(() => inFlightTcTokenIssuance.delete(tcTokenJid))
+	    }
+		if (messageRetryManager &&!participant) {
+			messageRetryManager.addRecentMessage(destinationJid, msgId, message)
+    	}
+		if (isInterop &&!isRetryResend) {
+			await trustInteropContact(destinationJid).catch(err => logger.debug({ err, jid: destinationJid }, 'failed to trust interop contact'))
+    	}
+	}, meId)
+	return msgId
+    }
     const getMessageType = (message) => {
         const normalizedMessage = normalizeMessageContent(message);
         if (!normalizedMessage)
@@ -924,8 +895,10 @@ export const makeMessagesSocket = (config) => {
         }
         if (normalizedMessage.pollCreationMessage ||
             normalizedMessage.pollCreationMessageV2 ||
-            normalizedMessage.pollCreationMessageV3 ||
-            normalizedMessage.pollUpdateMessage) {
+                normalizedMessage.pollCreationMessageV3 ||
+                    normalizedMessage.pollCreationMessageV4 ||
+                        normalizedMessage.pollCreationMessageV5 ||
+                            normalizedMessage.pollUpdateMessage) {
             return 'poll';
         }
         if (normalizedMessage.eventMessage) {
@@ -1007,6 +980,9 @@ export const makeMessagesSocket = (config) => {
         else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'payment_method') {
             return 'payment_method'
         }
+        else if (message.interactiveMessage?.nativeFlowMessage?.buttons?.[0]?.name === 'catalog_message') {
+            return 'catalog_message'
+        }
         else if (message.interactiveMessage && message.interactiveMessage?.nativeFlowMessage) {
             return 'interactive'
         }
@@ -1014,6 +990,128 @@ export const makeMessagesSocket = (config) => {
             return 'native_flow'
         }
     };
+    const getButtonArgs = (message) => {
+		const nativeFlow = message.interactiveMessage?.nativeFlowMessage
+		const firstButtonName = nativeFlow?.buttons?.[0]?.name
+		const nativeFlowSpecials = [
+			'mpm',
+			'cta_catalog',
+			'send_location',
+			'call_permission_request',
+			'wa_payment_transaction_details',
+			'automated_greeting_message_view_catalog'
+		]
+
+		if (nativeFlow && (firstButtonName === 'review_and_pay' || firstButtonName === 'payment_info')) {
+			return {
+				tag: 'biz',
+				attrs: {
+					native_flow_name: firstButtonName === 'review_and_pay' ? 'order_details' : firstButtonName
+				}
+			}
+		} else if (nativeFlow && nativeFlowSpecials.includes(firstButtonName)) {
+			// Only works for WhatsApp Original, not WhatsApp Business
+			return {
+				tag: 'biz',
+				attrs: {
+					actual_actors: '2',
+					host_storage: '2',
+					privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+				},
+				content: [
+					{
+						tag: 'interactive',
+						attrs: {
+							type: 'native_flow',
+							v: '1'
+						},
+						content: [
+							{
+								tag: 'native_flow',
+								attrs: {
+									v: '2',
+									name: firstButtonName
+								}
+							}
+						]
+					},
+					{
+						tag: 'quality_control',
+						attrs: {
+							source_type: 'third_party'
+						}
+					}
+				]
+			}
+		} else if (nativeFlow || message.buttonsMessage) {
+			// It works for whatsapp original and whatsapp business
+			return {
+				tag: 'biz',
+				attrs: {
+					actual_actors: '2',
+					host_storage: '2',
+					privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+				},
+				content: [
+					{
+						tag: 'interactive',
+						attrs: {
+							type: 'native_flow',
+							v: '1'
+						},
+						content: [
+							{
+								tag: 'native_flow',
+								attrs: {
+									v: '9',
+									name: 'mixed'
+								}
+							}
+						]
+					},
+					{
+						tag: 'quality_control',
+						attrs: {
+							source_type: 'third_party'
+						}
+					}
+				]
+			}
+		} else if (message.listMessage) {
+			return {
+				tag: 'biz',
+				attrs: {
+					actual_actors: '2',
+					host_storage: '2',
+					privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+				},
+				content: [
+					{
+						tag: 'list',
+						attrs: {
+							v: '2',
+							type: 'product_list'
+						}
+					},
+					{
+						tag: 'quality_control',
+						attrs: {
+							source_type: 'third_party'
+						}
+					}
+				]
+			}
+		} else {
+			return {
+				tag: 'biz',
+				attrs: {
+					actual_actors: '2',
+					host_storage: '2',
+					privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+				}
+			}
+		}
+	}
     const issuePrivacyTokens = async (jids, timestamp) => {
         const t = (timestamp ?? unixTimestampSeconds()).toString();
         const result = await query({
@@ -1113,10 +1211,61 @@ export const makeMessagesSocket = (config) => {
             ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
             return message;
         },
+        sendTable: async (jid, title, headers, rows, quoted, options = {}) => {
+			const { message, messageId } = Utils_1.generateTableContent(title, headers, rows, quoted, options)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendList: async (jid, title, items, quoted, options = {}) => {
+			const { message, messageId } = Utils_1.generateListContent(title, items, quoted, options)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendCodeBlock: async (jid, code, quoted, options = {}) => {
+			const { message, messageId } = Utils_1.generateCodeBlockContent(code, quoted, options)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendLatex: async (jid, quoted, options) => {
+			const { message, messageId } = Utils_1.generateLatexContent(quoted, options)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendLatexImage: async (jid, quoted, options, renderLatexToPng, uploadFn) => {
+			const { message, messageId } = await Utils_1.generateLatexImageContent(
+				quoted,
+				options,
+				uploadFn,
+				renderLatexToPng
+			)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendLatexInlineImage: async (jid, quoted, options, renderLatexToPng, uploadFn) => {
+			const { message, messageId } = await Utils_1.generateLatexInlineImageContent(
+				quoted,
+				options,
+				uploadFn,
+				renderLatexToPng
+			)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		captureUnifiedResponse: Utils_1.captureUnifiedResponse,
+		sendUnifiedResponse: async (jid, quoted, captured) => {
+			const { message, messageId } = Utils_1.generateUnifiedResponseContent(quoted, captured)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
+		sendRichMessage: async (jid, submessages, quoted, options = {}) => {
+			const { message, messageId } = Utils_1.generateRichMessageContent(submessages, quoted, options)
+			await relayMessage(jid, message, { messageId })
+			return { message, messageId }
+		},
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
             const luki = new imup(Utils_1, waUploadToServer, relayMessage)
-            const { quoted } = options;
+            const { quoted, participant = false } = options;
             const messageType = luki.detectType(content);
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
@@ -1144,13 +1293,7 @@ export const makeMessagesSocket = (config) => {
                             return await relayMessage(jid, productMsg.message, {
                                 messageId: productMsg.key.id,
                             });
-                
-                        case 'INTERACTIVE':
-                            const interactiveContent = await luki.handleInteractive(content, jid, quoted);
-                            const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                            return await relayMessage(jid, interactiveMsg.message, {
-                                messageId: interactiveMsg.key.id
-                            });
+                            
                         case 'ALBUM':
                             return await luki.handleAlbum(content, jid, quoted)
                         case 'EVENT':
@@ -1230,7 +1373,8 @@ export const makeMessagesSocket = (config) => {
                     useCachedGroupMetadata: options.useCachedGroupMetadata,
                     additionalAttributes,
                     statusJidList: options.statusJidList,
-                    additionalNodes: aiLabel ? additionalNodes : options.additionalNodes
+                    additionalNodes: aiLabel ? additionalNodes : options.additionalNodes,
+                    participant
                 });
                 if (config.emitOwnEvents) {
                     process.nextTick(async () => {