@skyzopedia/baileys-mod 5.0.8 → 6.0.1

package/lib/Socket/messages-send.js

@@ -1,92 +1,68 @@
-import NodeCache from '@cacheable/node-cache';
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/index.js';
-import crypto from "crypto";
-const randomBytes = crypto.randomBytes(32).toString("hex");
-import {
-    DEFAULT_CACHE_TTLS, 
-    WA_DEFAULT_EPHEMERAL
-} from '../Defaults/index.js';
-import { 
-    aggregateMessageKeysNotFromMe,
-    assertMediaContent, 
-    bindWaitForEvent, 
-    decryptMediaRetryData,
-    encodeNewsletterMessage, 
-    encodeSignedDeviceIdentity,
-    encodeWAMessage,
-    encryptMediaRetryRequest,
-    extractDeviceJids,
-    generateMessageIDV2,
-    generateParticipantHashV2, 
-    generateWAMessage, 
-    getStatusCodeForMediaRetry, 
-    getUrlFromDirectPath, 
-    getWAUploadToServer,
-    MessageRetryManager,
-    normalizeMessageContent,
-    parseAndInjectE2ESessions, 
-    unixTimestampSeconds, 
-    generateWAMessageFromContent
-} from '../Utils/index.js';
-import {
-    areJidsSameUser, 
-    getBinaryNodeChild,
-    getBinaryNodeChildren,
-    getAdditionalNode,
-    getBinaryNodeFilter,
-    isHostedLidUser,
-    isHostedPnUser,
-    isJidGroup,
-    isLidUser,
-    isPnUser,
-    jidDecode, 
-    jidEncode,
-    isJidNewsletter, 
-    jidNormalizedUser,
-    S_WHATSAPP_NET
-} from '../WABinary/index.js';
-import { getUrlInfo } from '../Utils/link-preview.js';
-import { makeKeyedMutex } from '../Utils/make-mutex.js';
-import { USyncQuery, USyncUser } from '../WAUSync/index.js';
-import { makeNewsletterSocket } from './newsletter.js';
-export const makeMessagesSocket = (config) => {
-    const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
-    const sock = makeNewsletterSocket(config);
-    const { ev, authState, processingMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral } = sock;
-    const userDevicesCache = config.userDevicesCache ||
-        new NodeCache({
-            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
-            useClones: false
-        });
-    const peerSessionsCache = new NodeCache({
-        stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
+"use strict"; 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+}; 
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeMessagesSocket = void 0;
+const boom_1 = require("@hapi/boom");
+const node_cache_1 = __importDefault(require("node-cache"));
+const WAProto_1 = require("../../WAProto");
+const Defaults_1 = require("../Defaults");
+const axios_1 = require("axios")
+const Types_1 = require("../Types")
+const Utils_1 = require("../Utils");
+const link_preview_1 = require("../Utils/link-preview");
+const WABinary_1 = require("../WABinary");
+const newsletter_1 = require("./newsletter");
+const WAUSync_1 = require("../WAUSync")
+const kikyy = require('./dugong');
+var ListType = WAProto_1.proto.Message.ListMessage.ListType;
+const makeMessagesSocket = (config) => {
+    const {
+        logger,
+        linkPreviewImageThumbnailWidth, 
+        generateHighQualityLinkPreview,
+        options: axiosOptions,
+        patchMessageBeforeSending
+    } = config;
+    const sock = (0, newsletter_1.makeNewsletterSocket)(config);
+    const {
+        ev, 
+        authState, 
+        processingMutex, 
+        signalRepository, 
+        upsertMessage,
+        query,
+        fetchPrivacySettings,
+        generateMessageTag,
+        sendNode, 
+        groupMetadata,
+        groupToggleEphemeral,
+        executeUSyncQuery
+    } = sock;
+    const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
     });
-    // Initialize message retry manager if enabled
-    const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null;
-    // Prevent race conditions in Signal session encryption by user
-    const encryptionMutex = makeKeyedMutex();
     let mediaConn;
     const refreshMediaConn = async (forceGet = false) => {
         const media = await mediaConn;
-        if (!media || forceGet || new Date().getTime() - media.fetchDate.getTime() > media.ttl * 1000) {
+        if (!media || forceGet || (new Date().getTime() - media.fetchDate.getTime()) > media.ttl * 1000) {
             mediaConn = (async () => {
                 const result = await query({
                     tag: 'iq',
                     attrs: {
                         type: 'set',
                         xmlns: 'w:m',
-                        to: S_WHATSAPP_NET
+                        to: WABinary_1.S_WHATSAPP_NET,
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 });
-                const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
-                // TODO: explore full length of data that whatsapp provides
+                const mediaConnNode = WABinary_1.getBinaryNodeChild(result, 'media_conn');
                 const node = {
-                    hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: WABinary_1.getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
-                        maxContentLengthBytes: +attrs.maxContentLengthBytes
+                        maxContentLengthBytes: +attrs.maxContentLengthBytes,
                     })),
                     auth: mediaConnNode.attrs.auth,
                     ttl: +mediaConnNode.attrs.ttl,
@@ -103,20 +79,17 @@ export const makeMessagesSocket = (config) => {
      * used for receipts of phone call, read, delivery etc.
      * */
     const sendReceipt = async (jid, participant, messageIds, type) => {
-        if (!messageIds || messageIds.length === 0) {
-            throw new Boom('missing ids in receipt');
-        }
         const node = {
             tag: 'receipt',
             attrs: {
-                id: messageIds[0]
-            }
+                id: messageIds[0],
+            },
         };
         const isReadReceipt = type === 'read' || type === 'read-self';
         if (isReadReceipt) {
-            node.attrs.t = unixTimestampSeconds().toString();
+            node.attrs.t = (0, Utils_1.unixTimestampSeconds)().toString();
         }
-        if (type === 'sender' && (isPnUser(jid) || isLidUser(jid))) {
+        if (type === 'sender' && WABinary_1.isJidUser(jid)) {
             node.attrs.recipient = jid;
             node.attrs.to = participant;
         }
@@ -127,7 +100,7 @@ export const makeMessagesSocket = (config) => {
             }
         }
         if (type) {
-            node.attrs.type = type;
+            node.attrs.type = WABinary_1.isJidNewsLetter(jid) ? 'read-self' : type;
         }
         const remainingMessageIds = messageIds.slice(1);
         if (remainingMessageIds.length) {
@@ -147,7 +120,7 @@ export const makeMessagesSocket = (config) => {
     };
     /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
-        const recps = aggregateMessageKeysNotFromMe(keys);
+        const recps = (0, Utils_1.aggregateMessageKeysNotFromMe)(keys);
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type);
         }
@@ -161,349 +134,207 @@ export const makeMessagesSocket = (config) => {
     };
     /** Fetch all the devices we've to send a message to */
     const getUSyncDevices = async (jids, useCache, ignoreZeroDevices) => {
-        const deviceResults = [];
+        const deviceResults = []
+
         if (!useCache) {
-            logger.debug('not using cache for devices');
-        }
-        const toFetch = [];
-        const jidsWithUser = jids
-            .map(jid => {
-            const decoded = jidDecode(jid);
-            const user = decoded?.user;
-            const device = decoded?.device;
-            const isExplicitDevice = typeof device === 'number' && device >= 0;
-            if (isExplicitDevice && user) {
-                deviceResults.push({
-                    user,
-                    device,
-                    jid
-                });
-                return null;
-            }
-            jid = jidNormalizedUser(jid);
-            return { jid, user };
-        })
-            .filter(jid => jid !== null);
-        let mgetDevices;
-        if (useCache && userDevicesCache.mget) {
-            const usersToFetch = jidsWithUser.map(j => j?.user).filter(Boolean);
-            mgetDevices = await userDevicesCache.mget(usersToFetch);
+            logger.debug('not using cache for devices')
         }
-        for (const { jid, user } of jidsWithUser) {
+
+        const toFetch = []
+
+        jids = Array.from(new Set(jids))
+
+        for (let jid of jids) {
+            const user = WABinary_1.jidDecode(jid)?.user
+
+            jid = WABinary_1.jidNormalizedUser(jid)
+
             if (useCache) {
-                const devices = mgetDevices?.[user] ||
-                    (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)));
+                const devices = userDevicesCache.get(user)
+
                 if (devices) {
-                    const devicesWithJid = devices.map(d => ({
-                        ...d,
-                        jid: jidEncode(d.user, d.server, d.device)
-                    }));
-                    deviceResults.push(...devicesWithJid);
-                    logger.trace({ user }, 'using cache for devices');
+                    deviceResults.push(...devices)
+                    logger.trace({ user }, 'using cache for devices')
                 }
+
                 else {
-                    toFetch.push(jid);
+                    toFetch.push(jid)
                 }
             }
+
             else {
-                toFetch.push(jid);
+                toFetch.push(jid)
             }
         }
+
         if (!toFetch.length) {
-            return deviceResults;
-        }
-        const requestedLidUsers = new Set();
-        for (const jid of toFetch) {
-            if (isLidUser(jid) || isHostedLidUser(jid)) {
-                const user = jidDecode(jid)?.user;
-                if (user)
-                    requestedLidUsers.add(user);
-            }
+            return deviceResults
         }
-        const query = new USyncQuery().withContext('message').withDeviceProtocol().withLIDProtocol();
+
+        const query = new WAUSync_1.USyncQuery()
+            .withContext('message')
+            .withDeviceProtocol()
+
         for (const jid of toFetch) {
-            query.withUser(new USyncUser().withId(jid)); // todo: investigate - the idea here is that <user> should have an inline lid field with the lid being the pn equivalent
+            query.withUser(new WAUSync_1.USyncUser().withId(jid))
         }
-        const result = await sock.executeUSyncQuery(query);
+
+        const result = await executeUSyncQuery(query)
+
         if (result) {
-            // TODO: LID MAP this stuff (lid protocol will now return lid with devices)
-            const lidResults = result.list.filter(a => !!a.lid);
-            if (lidResults.length > 0) {
-                logger.trace('Storing LID maps from device call');
-                await signalRepository.lidMapping.storeLIDPNMappings(lidResults.map(a => ({ lid: a.lid, pn: a.id })));
-            }
-            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, authState.creds.me.lid, ignoreZeroDevices);
-            const deviceMap = {};
+            const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
+            const deviceMap = {}
+
             for (const item of extracted) {
-                deviceMap[item.user] = deviceMap[item.user] || [];
-                deviceMap[item.user]?.push(item);
+                deviceMap[item.user] = deviceMap[item.user] || []
+                deviceMap[item.user].push(item)
+                deviceResults.push(item)
             }
-            // Process each user's devices as a group for bulk LID migration
-            for (const [user, userDevices] of Object.entries(deviceMap)) {
-                const isLidUser = requestedLidUsers.has(user);
-                // Process all devices for this user
-                for (const item of userDevices) {
-                    const finalJid = isLidUser
-                        ? jidEncode(user, item.server, item.device)
-                        : jidEncode(item.user, item.server, item.device);
-                    deviceResults.push({
-                        ...item,
-                        jid: finalJid
-                    });
-                    logger.debug({
-                        user: item.user,
-                        device: item.device,
-                        finalJid,
-                        usedLid: isLidUser
-                    }, 'Processed device with LID priority');
-                }
-            }
-            if (userDevicesCache.mset) {
-                // if the cache supports mset, we can set all devices in one go
-                await userDevicesCache.mset(Object.entries(deviceMap).map(([key, value]) => ({ key, value })));
-            }
-            else {
-                for (const key in deviceMap) {
-                    if (deviceMap[key])
-                        await userDevicesCache.set(key, deviceMap[key]);
-                }
-            }
-            const userDeviceUpdates = {};
-            for (const [userId, devices] of Object.entries(deviceMap)) {
-                if (devices && devices.length > 0) {
-                    userDeviceUpdates[userId] = devices.map(d => d.device?.toString() || '0');
-                }
-            }
-            if (Object.keys(userDeviceUpdates).length > 0) {
-                try {
-                    await authState.keys.set({ 'device-list': userDeviceUpdates });
-                    logger.debug({ userCount: Object.keys(userDeviceUpdates).length }, 'stored user device lists for bulk migration');
-                }
-                catch (error) {
-                    logger.warn({ error }, 'failed to store user device lists');
-                }
+
+            for (const key in deviceMap) {
+                userDevicesCache.set(key, deviceMap[key])
             }
         }
-        return deviceResults;
-    };
-    const assertSessions = async (jids) => {
+
+        return deviceResults
+    }
+    const assertSessions = async (jids, force) => {
         let didFetchNewSession = false;
-        const uniqueJids = [...new Set(jids)]; // Deduplicate JIDs
-        const jidsRequiringFetch = [];
-        logger.debug({ jids }, 'assertSessions call with jids');
-        // Check peerSessionsCache and validate sessions using libsignal loadSession
-        for (const jid of uniqueJids) {
-            const signalId = signalRepository.jidToSignalProtocolAddress(jid);
-            const cachedSession = peerSessionsCache.get(signalId);
-            if (cachedSession !== undefined) {
-                if (cachedSession) {
-                    continue; // Session exists in cache
-                }
-            }
-            else {
-                const sessionValidation = await signalRepository.validateSession(jid);
-                const hasSession = sessionValidation.exists;
-                peerSessionsCache.set(signalId, hasSession);
-                if (hasSession) {
-                    continue;
+        let jidsRequiringFetch = [];
+        if (force) {
+            jidsRequiringFetch = jids;
+        }
+        else {
+            const addrs = jids.map(jid => (signalRepository
+                .jidToSignalProtocolAddress(jid)));
+            const sessions = await authState.keys.get('session', addrs);
+            for (const jid of jids) {
+                const signalId = signalRepository
+                    .jidToSignalProtocolAddress(jid);
+                if (!sessions[signalId]) {
+                    jidsRequiringFetch.push(jid);
                 }
             }
-            jidsRequiringFetch.push(jid);
         }
         if (jidsRequiringFetch.length) {
-            // LID if mapped, otherwise original
-            const wireJids = [
-                ...jidsRequiringFetch.filter(jid => !!isLidUser(jid) || !!isHostedLidUser(jid)),
-                ...((await signalRepository.lidMapping.getLIDsForPNs(jidsRequiringFetch.filter(jid => !!isPnUser(jid) || !!isHostedPnUser(jid)))) || []).map(a => a.lid)
-            ];
-            logger.debug({ jidsRequiringFetch, wireJids }, 'fetching sessions');
+            logger.debug({ jidsRequiringFetch }, 'fetching sessions');
             const result = await query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'encrypt',
                     type: 'get',
-                    to: S_WHATSAPP_NET
+                    to: WABinary_1.S_WHATSAPP_NET,
                 },
                 content: [
                     {
                         tag: 'key',
                         attrs: {},
-                        content: wireJids.map(jid => ({
+                        content: jidsRequiringFetch.map(jid => ({
                             tag: 'user',
-                            attrs: { jid }
+                            attrs: { jid },
                         }))
                     }
                 ]
             });
-            await parseAndInjectE2ESessions(result, signalRepository);
+            await (0, Utils_1.parseAndInjectE2ESessions)(result, signalRepository);
             didFetchNewSession = true;
-            // Cache fetched sessions using wire JIDs
-            for (const wireJid of wireJids) {
-                const signalId = signalRepository.jidToSignalProtocolAddress(wireJid);
-                peerSessionsCache.set(signalId, true);
-            }
         }
         return didFetchNewSession;
     };
+    
+ 
     const sendPeerDataOperationMessage = async (pdoMessage) => {
-        //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
         if (!authState.creds.me?.id) {
-            throw new Boom('Not authenticated');
+            throw new boom_1.Boom('Not authenticated')
         }
+        
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
-                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+                type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
         };
-        const meJid = jidNormalizedUser(authState.creds.me.id);
+        const meJid = WABinary_1.jidNormalizedUser(authState.creds.me.id);
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
                 category: 'peer',
-                push_priority: 'high_force'
+                // eslint-disable-next-line camelcase
+                push_priority: 'high_force',
             },
-            additionalNodes: [
-                {
-                    tag: 'meta',
-                    attrs: { appdata: 'default' }
-                }
-            ]
         });
         return msgId;
     };
-    const createParticipantNodes = async (recipientJids, message, extraAttrs, dsmMessage) => {
-        if (!recipientJids.length) {
-            return { nodes: [], shouldIncludeDeviceIdentity: false };
-        }
-        const patched = await patchMessageBeforeSending(message, recipientJids);
-        const patchedMessages = Array.isArray(patched)
-            ? patched
-            : recipientJids.map(jid => ({ recipientJid: jid, message: patched }));
+    const createParticipantNodes = async (jids, message, extraAttrs) => {
+        const patched = await patchMessageBeforeSending(message, jids);
+        const bytes = (0, Utils_1.encodeWAMessage)(patched);
         let shouldIncludeDeviceIdentity = false;
-        const meId = authState.creds.me.id;
-        const meLid = authState.creds.me?.lid;
-        const meLidUser = meLid ? jidDecode(meLid)?.user : null;
-        const encryptionPromises = patchedMessages.map(async ({ recipientJid: jid, message: patchedMessage }) => {
-            if (!jid)
-                return null;
-            let msgToEncrypt = patchedMessage;
-            if (dsmMessage) {
-                const { user: targetUser } = jidDecode(jid);
-                const { user: ownPnUser } = jidDecode(meId);
-                const ownLidUser = meLidUser;
-                const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser);
-                const isExactSenderDevice = jid === meId || (meLid && jid === meLid);
-                if (isOwnUser && !isExactSenderDevice) {
-                    msgToEncrypt = dsmMessage;
-                    logger.debug({ jid, targetUser }, 'Using DSM for own device');
-                }
-            }
-            const bytes = encodeWAMessage(msgToEncrypt);
-            const mutexKey = jid;
-            const node = await encryptionMutex.mutex(mutexKey, async () => {
-                const { type, ciphertext } = await signalRepository.encryptMessage({
-                    jid,
-                    data: bytes
-                });
-                if (type === 'pkmsg') {
-                    shouldIncludeDeviceIdentity = true;
-                }
-                return {
-                    tag: 'to',
-                    attrs: { jid },
-                    content: [
-                        {
-                            tag: 'enc',
-                            attrs: {
-                                v: '2',
-                                type,
-                                ...(extraAttrs || {})
-                            },
-                            content: ciphertext
-                        }
-                    ]
-                };
-            });
+        const nodes = await Promise.all(jids.map(async (jid) => {
+            const { type, ciphertext } = await signalRepository
+                .encryptMessage({ jid, data: bytes });
+            if (type === 'pkmsg') {
+                shouldIncludeDeviceIdentity = true;
+            }
+            const node = {
+                tag: 'to',
+                attrs: { jid },
+                content: [{
+                        tag: 'enc',
+                        attrs: {
+                            v: '2',
+                            type,
+                            ...extraAttrs || {}
+                        },
+                        content: ciphertext
+                    }]
+            };
             return node;
-        });
-        const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null);
+        }));
         return { nodes, shouldIncludeDeviceIdentity };
-    };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList, AI = false }) => {
-     // let shouldIncludeDeviceIdentity = false;
-        let didPushAdditional = false
+    }; //apela
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList, AI = false }) => {
         const meId = authState.creds.me.id;
-        const meLid = authState.creds.me?.lid;
-        const isRetryResend = Boolean(participant?.jid);
-        let shouldIncludeDeviceIdentity = isRetryResend;
+        let shouldIncludeDeviceIdentity = false;
+        let didPushAdditional = false
+        const { user, server } = WABinary_1.jidDecode(jid);
         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 isPrivate = server === 's.whatsapp.net'
-        const finalJid = jid;
-        msgId = msgId || generateMessageIDV2(meId);
+        const isNewsletter = server === 'newsletter';
+        msgId = msgId || (0, Utils_1.generateMessageID)();
         useUserDevicesCache = useUserDevicesCache !== false;
-        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus;
+        useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
         const participants = [];
-        const destinationJid = !isStatus ? finalJid : statusJid;
+        const destinationJid = (!isStatus) ? WABinary_1.jidEncode(user, isLid ? 'lid' : isGroup ? 'g.us' : isNewsletter ? 'newsletter' : 's.whatsapp.net') : statusJid;
         const binaryNodeContent = [];
         const devices = [];
         const meMsg = {
             deviceSentMessage: {
                 destinationJid,
                 message
-            },
-            messageContextInfo: message.messageContextInfo
+            }
         };
