alipclutch-baileys 8.3.0 → 8.4.1

package/lib/Utils/messages.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { Logger } from 'pino';
 import { type Transform } from 'stream';
 import { proto } from '../../WAProto';
+import { ILogger } from './logger';
 import { AnyMediaMessageContent, AnyMessageContent, MediaGenerationOptions, MessageContentGenerationOptions, MessageGenerationOptions, MessageGenerationOptionsFromContent, MessageUserReceipt, WAMessage, WAMessageContent, WAProto } from '../Types';
 import { MediaDownloadOptions } from './messages-media';
 /**
@@ -11,7 +9,7 @@ import { MediaDownloadOptions } from './messages-media';
  * @returns the URL, eg. https://google.com
  */
 export declare const extractUrlFromText: (text: string) => string | undefined;
-export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions['getUrlInfo'], logger: MessageGenerationOptions['logger']) => Promise<import("../Types").WAUrlInfo | undefined>;
+export declare const generateLinkPreviewIfRequired: (text: string, getUrlInfo: MessageGenerationOptions["getUrlInfo"], logger: MessageGenerationOptions["logger"]) => Promise<import("../Types").WAUrlInfo | undefined>;
 export declare const prepareWAMessageMedia: (message: AnyMediaMessageContent, options: MediaGenerationOptions) => Promise<proto.Message>;
 export declare const prepareDisappearingMessageSettingContent: (ephemeralExpiration?: number) => proto.Message;
 /**
@@ -40,13 +38,13 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
 /**
  * Returns the device predicted by message ID
  */
-export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
+export declare const getDevice: (id: string) => "web" | "unknown" | "android" | "ios" | "desktop";
 /** Upserts a receipt in the message */
-export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, 'userReceipt'>, receipt: MessageUserReceipt) => void;
+export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, "userReceipt">, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */
-export declare const updateMessageWithReaction: (msg: Pick<WAMessage, 'reactions'>, reaction: proto.IReaction) => void;
+export declare const updateMessageWithReaction: (msg: Pick<WAMessage, "reactions">, reaction: proto.IReaction) => void;
 /** Update the message with a new poll update */
-export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, 'pollUpdates'>, update: proto.IPollUpdate) => void;
+export declare const updateMessageWithPollUpdate: (msg: Pick<WAMessage, "pollUpdates">, update: proto.IPollUpdate) => void;
 type VoteAggregation = {
     name: string;
     voters: string[];
@@ -66,12 +64,17 @@ export declare const aggregateMessageKeysNotFromMe: (keys: proto.IMessageKey[])
 }[];
 type DownloadMediaMessageContext = {
     reuploadRequest: (msg: WAMessage) => Promise<WAMessage>;
-    logger: Logger;
+    logger: ILogger;
 };
 /**
  * Downloads the given message. Throws an error if it's not a media message
  */
-export declare const downloadMediaMessage: <Type extends "stream" | "buffer">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer : Transform>;
+export declare const downloadMediaMessage: <Type extends "buffer" | "stream">(message: WAMessage, type: Type, options: MediaDownloadOptions, ctx?: DownloadMediaMessageContext) => Promise<Type extends "buffer" ? Buffer<ArrayBufferLike> : Transform>;
 /** Checks whether the given message is a media message; if it is returns the inner content */
 export declare const assertMediaContent: (content: proto.IMessage | null | undefined) => proto.Message.IVideoMessage | proto.Message.IImageMessage | proto.Message.IAudioMessage | proto.Message.IDocumentMessage | proto.Message.IStickerMessage;
+export declare const toJid: (id: string) => string;
+export declare const getSenderLid: (msg: WAMessage) => {
+    jid: string;
+    lid: string;
+};
 export {};

package/lib/Utils/messages.js

