@queenanya/baileys 7.1.9 → 7.2.0

package/lib/Utils/messages.js

@@ -30,7 +30,6 @@ const MessageTypeProto = {
     'sticker': Types_1.WAProto.Message.StickerMessage,
     'document': Types_1.WAProto.Message.DocumentMessage,
 };
-const ButtonType = WAProto_1.proto.Message.ButtonsMessage.HeaderType;
 /**
  * Uses a regex to test whether the string contains a URL, and returns the URL if it does.
  * @param text eg. hello https://google.com
@@ -240,7 +239,7 @@ const generateForwardMessageContent = (message, forceForward) => {
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
     var _a;
-    var _b;
+    var _b, _c;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -382,6 +381,7 @@ const generateWAMessageContent = async (message, options) => {
     }
     else if ('poll' in message) {
         (_b = message.poll).selectableCount || (_b.selectableCount = 0);
+        (_c = message.poll).toAnnouncementGroup || (_c.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
@@ -393,11 +393,25 @@ 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 > 0) {
+                //poll v3 is for single select polls
+                m.pollCreationMessageV3 = pollCreationMessage;
+            }
+            else {
+                // poll v3 for multiple choice polls
+                m.pollCreationMessage = pollCreationMessage;
+            }
+        }
     }
     else if ('sharePhoneNumber' in message) {
         m.protocolMessage = {
@@ -410,61 +424,6 @@ const generateWAMessageContent = async (message, options) => {
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
-    if ('buttons' in message && !!message.buttons) {
-        const buttonsMessage = {
-            buttons: message.buttons.map(b => ({ ...b, type: WAProto_1.proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
-        };
-        if ('text' in message) {
-            buttonsMessage.contentText = message.text;
-            buttonsMessage.headerType = ButtonType.EMPTY;
-        }
-        else {
-            if ('caption' in message) {
-                buttonsMessage.contentText = message.caption;
-            }
-            const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
-            buttonsMessage.headerType = ButtonType[type];
-            Object.assign(buttonsMessage, m);
-        }
-        if ('footer' in message && !!message.footer) {
-            buttonsMessage.footerText = message.footer;
-        }
-        m = { buttonsMessage };
-    }
-    else if ('templateButtons' in message && !!message.templateButtons) {
-        const msg = {
-            hydratedButtons: message.templateButtons
-        };
-        if ('text' in message) {
-            msg.hydratedContentText = message.text;
-        }
-        else {
-            if ('caption' in message) {
-                msg.hydratedContentText = message.caption;
-            }
-            Object.assign(msg, m);
-        }
-        if ('footer' in message && !!message.footer) {
-            msg.hydratedFooterText = message.footer;
-        }
-        m = {
-            templateMessage: {
-                fourRowTemplate: msg,
-                hydratedTemplate: msg
-            }
-        };
-    }
-    if ('sections' in message && !!message.sections) {
-        const listMessage = {
-            sections: message.sections,
-            buttonText: message.buttonText,
-            title: message.title,
-            footerText: message.footer,
-            description: message.text,
-            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
-        };
-        m = { listMessage };
-    }
     if ('viewOnce' in message && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }

package/lib/Utils/process-message.d.ts

@@ -1,9 +1,10 @@
 import { AxiosRequestConfig } from 'axios';
 import type { Logger } from 'pino';
 import { proto } from '../../WAProto';
-import { AuthenticationCreds, BaileysEventEmitter, SignalKeyStoreWithTransaction, SocketConfig } from '../Types';
+import { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SocketConfig } from '../Types';
 type ProcessMessageContext = {
     shouldProcessHistoryMsg: boolean;
+    placeholderResendCache?: CacheStore;
     creds: AuthenticationCreds;
     keyStore: SignalKeyStoreWithTransaction;
     ev: BaileysEventEmitter;
@@ -37,5 +38,5 @@ type PollContext = {
  * @returns list of SHA256 options
  */
 export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage;
-declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>;
+declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>;
 export default processMessage;

package/lib/Utils/process-message.js

@@ -102,8 +102,8 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
     }
 }
 exports.decryptPollVote = decryptPollVote;