-        const extraAttrs = {};
-        const messages = normalizeMessageContent(message)  
+        const extraAttrs = {}
+        const messages = Utils_1.normalizeMessageContent(message)  
         const buttonType = getButtonType(messages);
         if (participant) {
+            // when the retry request is not for a group
+            // only send to the specific device that asked for a retry
+            // otherwise the message is sent out to every device that should be a recipient
             if (!isGroup && !isStatus) {
-                additionalAttributes = { 
-                    ...additionalAttributes,
-                    device_fanout: 'false' 
-                };
+                additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' };
             }
-            const { user, device } = jidDecode(participant.jid);
-            devices.push({
-                user,
-                device,
-                jid: participant.jid
-            });
+            const { user, device } = WABinary_1.jidDecode(participant.jid);
+            devices.push({ user, device });
         }
         await authState.keys.transaction(async () => {
-            const mediaType = getMediaType(message);
+            const mediaType = getMediaType(messages);
+            
             if (mediaType) {
-                extraAttrs['mediatype'] = mediaType;
+                extraAttrs['mediatype'] = mediaType
             }
             
-           if (isNewsletter) {
-        const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
-        const bytes = encodeNewsletterMessage(patched);
-        binaryNodeContent.push({
-          tag: "plaintext",
-          attrs: mediaType ? { mediatype: mediaType } : {},
-          content: bytes
-        });
-        const stanza = {
-          tag: "message",
-          attrs: {
-            to: jid,
-            id: msgId,
-            type: getTypeMessage(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'
             } 
@@ -515,228 +346,185 @@ export const makeMessagesSocket = (config) => {
             if (isGroup || isStatus) {
                 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');
+                        let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
+                        if (groupData) {
+                            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
+                            groupData = await groupMetadata(jid)
                         }
+                        
                         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] || {};
+                            const result = await authState.keys.get('sender-key-memory', [jid])
+                            return result[jid] || {}
                         }
-                        return {};
-                    })()
+
+                        return {}
+
+                    })()         
                 ]);
                 if (!participant) {
-                    const participantsList = groupData && !isStatus ? groupData.participants.map(p => p.id) : [];
+                    const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
+
                     if (isStatus && statusJidList) {
-                        participantsList.push(...statusJidList);
+                        participantsList.push(...statusJidList)
                     }
-                  //  if (!isStatus) {
-                  //     additionalAttributes = {
-                  //          ...additionalAttributes,
-                  //          addressing_mode: groupData?.addressingMode || 'pn'
-                  //      };
-                  //  }
-                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false);
-                    devices.push(...additionalDevices);
-                }
-                if (groupData?.ephemeralDuration && groupData.ephemeralDuration > 0) {
-                    additionalAttributes = {
-                        ...additionalAttributes,
-                        expiration: groupData.ephemeralDuration.toString()
-                    };
-                }
-                const patched = await patchMessageBeforeSending(message);
-                if (Array.isArray(patched)) {
-                    throw new Boom('Per-jid patching is not supported in groups');
+
+                 //   if (!isStatus) {
+                 //       const expiration = await getEphemeralGroup(jid)
+                 //       additionalAttributes = {
+                 //           ...additionalAttributes, 
+                 //           addressing_mode: 'pn',
+                 //           ...expiration ? { expiration: expiration.toString() } : null
+                 //       }
+                 //   }
+
+                    const additionalDevices = await getUSyncDevices(participantsList, !!useUserDevicesCache, false)
+                    devices.push(...additionalDevices)
                 }