@@ -1,9 +1,10 @@
-"use strict"; 
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.getAggregateVotesInPollMessage = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
+exports.assertMediaContent = exports.downloadMediaMessage = exports.aggregateMessageKeysNotFromMe = exports.updateMessageWithPollUpdate = exports.updateMessageWithReaction = exports.updateMessageWithReceipt = exports.getDevice = exports.extractMessageContent = exports.normalizeMessageContent = exports.getContentType = exports.generateWAMessage = exports.generateWAMessageFromContent = exports.generateWAMessageContent = exports.generateForwardMessageContent = exports.prepareDisappearingMessageSettingContent = exports.prepareWAMessageMedia = exports.generateLinkPreviewIfRequired = exports.extractUrlFromText = void 0;
+exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
@@ -74,11 +75,8 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     if (!mediaType) {
-        throw new boom_1.Boom('Invalid media type', { 
-            statusCode: 400 
-        });
+        throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
     }
-
     const uploadData = {
         ...message,
         ...(message.annotations ? {
@@ -116,20 +114,20 @@ const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[mediaType];
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
+    // generate the key
     mediaType + ':' + uploadData.media.url.toString());
-    
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
-    
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-
+    // check for cache hit
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -140,8 +138,7 @@ const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
-
-    const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
+   const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
         (typeof uploadData['jpegThumbnail'] === 'undefined');
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
@@ -202,13 +199,18 @@ const prepareWAMessageMedia = async (message, options) => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        
+        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
-            await fs_1.promises.unlink(bodyPath);
-            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+            try {
+                await fs_1.promises.access(bodyPath);
+                await fs_1.promises.unlink(bodyPath);
+                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
+            }
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
         }
     });
-
     const obj = Types_1.WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: handle ? undefined : mediaUrl,
@@ -222,17 +224,14 @@ const prepareWAMessageMedia = async (message, options) => {
             media: undefined
         })
     });
-
     if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
         delete obj.videoMessage;
     }
-
     if (cacheableKey) {
         logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
         options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
     }
-
     return obj;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