-const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const meId = creds.me.id;
     const { accountSettings } = creds;
     const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
@@ -137,14 +137,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                     isLatest,
                 }, 'got history notification');
                 if (process) {
-                    ev.emit('creds.update', {
-                        processedHistoryMessages: [
-                            ...(creds.processedHistoryMessages || []),
-                            { key: message.key, messageTimestamp: message.messageTimestamp }
-                        ]
-                    });
+                    if (histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                        ev.emit('creds.update', {
+                            processedHistoryMessages: [
+                                ...(creds.processedHistoryMessages || []),
+                                { key: message.key, messageTimestamp: message.messageTimestamp }
+                            ]
+                        });
+                    }
                     const data = await (0, history_1.downloadAndProcessHistorySyncNotification)(histNotification, options);
-                    ev.emit('messaging-history.set', { ...data, isLatest });
+                    ev.emit('messaging-history.set', {
+                        ...data,
+                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
+                            ? isLatest
+                            : undefined
+                    });
                 }
                 break;
             case WAProto_1.proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
@@ -187,14 +194,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage;
                 if (response) {
+                    placeholderResendCache === null || placeholderResendCache === void 0 ? void 0 : placeholderResendCache.del(response.stanzaId);
+                    // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
                     const { peerDataOperationResult } = response;
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result;
                         if (retryResponse) {
                             const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
-                            ev.emit('messages.update', [
-                                { key: webMessageInfo.key, update: { message: webMessageInfo.message } }
-                            ]);
+                            // wait till another upsert event is available, don't want it to be part of the PDO response message
+                            setTimeout(() => {
+                                ev.emit('messages.upsert', {
+                                    messages: [webMessageInfo],
+                                    type: 'notify',
+                                    requestId: response.stanzaId
+                                });
+                            }, 500);
                         }
                     }
                 }
@@ -208,11 +222,11 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
         };
         ev.emit('messages.reaction', [{
                 reaction,
-                key: content.reactionMessage.key,
+                key: (_d = content.reactionMessage) === null || _d === void 0 ? void 0 : _d.key,
             }]);
     }
     else if (message.messageStubType) {
-        const jid = message.key.remoteJid;
+        const jid = (_e = message.key) === null || _e === void 0 ? void 0 : _e.remoteJid;
         //let actor = whatsappID (message.participant)
         let participants;
         const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }));
@@ -256,39 +270,39 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                 emitParticipantsUpdate('promote');
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
-                const announceValue = (_d = message.messageStubParameters) === null || _d === void 0 ? void 0 : _d[0];
+                const announceValue = (_f = message.messageStubParameters) === null || _f === void 0 ? void 0 : _f[0];
                 emitGroupUpdate({ announce: announceValue === 'true' || announceValue === 'on' });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT:
-                const restrictValue = (_e = message.messageStubParameters) === null || _e === void 0 ? void 0 : _e[0];
+                const restrictValue = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
                 emitGroupUpdate({ restrict: restrictValue === 'true' || restrictValue === 'on' });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT:
-                const name = (_f = message.messageStubParameters) === null || _f === void 0 ? void 0 : _f[0];
+                const name = (_h = message.messageStubParameters) === null || _h === void 0 ? void 0 : _h[0];
                 chat.name = name;
                 emitGroupUpdate({ subject: name });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
-                const description = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
+                const description = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
                 chat.description = description;
                 emitGroupUpdate({ desc: description });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
-                const code = (_h = message.messageStubParameters) === null || _h === void 0 ? void 0 : _h[0];
+                const code = (_k = message.messageStubParameters) === null || _k === void 0 ? void 0 : _k[0];
                 emitGroupUpdate({ inviteCode: code });
                 break;
             case Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE:
-                const memberAddValue = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
+                const memberAddValue = (_l = message.messageStubParameters) === null || _l === void 0 ? void 0 : _l[0];
                 emitGroupUpdate({ memberAddMode: memberAddValue === 'all_member_add' });
                 break;
             case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
-                const approvalMode = (_k = message.messageStubParameters) === null || _k === void 0 ? void 0 : _k[0];
+                const approvalMode = (_m = message.messageStubParameters) === null || _m === void 0 ? void 0 : _m[0];
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
                 break;
             case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