-                const bytes = encodeWAMessage(patched);
-                const groupAddressingMode = additionalAttributes?.['addressing_mode'] || groupData?.addressingMode || 'lid';
-                const groupSenderIdentity = groupAddressingMode === 'lid' && meLid ? meLid : meId;
+                
+                const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)));
+                const bytes = Utils_1.encodeWAMessage(patched);
+                
                 const { ciphertext, senderKeyDistributionMessage } = await signalRepository.encryptGroupMessage({
                     group: destinationJid,
                     data: bytes,
-                    meId: groupSenderIdentity
+                    meId,
                 });
-                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;
+                const senderKeyJids = [];
+                
+                for (const { user, device } of devices) {
+                    const jid = WABinary_1.jidEncode(user, (groupData === null || groupData === void 0 ? void 0 : groupData.addressingMode) === 'lid' ? 'lid' : 's.whatsapp.net', device);
+                    if (!senderKeyMap[jid] || !!participant) {
+                        senderKeyJids.push(jid);
+                        // store that this person has had the sender keys sent to them
+                        senderKeyMap[jid] = true;
                     }
                 }
-                if (senderKeyRecipients.length) {
-                    logger.debug({ senderKeyJids: senderKeyRecipients }, 'sending new sender key');
+                // if there are some participants with whom the session has not been established
+                // if there are, we re-send the senderkey
+                if (senderKeyJids.length) {
+                    logger.debug({ senderKeyJids }, 'sending new sender key');
                     const senderKeyMsg = {
                         senderKeyDistributionMessage: {
                             axolotlSenderKeyDistributionMessage: senderKeyDistributionMessage,
                             groupId: destinationJid
                         }
                     };
-                    const senderKeySessionTargets = senderKeyRecipients;
-                    await assertSessions(senderKeySessionTargets);
-                    const result = await createParticipantNodes(senderKeyRecipients, senderKeyMsg, extraAttrs);
+                    await assertSessions(senderKeyJids, false);
+                    const result = await createParticipantNodes(senderKeyJids, 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
-                    });
+                binaryNodeContent.push({
+                    tag: 'enc',
+                    attrs: { v: '2', type: 'skmsg', ...extraAttrs },
+                    content: ciphertext
+                });
+                await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
+            }
+            else if (isNewsletter) {
+                // Message edit
+                if (message.protocolMessage?.editedMessage) {
+                    msgId = message.protocolMessage.key?.id
+                    message = message.protocolMessage.editedMessage
                 }
-                else {
-                    binaryNodeContent.push({
-                        tag: 'enc',
-                        attrs: { 
-                            v: '2',
-                            type: 'skmsg', 
-                            ...extraAttrs
-                        },
-                        content: ciphertext
-                    });
-                    await authState.keys.set({ 'sender-key-memory': { [jid]: senderKeyMap } });
+
+                // Message delete
+                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                    msgId = message.protocolMessage.key?.id
+                    message = {}
                 }
+
+                const patched = await patchMessageBeforeSending(message, [])
+                const bytes = Utils_1.encodeNewsletterMessage(patched)
+
+                binaryNodeContent.push({
+                    tag: 'plaintext',
+                    attrs: extraAttrs ? extraAttrs : {},
+                    content: bytes
+                })
             }
             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);