@@ -283,8 +282,8 @@ const generateForwardMessageContent = (message, forceForward) => {
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
-    var _a;
-    var _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _p, _q;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -293,7 +292,6 @@ const generateWAMessageContent = async (message, options) => {
             urlInfo = await (0, exports.generateLinkPreviewIfRequired)(message.text, options.getUrlInfo, options.logger);
         }
         if (urlInfo) {
-            extContent.canonicalUrl = urlInfo['canonical-url'];
             extContent.matchedText = urlInfo['matched-text'];
             extContent.jpegThumbnail = urlInfo.jpegThumbnail;
             extContent.description = urlInfo.description;
@@ -354,6 +352,54 @@ const generateWAMessageContent = async (message, options) => {
             message.disappearingMessagesInChat;
         m = (0, exports.prepareDisappearingMessageSettingContent)(exp);
     }
+    else if ('groupInvite' in message) {
+        m.groupInviteMessage = {};
+        m.groupInviteMessage.inviteCode = message.groupInvite.inviteCode;
+        m.groupInviteMessage.inviteExpiration = message.groupInvite.inviteExpiration;
+        m.groupInviteMessage.caption = message.groupInvite.text;
+        m.groupInviteMessage.groupJid = message.groupInvite.jid;
+        m.groupInviteMessage.groupName = message.groupInvite.subject;
+        //TODO: use built-in interface and get disappearing mode info etc.
+        //TODO: cache / use store!?
+        if (options.getProfilePicUrl) {
+            const pfpUrl = await options.getProfilePicUrl(message.groupInvite.jid, 'preview');
+            if (pfpUrl) {
+                const resp = await axios_1.default.get(pfpUrl, { responseType: 'arraybuffer' });
+                if (resp.status === 200) {
+                    m.groupInviteMessage.jpegThumbnail = resp.data;
+                }
+            }
+        }
+    }
+    else if ('pin' in message) {
+        m.pinInChatMessage = {};
+        m.messageContextInfo = {};
+        m.pinInChatMessage.key = message.pin;
+        m.pinInChatMessage.type = message.type;
+        m.pinInChatMessage.senderTimestampMs = Date.now();
+        m.messageContextInfo.messageAddOnDurationInSecs = message.type === 1 ? message.time || 86400 : 0;
+    }
+    else if ('keep' in message) {
+        m.keepInChatMessage = {};
+        m.keepInChatMessage.key = message.keep;
+        m.keepInChatMessage.keepType = message.type;
+        m.keepInChatMessage.timestampMs = Date.now();
+    }
+    else if ('call' in message) {
+        m = {
+            scheduledCallCreationMessage: {
+                scheduledTimestampMs: (_a = message.call.time) !== null && _a !== void 0 ? _a : Date.now(),
+                callType: (_b = message.call.type) !== null && _b !== void 0 ? _b : 1,
+                title: message.call.title
+            }
+        };
+    }
+    else if ('paymentInvite' in message) {
+        m.paymentInviteMessage = {
+            serviceType: message.paymentInvite.type,
+            expiryTimestamp: message.paymentInvite.expiry
+        };
+    }
     else if ('buttonReply' in message) {
         switch (message.type) {
             case 'template':
@@ -372,6 +418,10 @@ const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
+    else if ('ptv' in message && message.ptv) {
+        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ video: message.video }, options);
+        m.ptvMessage = videoMessage;
+    }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
         m.productMessage = Types_1.WAProto.Message.ProductMessage.fromObject({
@@ -382,11 +432,27 @@ const generateWAMessageContent = async (message, options) => {
             }
         });
     }
+    else if ('order' in message) {
+        m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject({
+            orderId: message.order.id,
+            thumbnail: message.order.thumbnail,
+            itemCount: message.order.itemCount,
+            status: message.order.status,
+            surface: message.order.surface,
+            orderTitle: message.order.title,
+            message: message.order.text,
+            sellerJid: message.order.seller,
+            token: message.order.token,
+            totalAmount1000: message.order.amount,
+            totalCurrencyCode: message.order.currency
+        });
+    }
     else if ('listReply' in message) {
         m.listResponseMessage = { ...message.listReply };
     }
     else if ('poll' in message) {
-        (_b = message.poll).selectableCount || (_b.selectableCount = 0);
+        (_p = message.poll).selectableCount || (_p.selectableCount = 0);
+        (_q = message.poll).toAnnouncementGroup || (_q.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
@@ -398,11 +464,72 @@ const generateWAMessageContent = async (message, options) => {
             // encKey
             messageSecret: message.poll.messageSecret || (0, crypto_1.randomBytes)(32),
         };
-        m.pollCreationMessage = {
+        const pollCreationMessage = {
             name: message.poll.name,
             selectableOptionsCount: message.poll.selectableCount,
             options: message.poll.values.map(optionName => ({ optionName })),
         };
+        if (message.poll.toAnnouncementGroup) {
+            // poll v2 is for community announcement groups (single select and multiple)
+            m.pollCreationMessageV2 = pollCreationMessage;
+        }
+        else {
+            if (message.poll.selectableCount === 1) {
+                // poll v3 is for single select polls
+                m.pollCreationMessageV3 = pollCreationMessage;
+            }
+            else {
+                // poll for multiple choice polls
+                m.pollCreationMessage = pollCreationMessage;
+            }
+        }
+    }
+    else if ('event' in message) {
+        m.messageContextInfo = {
+            messageSecret: message.event.messageSecret || (0, crypto_1.randomBytes)(32),
+        };
+        m.eventMessage = { ...message.event };
+    }
+    else if ('inviteAdmin' in message) {
+        m.newsletterAdminInviteMessage = {};
+        m.newsletterAdminInviteMessage.inviteExpiration = message.inviteAdmin.inviteExpiration;
+        m.newsletterAdminInviteMessage.caption = message.inviteAdmin.text;
+        m.newsletterAdminInviteMessage.newsletterJid = message.inviteAdmin.jid;
+        m.newsletterAdminInviteMessage.newsletterName = message.inviteAdmin.subject;
+        m.newsletterAdminInviteMessage.jpegThumbnail = message.inviteAdmin.thumbnail;
+    }
+    else if ('requestPayment' in message) {
+        const sticker = ((_c = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _c === void 0 ? void 0 : _c.sticker) ?
+            await (0, exports.prepareWAMessageMedia)({ sticker: (_d = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _d === void 0 ? void 0 : _d.sticker, ...options }, options)
+            : null;
+        let notes = {};
+        if ((_e = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _e === void 0 ? void 0 : _e.sticker) {
+            notes = {
+                stickerMessage: {
+                    ...sticker === null || sticker === void 0 ? void 0 : sticker.stickerMessage,
+                    contextInfo: (_f = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _f === void 0 ? void 0 : _f.contextInfo
+                }
+            };
+        }
+        else if (message.requestPayment.note) {
+            notes = {
+                extendedTextMessage: {
+                    text: message.requestPayment.note,
+                    contextInfo: (_g = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _g === void 0 ? void 0 : _g.contextInfo,
+                }
+            };
+        }
+        else {
+            throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
+        }
+        m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
+            expiryTimestamp: message.requestPayment.expiry,
+            amount1000: message.requestPayment.amount,
+            currencyCodeIso4217: message.requestPayment.currency,
+            requestFrom: message.requestPayment.from,
+            noteMessage: { ...notes },
+            background: (_h = message.requestPayment.background) !== null && _h !== void 0 ? _h : null,
+        });
     }
     else if ('sharePhoneNumber' in message) {
         m.protocolMessage = {
@@ -412,6 +539,14 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
+    else if ('album' in message) {
+        const imageMessages = message.album.filter(item => 'image' in item);
+        const videoMessages = message.album.filter(item => 'video' in item);
+        m.albumMessage = WAProto_1.proto.Message.AlbumMessage.fromObject({
+            expectedImageCount: imageMessages.length,
+            expectedVideoCount: videoMessages.length,
+        });
+    }
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
@@ -431,14 +566,24 @@ const generateWAMessageContent = async (message, options) => {
             buttonsMessage.headerType = ButtonType[type];
             Object.assign(buttonsMessage, m);
         }
+        if ('title' in message && !!message.title) {
+            buttonsMessage.text = message.title,
+                buttonsMessage.headerType = ButtonType.TEXT;
+        }
         if ('footer' in message && !!message.footer) {
             buttonsMessage.footerText = message.footer;
         }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            buttonsMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            buttonsMessage.contextInfo = { mentionedJid: message.mentions };
+        }
         m = { buttonsMessage };
     }
     else if ('templateButtons' in message && !!message.templateButtons) {
         const msg = {
-            hydratedButtons: message.templateButtons
+            hydratedButtons: message.hasOwnProperty("templateButtons") ? message.templateButtons : message.templateButtons
         };
         if ('text' in message) {
             msg.hydratedContentText = message.text;
@@ -470,10 +615,97 @@ const generateWAMessageContent = async (message, options) => {
         };
         m = { listMessage };
     }
+    if ('interactiveButtons' in message && !!message.interactiveButtons) {
+        const interactiveMessage = {
+            nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
+                buttons: message.interactiveButtons,
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_j = message === null || message === void 0 ? void 0 : message.media) !== null && _j !== void 0 ? _j : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
+    if ('shop' in message && !!message.shop) {
+        const interactiveMessage = {
+            shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
+                surface: message.shop,
+                id: message.id
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_m = message === null || message === void 0 ? void 0 : message.media) !== null && _m !== void 0 ? _m : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
     if ('viewOnce' in message && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if ('mentions' in message && ((_a = message.mentions) === null || _a === void 0 ? void 0 : _a.length)) {
+    if ('mentions' in message && ((_o = message.mentions) === null || _o === void 0 ? void 0 : _o.length)) {
         const [messageType] = Object.keys(m);
         m[messageType].contextInfo = m[messageType] || {};
         m[messageType].contextInfo.mentionedJid = message.mentions;
@@ -506,26 +738,29 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const key = (0, exports.getContentType)(innerMessage);
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid } = options;
-    if (quoted && !(0, WABinary_1.isJidNewsLetter)(jid)) {
+    // only set quoted if isn't a newsletter message
+    if (quoted && !(0, WABinary_1.isJidNewsletter)(jid)) {
         const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
         let quotedMsg = (0, exports.normalizeMessageContent)(quoted.message);
         const msgType = (0, exports.getContentType)(quotedMsg);
         // strip any redundant properties
-        quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
-        const quotedContent = quotedMsg[msgType];
-        if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
-            delete quotedContent.contextInfo;
-        }
-        const contextInfo = innerMessage[key].contextInfo || {};
-        contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
-        contextInfo.stanzaId = quoted.key.id;
-        contextInfo.quotedMessage = quotedMsg;
-        // if a participant is quoted, then it must be a group
-        // hence, remoteJid of group must also be entered
-        if (jid !== quoted.key.remoteJid) {
-            contextInfo.remoteJid = quoted.key.remoteJid;
-        }
-        innerMessage[key].contextInfo = contextInfo;
+        if (quotedMsg) {
+            quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
+            const quotedContent = quotedMsg[msgType];
+            if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
+                delete quotedContent.contextInfo;
+            }
+            const contextInfo = innerMessage[key].contextInfo || {};
+            contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
+            contextInfo.stanzaId = quoted.key.id;
+            contextInfo.quotedMessage = quotedMsg;
+            // if a participant is quoted, then it must be a group
+            // hence, remoteJid of group must also be entered
+            if (jid !== quoted.key.remoteJid) {
+                contextInfo.remoteJid = quoted.key.remoteJid;
+            }
+            innerMessage[key].contextInfo = contextInfo;
+        }
     }
     if (
     // if we want to send a disappearing message
@@ -535,7 +770,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         // already not converted to disappearing message
         key !== 'ephemeralMessage' &&
         // newsletter not accept disappearing messages
-        !(0, WABinary_1.isJidNewsLetter)(jid)) {
+        !(0, WABinary_1.isJidNewsletter)(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
             expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
@@ -547,7 +782,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
         },
         message: message,
         messageTimestamp: timestamp,
@@ -562,7 +797,7 @@ const generateWAMessage = async (jid, content, options) => {
     var _a;
     // ensure msg ID is with every log
     options.logger = (_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.child({ msgId: options.messageId });
-    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { newsletter: (0, WABinary_1.isJidNewsLetter)(jid), ...options }), options);
+    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { newsletter: (0, WABinary_1.isJidNewsletter)(jid), ...options }), options);
 };
 exports.generateWAMessage = generateWAMessage;
 /** Get the key to access the true type of content */
@@ -599,7 +834,24 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension)
-            || (message === null || message === void 0 ? void 0 : message.editedMessage));
+            || (message === null || message === void 0 ? void 0 : message.editedMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupMentionedMessage)
+            || (message === null || message === void 0 ? void 0 : message.botInvokeMessage)
+            || (message === null || message === void 0 ? void 0 : message.lottieStickerMessage)
+            || (message === null || message === void 0 ? void 0 : message.eventCoverImage)
+            || (message === null || message === void 0 ? void 0 : message.statusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationOptionImageMessage)
+            || (message === null || message === void 0 ? void 0 : message.associatedChildMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5)
+            || (message === null || message === void 0 ? void 0 : message.statusAddYours)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessage)
+            || (message === null || message === void 0 ? void 0 : message.limitSharingMessage)
+            || (message === null || message === void 0 ? void 0 : message.botTaskMessage)
+            || (message === null || message === void 0 ? void 0 : message.questionMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2)
+            || (message === null || message === void 0 ? void 0 : message.botForwardedMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -649,7 +901,11 @@ exports.extractMessageContent = extractMessageContent;
 /**
  * Returns the device predicted by message ID
  */
-const getDevice = (id) => /^3A.{18}$/.test(id) ? 'ios' : /^3E.{20}$/.test(id) ? 'web' : /^(.{21}|.{32})$/.test(id) ? 'android' : /^.{18}$/.test(id) ? 'desktop' : 'unknown';
+const getDevice = (id) => /^3A.{18}$/.test(id) ? 'ios' :
+    /^3E.{20}$/.test(id) ? 'web' :
+        /^(.{21}|.{32})$/.test(id) ? 'android' :
+            /^(3F|.{18}$)/.test(id) ? 'desktop' :
+                'unknown';
 exports.getDevice = getDevice;
 /** Upserts a receipt in the message */
 const updateMessageWithReceipt = (msg, receipt) => {
@@ -668,9 +924,8 @@ const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
     const reactions = (msg.reactions || [])
         .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    reaction.text = reaction.text || '';
+    reactions.push(reaction);
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
@@ -723,7 +978,6 @@ function getAggregateVotesInPollMessage({ message, pollUpdates }, meId) {
     }
     return Object.values(voteHashMap);
 }
-exports.getAggregateVotesInPollMessage = getAggregateVotesInPollMessage;
 /** Given a list of message keys, aggregates them by chat & sender. Useful for sending read receipts in bulk */
 const aggregateMessageKeysNotFromMe = (keys) => {
     const keyMap = {};
@@ -814,3 +1068,22 @@ const assertMediaContent = (content) => {
     return mediaContent;
 };
 exports.assertMediaContent = assertMediaContent;
+
+const toJid = (id) => {
+    if (!id)
+        return '';
+    if (id.endsWith('@lid'))
+        return id.replace('@lid', '@s.whatsapp.net');
+    if (id.includes('@'))
+        return id;
+    return `${id}@s.whatsapp.net`;
+};
+exports.toJid = toJid;
+const getSenderLid = (message) => {
+    const sender = message.key.participant || message.key.remoteJid;
+    const user = (0, WABinary_1.jidDecode)(sender)?.user || '';
+    const lid = (0, WABinary_1.jidEncode)(user, 'lid');
+    console.log('sender lid:', lid);
+    return { jid: sender, lid };
+};
+exports.getSenderLid = getSenderLid;

package/lib/Utils/noise-handler.d.ts

@@ -1,21 +1,19 @@
-/// <reference types="node" />
-import { Logger } from 'pino';
+import { ILogger } from './logger';
 import { proto } from '../../WAProto';
 import { KeyPair } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
-    mobile: boolean;
-    logger: Logger;
+    logger: ILogger;
     routingInfo?: Buffer | undefined;
 }) => {
-    encrypt: (plaintext: Uint8Array) => Buffer;
-    decrypt: (ciphertext: Uint8Array) => Buffer;
+    encrypt: (plaintext: Uint8Array) => Buffer<ArrayBuffer>;
+    decrypt: (ciphertext: Uint8Array) => Buffer<ArrayBuffer>;
     authenticate: (data: Uint8Array) => void;
-    mixIntoKey: (data: Uint8Array) => void;
-    finishInit: () => void;
-    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Buffer;
-    encodeFrame: (data: Buffer | Uint8Array) => Buffer;
-    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => void;
+    mixIntoKey: (data: Uint8Array) => Promise<void>;
+    finishInit: () => Promise<void>;
+    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Promise<Buffer<ArrayBuffer>>;
+    encodeFrame: (data: Buffer | Uint8Array) => Buffer<ArrayBuffer>;
+    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>;
 };