-                const participant = (_l = message.messageStubParameters) === null || _l === void 0 ? void 0 : _l[0];
-                const action = (_m = message.messageStubParameters) === null || _m === void 0 ? void 0 : _m[1];
-                const method = (_o = message.messageStubParameters) === null || _o === void 0 ? void 0 : _o[2];
+                const participant = (_o = message.messageStubParameters) === null || _o === void 0 ? void 0 : _o[0];
+                const action = (_p = message.messageStubParameters) === null || _p === void 0 ? void 0 : _p[1];
+                const method = (_q = message.messageStubParameters) === null || _q === void 0 ? void 0 : _q[2];
                 emitGroupRequestJoin(participant, action, method);
                 break;
         }
@@ -301,7 +315,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             const meIdNormalised = (0, WABinary_1.jidNormalizedUser)(meId);
             const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
             const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
-            const pollEncKey = (_p = pollMsg.messageContextInfo) === null || _p === void 0 ? void 0 : _p.messageSecret;
+            const pollEncKey = (_r = pollMsg.messageContextInfo) === null || _r === void 0 ? void 0 : _r.messageSecret;
             try {
                 const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
                     pollEncKey,

package/lib/WABinary/jid-utils.d.ts

@@ -24,8 +24,8 @@ export declare const isLidUser: (jid: string | undefined) => boolean | undefined
 export declare const isJidBroadcast: (jid: string | undefined) => boolean | undefined;
 /** is the jid a group */
 export declare const isJidGroup: (jid: string | undefined) => boolean | undefined;
-/** is the jid a newsletter */
-export declare const isJidNewsletter: (jid: string | undefined) => boolean | undefined;
 /** is the jid the status broadcast */
 export declare const isJidStatusBroadcast: (jid: string) => boolean;
+/** is the jid a newsletter */
+export declare const isJidNewsletter: (jid: string | undefined) => boolean | undefined;
 export declare const jidNormalizedUser: (jid: string | undefined) => string;

package/lib/WABinary/jid-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jidNormalizedUser = exports.isJidStatusBroadcast = exports.isJidNewsletter = exports.isJidGroup = exports.isJidBroadcast = exports.isLidUser = exports.isJidUser = exports.areJidsSameUser = exports.jidDecode = exports.jidEncode = exports.STORIES_JID = exports.PSA_WID = exports.SERVER_JID = exports.OFFICIAL_BIZ_JID = exports.S_WHATSAPP_NET = void 0;
+exports.jidNormalizedUser = exports.isJidNewsletter = exports.isJidStatusBroadcast = exports.isJidGroup = exports.isJidBroadcast = exports.isLidUser = exports.isJidUser = exports.areJidsSameUser = exports.jidDecode = exports.jidEncode = exports.STORIES_JID = exports.PSA_WID = exports.SERVER_JID = exports.OFFICIAL_BIZ_JID = exports.S_WHATSAPP_NET = void 0;
 exports.S_WHATSAPP_NET = '@s.whatsapp.net';
 exports.OFFICIAL_BIZ_JID = '16505361212@c.us';
 exports.SERVER_JID = 'server@c.us';
@@ -45,12 +45,12 @@ exports.isJidBroadcast = isJidBroadcast;
 /** is the jid a group */
 const isJidGroup = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@g.us'));
 exports.isJidGroup = isJidGroup;
-/** is the jid a newsletter */
-const isJidNewsletter = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@newsletter'));
-exports.isJidNewsletter = isJidNewsletter;
 /** is the jid the status broadcast */
 const isJidStatusBroadcast = (jid) => jid === 'status@broadcast';
 exports.isJidStatusBroadcast = isJidStatusBroadcast;
+/** is the jid a newsletter */
+const isJidNewsletter = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@newsletter'));
+exports.isJidNewsletter = isJidNewsletter;
 const jidNormalizedUser = (jid) => {
     const result = (0, exports.jidDecode)(jid);
     if (!result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@queenanya/baileys",
-  "version": "7.1.9",
+  "version": "7.2.0",
   "description": "WhatsApp API",
   "keywords": [
     "whatsapp",