+                const { user: meUser } = WABinary_1.jidDecode(meId);
                 if (!participant) {
-                    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)
-                        });
+                    devices.push({ user })
+                    if (user !== meUser) {
+                        devices.push({ user: meUser })
                     }
+
                     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 additionalDevices = await getUSyncDevices([meId, jid], !!useUserDevicesCache, true)
+
+                        devices.push(...additionalDevices)
                     }
                 }
-                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);
-                    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;
+                const allJids = [];
+                const meJids = [];
+                const otherJids = [];
+                for (const { user, device } of devices) {
+                    const isMe = user === meUser
+                    const jid = WABinary_1.jidEncode(isMe && isLid ? authState.creds?.me?.lid?.split(':')[0] || user : user, isLid ? 'lid' : 's.whatsapp.net', device)
+
                     if (isMe) {
-                        meRecipients.push(jid);
+                        meJids.push(jid)
                     }
+
                     else {
-                        otherRecipients.push(jid);
+                        otherJids.push(jid)
                     }
-                    allRecipients.push(jid);
+
+                    allJids.push(jid)
                 }
-                await assertSessions(allRecipients);
+                await assertSessions(allJids, false);
                 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)
-                ]);
+                    createParticipantNodes(meJids, meMsg, extraAttrs),
+                    createParticipantNodes(otherJids, message, extraAttrs)
+                ])
                 participants.push(...meNodes);
                 participants.push(...otherNodes);
-               /* if (meRecipients.length > 0 || otherRecipients.length > 0) {
-                    extraAttrs['phash'] = generateParticipantHashV2([...meRecipients, ...otherRecipients]);
-                }*/
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
             }
             if (participants.length) {
                 if (additionalAttributes?.['category'] === 'peer') {
-                    const peerNode = participants[0]?.content?.[0];
+                    const peerNode = participants[0]?.content?.[0]
+
                     if (peerNode) {
-                        binaryNodeContent.push(peerNode); // push only enc
+                        binaryNodeContent.push(peerNode) // push only enc
                     }
                 }
+
                 else {
                     binaryNodeContent.push({
                         tag: 'participants',
                         attrs: {},
                         content: participants
-                    });
+                    })
                 }
             }
+
             const stanza = {
                 tag: 'message',
                 attrs: {
                     id: msgId,
-                    to: destinationJid,
-                    type: getTypeMessage(messages),
+                    type: getTypeMessage(messages), 
                     ...(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)) {
+                if (WABinary_1.isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid;
                     stanza.attrs.participant = participant.jid;
                 }
-                else if (areJidsSameUser(participant.jid, meId)) {
+                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid;
                     stanza.attrs.recipient = destinationJid;
                 }
@@ -748,14 +536,14 @@ export const makeMessagesSocket = (config) => {
                 stanza.attrs.to = destinationJid;
             }
             if (shouldIncludeDeviceIdentity) {
-                ;
                 stanza.content.push({
                     tag: 'device-identity',
                     attrs: {},
-                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
+                    content: (0, Utils_1.encodeSignedDeviceIdentity)(authState.creds.account, true)
                 });
                 logger.debug({ jid }, 'adding device identity');
             }
+     
             if (AI && isPrivate) {
                 const botNode = {
                     tag: 'bot', 
@@ -764,7 +552,7 @@ export const makeMessagesSocket = (config) => {
                     }
                 }
 
-                const filteredBizBot = getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = WABinary_1.getBinaryNodeFilter(additionalNodes ? additionalNodes : []) 
 
                 if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
@@ -776,9 +564,9 @@ export const makeMessagesSocket = (config) => {
                 }
             }
             
-            if(buttonType && !isStatus) {             
-                const content = getAdditionalNode(buttonType)
-                const filteredNode = getBinaryNodeFilter(additionalNodes)
+            if(!isNewsletter && buttonType && !isStatus) {             
+                const content = WABinary_1.getAdditionalNode(buttonType)
+                const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
 
                 if (filteredNode) {
                     didPushAdditional = true
@@ -793,44 +581,42 @@ export const makeMessagesSocket = (config) => {
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
             }
+            
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
-            // Add message to retry cache if enabled
-            if (messageRetryManager && !participant) {
-                messageRetryManager.addRecentMessage(destinationJid, msgId, message);
-            }
-        }, meId);
-        return msgId;
+        });
+        
+        message = Types_1.WAProto.Message.fromObject(message)
+    
+        const messageJSON = {
+            key: {
+               remoteJid: jid,
+               fromMe: true,
+               id: msgId
+            },
+            message: message,
+            messageTimestamp: Utils_1.unixTimestampSeconds(new Date()),
+            messageStubParameters: [],
+            participant: WABinary_1.isJidGroup(jid) || WABinary_1.isJidStatusBroadcast(jid) ? meId : undefined,
+            status: Types_1.WAMessageStatus.PENDING
+        }
+
+        return Types_1.WAProto.WebMessageInfo.fromObject(messageJSON)
+     //   return msgId;
     };
     const getTypeMessage = (msg) => {
-        if (msg.viewOnceMessage) {
-            return getTypeMessage(msg.viewOnceMessage.message);
-        }
-        else if (msg.viewOnceMessageV2) {
-            return getTypeMessage(msg.viewOnceMessageV2.message);
-        }
-        else if (msg.viewOnceMessageV2Extension) {
-            return getTypeMessage(msg.viewOnceMessageV2Extension.message);
-        }
-        else if (msg.ephemeralMessage) {
-            return getTypeMessage(msg.ephemeralMessage.message);
-        }
-        else if (msg.documentWithCaptionMessage) {
-            return getTypeMessage(msg.documentWithCaptionMessage.message);
-        }
-        else if (msg.reactionMessage) {
-            return 'reaction';
-        }
-        else if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3 || msg.pollUpdateMessage) {
-            return 'poll';
-        }
-        else if (getMediaType(msg)) {
-            return 'media';
-        }
+            const message = Utils_1.normalizeMessageContent(msg)  
+        if (message.reactionMessage) {
+            return 'reaction'
+        }       
+        else if (getMediaType(message)) {
+            return 'media'
+        }        
         else {
-            return 'text';
+            return 'text'
         }
-    };
+    }
+
     const getMediaType = (message) => {
         if (message.imageMessage) {
             return 'image'
@@ -880,7 +666,8 @@ export const makeMessagesSocket = (config) => {
         else if (/https:\/\/wa\.me\/p\/\d+\/\d+/.test(message.extendedTextMessage?.text)) {
             return 'productlink'
         }
-    } 
+    }
+ 
     const getButtonType = (message) => {
         if (message.listMessage) {
             return 'list'
@@ -911,11 +698,11 @@ export const makeMessagesSocket = (config) => {
         }
     }
     const getPrivacyTokens = async (jids) => {
-        const t = unixTimestampSeconds().toString();
+        const t = Utils_1.unixTimestampSeconds().toString();
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: S_WHATSAPP_NET,
+                to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'privacy'
             },
@@ -926,7 +713,7 @@ export const makeMessagesSocket = (config) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: jidNormalizedUser(jid),
+                            jid: WABinary_1.jidNormalizedUser(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -935,9 +722,10 @@ export const makeMessagesSocket = (config) => {
             ]
         });
         return result;
-    };
-    const waUploadToServer = getWAUploadToServer(config, refreshMediaConn);
-    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update');
+    }  
+    const waUploadToServer = (0, Utils_1.getWAUploadToServer)(config, refreshMediaConn);
+    const rahmi = new kikyy(Utils_1, waUploadToServer, relayMessage);
+    const waitForMsgMediaUpdate = (0, Utils_1.bindWaitForEvent)(ev, 'messages.media-update');
     return {
         ...sock,
         getPrivacyTokens,
@@ -945,23 +733,23 @@ export const makeMessagesSocket = (config) => {
         relayMessage,
         sendReceipt,
         sendReceipts,
+        rahmi,
         readMessages,
         refreshMediaConn,
+        getUSyncDevices,
+        createParticipantNodes,
         waUploadToServer,
-        fetchPrivacySettings,
         sendPeerDataOperationMessage,
-        createParticipantNodes,
-        getUSyncDevices,
-        messageRetryManager,
+        fetchPrivacySettings,
         updateMediaMessage: async (message) => {
-            const content = assertMediaContent(message.message);
+            const content = (0, Utils_1.assertMediaContent)(message.message);
             const mediaKey = content.mediaKey;
             const meId = authState.creds.me.id;
-            const node = await encryptMediaRetryRequest(message.key, mediaKey, meId);
+            const node = (0, Utils_1.encryptMediaRetryRequest)(message.key, mediaKey, meId);
             let error = undefined;
             await Promise.all([
                 sendNode(node),
-                waitForMsgMediaUpdate(async (update) => {
+                waitForMsgMediaUpdate(update => {
                     const result = update.find(c => c.key.id === message.key.id);
                     if (result) {
                         if (result.error) {
@@ -969,16 +757,13 @@ export const makeMessagesSocket = (config) => {
                         }
                         else {
                             try {
-                                const media = await decryptMediaRetryData(result.media, mediaKey, result.key.id);
-                                if (media.result !== proto.MediaRetryNotification.ResultType.SUCCESS) {
-                                    const resultStr = proto.MediaRetryNotification.ResultType[media.result];
-                                    throw new Boom(`Media re-upload failed by device (${resultStr})`, {
-                                        data: media,
-                                        statusCode: getStatusCodeForMediaRetry(media.result) || 404
-                                    });
+                                const media = (0, Utils_1.decryptMediaRetryData)(result.media, mediaKey, result.key.id);
+                                if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                    const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result];
+                                    throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: (0, Utils_1.getStatusCodeForMediaRetry)(media.result) || 404 });
                                 }
                                 content.directPath = media.directPath;
-                                content.url = getUrlFromDirectPath(content.directPath);
+                                content.url = (0, Utils_1.getUrlFromDirectPath)(content.directPath);
                                 logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful');
                             }
                             catch (err) {
@@ -992,177 +777,133 @@ export const makeMessagesSocket = (config) => {
             if (error) {
                 throw error;
             }
-            ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
+            ev.emit('messages.update', [
+                {
+                    key: message.key,
+                    update: { 
+                        message: message.message
+                    }
+                }
+            ]);
             return message;
         },
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
-            if (typeof content === 'object' &&
-                'disappearingMessagesInChat' in content &&
-                typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                isJidGroup(jid)) {
-                const { disappearingMessagesInChat } = content;
-                const value = typeof disappearingMessagesInChat === 'boolean'
-                    ? disappearingMessagesInChat
-                        ? WA_DEFAULT_EPHEMERAL
-                        : 0
-                    : disappearingMessagesInChat;
-                await groupToggleEphemeral(jid, value);
+            delete options.ephemeralExpiration
+            const { filter = false, quoted } = options;
+            const getParticipantAttr = () => filter ? { participant: { jid } } : {};
+            const messageType = rahmi.detectType(content);
+            if (typeof content === 'object' && 'disappearingMessagesInChat' in content &&
+                typeof content['disappearingMessagesInChat'] !== 'undefined' && WABinary_1.isJidGroup(jid)) {
+                const { disappearingMessagesInChat } = content
+
+                const value = typeof disappearingMessagesInChat === 'boolean' ?
+                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
+                    disappearingMessagesInChat
+
+                await groupToggleEphemeral(jid, value)
             }
-            else if (typeof content === 'object' && 'album' in content && content.album) {
-                const { album, caption } = content;
-                if (caption && !album[0].caption) {
-                    album[0].caption = caption;
-                }
-                let mediaHandle;
-                let mediaMsg;
-                const albumMsg = await generateWAMessageFromContent(jid, {
-                    albumMessage: {
-                        expectedImageCount: album.filter(item => 'image' in item).length,
-                        expectedVideoCount: album.filter(item => 'video' in item).length
-                    }
-                }, { userJid, ...options });
-                await relayMessage(jid, albumMsg.message, {
-                    messageId: albumMsg.key.id
-                });
-                for (const i in album) {
-                    const media = album[i];
-                    if ('image' in media) {
-                        mediaMsg = await generateWAMessage(jid, {
-                            image: media.image,
-                            ...(media.caption ? { caption: media.caption } : {}),
-                            ...options
-                        }, {
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) });
-                                mediaHandle = up.handle;
-                                return up;
-                            },
-                            ...options,
+            
+            else {
+                let mediaHandle
+
+   
+            if (messageType) {
+                switch(messageType) {
+                    case 'PAYMENT':
+                        const paymentContent = await rahmi.handlePayment(content, quoted);
+                        return await relayMessage(jid, paymentContent, {
+                            messageId: Utils_1.generateMessageID(),
+                            ...getParticipantAttr()
                         });
-                    }
-                    else if ('video' in media) {
-                        mediaMsg = await generateWAMessage(jid, {
-                            video: media.video,
-                            ...(media.caption ? { caption: media.caption } : {}),
-                            ...(media.gifPlayback !== undefined ? { gifPlayback: media.gifPlayback } : {}),
-                            ...options
-                        }, {
-                            userJid,
-                            upload: async (readStream, opts) => {
-                                const up = await waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) });
-                                mediaHandle = up.handle;
-                                return up;
-                            },
-                            ...options,
+                
+                    case 'PRODUCT':
+                        const productContent = await rahmi.handleProduct(content, jid, quoted);
+                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
+                        return await relayMessage(jid, productMsg.message, {
+                            messageId: productMsg.key.id,
+                            ...getParticipantAttr()
                         });
-                    }
-                    if (mediaMsg) {
-                        mediaMsg.message.messageContextInfo = {
-                            messageSecret: randomBytes,
-                            messageAssociation: {
-                                associationType: 1,
-                                parentMessageKey: albumMsg.key
-                            }
-                        };
-                    }
-                    await relayMessage(jid, mediaMsg.message, {
-                        messageId: mediaMsg.key.id
-                    });
-                    await new Promise(resolve => setTimeout(resolve, 800));
-                }
-                return albumMsg;
-            }
-            else {
-                const fullMsg = await generateWAMessage(jid, content, {
-                    logger,
-                    userJid,
-                    getUrlInfo: text => getUrlInfo(text, {
-                        thumbnailWidth: linkPreviewImageThumbnailWidth,
-                        fetchOpts: {
-                            timeout: 3000,
-                            ...(httpRequestOptions || {})
-                        },
-                        logger,
-                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                    }),
-                    //TODO: CACHE
-                    getProfilePicUrl: sock.profilePictureUrl,
-                    getCallLink: sock.createCallLink,
-                    upload: async (readStream, opts) => {
-                        const up = await waUploadToServer(readStream, {
-                            ...opts,
-                            newsletter: isJidNewsletter(jid)
+                
+                    case 'INTERACTIVE':
+                        const interactiveContent = await rahmi.handleInteractive(content, jid, quoted);
+                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
+                        return await relayMessage(jid, interactiveMsg.message, {
+                            messageId: interactiveMsg.key.id,
+                            ...getParticipantAttr()
                         });
-                        return up;
+                    case 'ALBUM':
+                        return await rahmi.handleAlbum(content, jid, quoted)
+                    case 'EVENT':
+                        return await rahmi.handleEvent(content, jid, quoted)
+                    case 'POLL_RESULT':
+                        return await rahmi.handlePollResult(content, jid, quoted)
+                    case 'GROUP_STORY':
+                        return await rahmi.handleGroupStory(content, jid, quoted)
+                }
+            }
+            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                logger,
+                userJid,
+                quoted,
+                getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+                    thumbnailWidth: linkPreviewImageThumbnailWidth,
+                    fetchOpts: {
+                        timeout: 3000,
+                        ...axiosOptions || {}
                     },
-                    mediaCache: config.mediaCache,
-                    options: config.options,
-                    messageId: generateMessageIDV2(sock.user?.id),
-                    ...options
-                });
-                const isAiMsg = 'ai' in content && !!content.ai;              
-                const isEventMsg = 'event' in content && !!content.event;
-                const isDeleteMsg = 'delete' in content && !!content.delete;
-                const isEditMsg = 'edit' in content && !!content.edit;
-                const isPinMsg = 'pin' in content && !!content.pin;
-                const isPollMessage = 'poll' in content && !!content.poll;
-                const additionalAttributes = {};
-                const additionalNodes = [];
-                // required for delete
-                if (isDeleteMsg) {
-                    // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe) {
-                        additionalAttributes.edit = '8';
-                    }
-                    else {
-                        additionalAttributes.edit = '7';
-                    }
-                }
-                else if (isEditMsg) {
-                    additionalAttributes.edit = '1';
-                }
-                else if (isAiMsg) {
-                    additionalNodes.push({
+                    logger,
+                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                }),
+                upload: async (readStream, opts) => {
+                    const up = await waUploadToServer(readStream, {
+                        ...opts,
+                        newsletter: WABinary_1.isJidNewsLetter(jid)
+                    });
+                    return up;
+                },
+                mediaCache: config.mediaCache,
+                options: config.options,
+                ...options
+            });
+            
+            const isDeleteMsg = 'delete' in content && !!content.delete;
+            const isEditMsg = 'edit' in content && !!content.edit;
+            const isAiMsg = 'ai' in content && !!content.ai;
+            
+            const additionalAttributes = {};
+            const additionalNodes = [];
+
+            if (isDeleteMsg) {
+                const fromMe = content.delete?.fromMe;
+                const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
+                additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
+            } else if (isEditMsg) {
+                additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
+            } else if (isAiMsg) {
+                additionalNodes.push({
                     attrs: { 
                         biz_bot: '1' 
                     }, tag: "bot" 
                 });
-                }
-                else if (isPinMsg) {
-                    additionalAttributes.edit = '2';
-                }
-                else if (isPollMessage) {
-                    additionalNodes.push({
-                        tag: 'meta',
-                        attrs: {
-                            polltype: 'creation'
-                        }
-                    });
-                }
-                else if (isEventMsg) {
-                    additionalNodes.push({
-                        tag: 'meta',
-                        attrs: {
-                            event_type: 'creation'
-                        }
-                    });
-                }
-                await relayMessage(jid, fullMsg.message, {
-                    messageId: fullMsg.key.id,
-                    useCachedGroupMetadata: options.useCachedGroupMetadata,
-                    additionalAttributes,
-                    statusJidList: options.statusJidList,
-                    additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes
+            }
+            
+            await relayMessage(jid, fullMsg.message, {
+                messageId: fullMsg.key.id,
+                cachedGroupMetadata: options.cachedGroupMetadata,
+                additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
+                additionalAttributes,
+                statusJidList: options.statusJidList
+            });
+            
+            if (config.emitOwnEvents) {
+                process.nextTick(() => {
+                    processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
                 });
-                if (config.emitOwnEvents) {
-                    process.nextTick(() => {
-                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
-                    });
-                }
-                return fullMsg;
+            }
+            return fullMsg;
             }
         }
-    };
-};
+    }
+};
+exports.makeMessagesSocket = makeMessagesSocket;