@periskope/baileys 6.7.18-alpha.1 → 6.7.18-alpha.3

package/lib/Socket/groups.js

@@ -9,15 +9,15 @@ const chats_1 = require("./chats");
 const makeGroupsSocket = (config) => {
     const sock = (0, chats_1.makeChatsSocket)(config);
     const { authState, ev, query, upsertMessage } = sock;
-    const groupQuery = async (jid, type, content) => (query({
+    const groupQuery = async (jid, type, content) => query({
         tag: 'iq',
         attrs: {
             type,
             xmlns: 'w:g2',
-            to: jid,
+            to: jid
         },
         content
-    }));
+    });
     const groupMetadata = async (jid) => {
         const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
         return (0, exports.extractGroupMetadata)(result);
@@ -28,7 +28,7 @@ const makeGroupsSocket = (config) => {
             attrs: {
                 to: '@g.us',
                 xmlns: 'w:g2',
-                type: 'get',
+                type: 'get'
             },
             content: [
                 {
@@ -90,9 +90,7 @@ const makeGroupsSocket = (config) => {
                 {
                     tag: 'leave',
                     attrs: {},
-                    content: [
-                        { tag: 'group', attrs: { id } }
-                    ]
+                    content: [{ tag: 'group', attrs: { id } }]
                 }
             ]);
         },
@@ -117,7 +115,8 @@ const makeGroupsSocket = (config) => {
             return participants.map(v => v.attrs);
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
-            const result = await groupQuery(jid, 'set', [{
+            const result = await groupQuery(jid, 'set', [
+                {
                     tag: 'membership_requests_action',
                     attrs: {},
                     content: [
@@ -130,7 +129,8 @@ const makeGroupsSocket = (config) => {
                             }))
                         }
                     ]
-                }]);
+                }
+            ]);
             const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_requests_action');
             const nodeAction = (0, WABinary_1.getBinaryNodeChild)(node, action);
             const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(nodeAction, 'participant');
@@ -166,9 +166,7 @@ const makeGroupsSocket = (config) => {
                         ...(description ? { id: (0, Utils_1.generateMessageIDV2)() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
-                    content: description ? [
-                        { tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }
-                    ] : undefined
+                    content: description ? [{ tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }] : undefined
                 }
             ]);
         },
@@ -194,7 +192,9 @@ const makeGroupsSocket = (config) => {
          * @returns true if successful
          */
         groupRevokeInviteV4: async (groupJid, invitedJid) => {
-            const result = await groupQuery(groupJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }]);
+            const result = await groupQuery(groupJid, 'set', [
+                { tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }
+            ]);
             return !!result;
         },
         /**
@@ -205,14 +205,16 @@ const makeGroupsSocket = (config) => {
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
             var _a;
             key = typeof key === 'string' ? { remoteJid: key } : key;
-            const results = await groupQuery(inviteMessage.groupJid, 'set', [{
+            const results = await groupQuery(inviteMessage.groupJid, 'set', [
+                {
                     tag: 'accept',
                     attrs: {
                         code: inviteMessage.inviteCode,
                         expiration: inviteMessage.inviteExpiration.toString(),
                         admin: key.remoteJid
                     }
-                }]);
+                }
+            ]);
             // if we have the full message key
             // update the invite message to be expired
             if (key.id) {
@@ -237,12 +239,10 @@ const makeGroupsSocket = (config) => {
                     remoteJid: inviteMessage.groupJid,
                     id: (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
                     fromMe: false,
-                    participant: key.remoteJid,
+                    participant: key.remoteJid
                 },
                 messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [
-                    authState.creds.me.id
-                ],
+                messageStubParameters: [authState.creds.me.id],
                 participant: key.remoteJid,
                 messageTimestamp: (0, Utils_1.unixTimestampSeconds)()
             }, 'notify');
@@ -253,9 +253,9 @@ const makeGroupsSocket = (config) => {
             return (0, exports.extractGroupMetadata)(results);
         },
         groupToggleEphemeral: async (jid, ephemeralExpiration) => {
-            const content = ephemeralExpiration ?
-                { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } } :
-                { tag: 'not_ephemeral', attrs: {} };
+            const content = ephemeralExpiration
+                ? { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } }
+                : { tag: 'not_ephemeral', attrs: {} };
             await groupQuery(jid, 'set', [content]);
         },
         groupSettingUpdate: async (jid, setting) => {
@@ -265,7 +265,9 @@ const makeGroupsSocket = (config) => {
             await groupQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }]);
         },
         groupJoinApprovalMode: async (jid, mode) => {
-            await groupQuery(jid, 'set', [{ tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }]);
+            await groupQuery(jid, 'set', [
+                { tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }
+            ]);
         },
         groupFetchAllParticipating
     };
@@ -277,8 +279,14 @@ const extractGroupMetadata = (result) => {
     const descChild = (0, WABinary_1.getBinaryNodeChild)(group, 'description');
     let desc;
     let descId;
+    let descOwner;
+    let descOwnerJid;
+    let descTime;
     if (descChild) {
         desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
+        descOwner = descChild.attrs.participant ? (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant) : undefined;
+        descOwnerJid = descChild.attrs.participant_pn ? (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn) : undefined;
+        descTime = +descChild.attrs.t;
         descId = descChild.attrs.id;
     }
     const groupId = group.attrs.id.includes('@') ? group.attrs.id : (0, WABinary_1.jidEncode)(group.attrs.id, 'g.us');
@@ -289,12 +297,17 @@ const extractGroupMetadata = (result) => {
         addressingMode: group.attrs.addressing_mode,
         subject: group.attrs.subject,
         subjectOwner: group.attrs.s_o,
+        subjectOwnerJid: group.attrs.s_o_pn,
         subjectTime: +group.attrs.s_t,
         size: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
         creation: +group.attrs.creation,
         owner: group.attrs.creator ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) : undefined,
+        ownerJid: group.attrs.creator_pn ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn) : undefined,
         desc,
         descId,
+        descOwner,
+        descOwnerJid,
+        descTime,
         linkedParent: ((_b = (0, WABinary_1.getBinaryNodeChild)(group, 'linked_parent')) === null || _b === void 0 ? void 0 : _b.attrs.jid) || undefined,
         restrict: !!(0, WABinary_1.getBinaryNodeChild)(group, 'locked'),
         announce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'announcement'),
@@ -306,6 +319,8 @@ const extractGroupMetadata = (result) => {
             return {
                 ...attrs,
                 id: attrs.jid,
+                jid: (0, WABinary_1.isJidUser)(attrs.jid) ? attrs.jid : (0, WABinary_1.jidNormalizedUser)(attrs.phone_number),
+                lid: (0, WABinary_1.isLidUser)(attrs.jid) ? attrs.jid : attrs.lid,
                 admin: (attrs.type || null)
             };
         }),

package/lib/Socket/index.d.ts

@@ -59,7 +59,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
     groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | import("../Types").WAProto.IMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | import("../Types").WAMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<any>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
     groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
@@ -100,7 +100,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
     getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
-    resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
+    resyncAppState: (collections: readonly ("critical_unblock_low" | "regular_high" | "regular_low" | "critical_block" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
@@ -116,9 +116,9 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     type: "md";
     ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
+        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
-        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
+        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
         flush(force?: boolean): boolean;
         isBuffering(): boolean;
     };

package/lib/Socket/index.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Defaults_1 = require("../Defaults");
 const business_1 = require("./business");
 // export the last socket layer
-const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
+const makeWASocket = (config) => (0, business_1.makeBusinessSocket)({
     ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
     ...config
-}));
+});
 exports.default = makeWASocket;

package/lib/Socket/messages-recv.d.ts

@@ -49,7 +49,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
     groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | WAMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
     groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
@@ -90,7 +90,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
     getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
-    resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
+    resyncAppState: (collections: readonly ("critical_unblock_low" | "regular_high" | "regular_low" | "critical_block" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
@@ -106,9 +106,9 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     type: "md";
     ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
+        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
-        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
+        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
         flush(force?: boolean): boolean;
         isBuffering(): boolean;
     };

package/lib/Socket/messages-recv.js

@@ -18,21 +18,24 @@ const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
     const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
-    const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
-    const callOfferCache = config.callOfferCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
-        useClones: false
-    });
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
+    const msgRetryCache = config.msgRetryCounterCache ||
+        new node_cache_1.default({
+            stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    const callOfferCache = config.callOfferCache ||
+        new node_cache_1.default({
+            stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
+            useClones: false
+        });
+    const placeholderResendCache = config.placeholderResendCache ||
+        new node_cache_1.default({
+            stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
     let sendActiveReceipts = false;
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         var _a, _b, _c, _d, _e;
@@ -53,7 +56,8 @@ const makeMessagesRecvSocket = (config) => {
         if (!!attrs.recipient) {
             stanza.attrs.recipient = attrs.recipient;
         }
-        if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
+        if (!!attrs.type &&
+            (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
             stanza.attrs.type = attrs.type;
         }
         if (tag === 'message' && (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable')) {
@@ -85,22 +89,24 @@ const makeMessagesRecvSocket = (config) => {
         await sendNode(stanza);
     };
     const rejectCall = async (callId, callFrom) => {
-        const stanza = ({
+        const stanza = {
             tag: 'call',
             attrs: {
                 from: authState.creds.me.id,
-                to: callFrom,
+                to: callFrom
             },
-            content: [{
+            content: [
+                {
                     tag: 'reject',
                     attrs: {
                         'call-id': callId,
                         'call-creator': callFrom,
-                        count: '0',
+                        count: '0'
                     },
-                    content: undefined,
-                }],
-        });
+                    content: undefined
+                }
+            ]
+        };
         await query(stanza);
     };
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
@@ -208,15 +214,19 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE;
                 msg.messageStubParameters = [metadata.subject];
                 msg.key = { participant: metadata.owner };
-                ev.emit('chats.upsert', [{
+                ev.emit('chats.upsert', [
+                    {
                         id: metadata.id,
                         name: metadata.subject,
-                        conversationTimestamp: metadata.creation,
-                    }]);
-                ev.emit('groups.upsert', [{
+                        conversationTimestamp: metadata.creation
+                    }
+                ]);
+                ev.emit('groups.upsert', [
+                    {
                         ...metadata,
                         author: participant
-                    }]);
+                    }
+                ]);
                 break;
             case 'ephemeral':
             case 'not_ephemeral':
@@ -261,12 +271,12 @@ const makeMessagesRecvSocket = (config) => {
             case 'announcement':
             case 'not_announcement':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
-                msg.messageStubParameters = [(child.tag === 'announcement') ? 'on' : 'off'];
+                msg.messageStubParameters = [child.tag === 'announcement' ? 'on' : 'off'];
                 break;
             case 'locked':
             case 'unlocked':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT;
-                msg.messageStubParameters = [(child.tag === 'locked') ? 'on' : 'off'];
+                msg.messageStubParameters = [child.tag === 'locked' ? 'on' : 'off'];
                 break;
             case 'invite':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK;
@@ -344,10 +354,12 @@ const makeMessagesRecvSocket = (config) => {
             case 'picture':
                 const setPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'set');
                 const delPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'delete');
-                ev.emit('contacts.update', [{
+                ev.emit('contacts.update', [
+                    {
                         id: (0, WABinary_1.jidNormalizedUser)((_a = node === null || node === void 0 ? void 0 : node.attrs) === null || _a === void 0 ? void 0 : _a.from) || ((_c = (_b = (setPicture || delPicture)) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.hash) || '',
                         imgUrl: setPicture ? 'changed' : 'removed'
-                    }]);
+                    }
+                ]);
                 if ((0, WABinary_1.isJidGroup)(from)) {
                     const node = setPicture || delPicture;
                     result.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ICON;
@@ -356,7 +368,7 @@ const makeMessagesRecvSocket = (config) => {
                     }
                     result.participant = node === null || node === void 0 ? void 0 : node.attrs.author;
                     result.key = {
-                        ...result.key || {},
+                        ...(result.key || {}),
                         participant: setPicture === null || setPicture === void 0 ? void 0 : setPicture.attrs.author
                     };
                 }
@@ -371,8 +383,8 @@ const makeMessagesRecvSocket = (config) => {
                             ...authState.creds.accountSettings,
                             defaultDisappearingMode: {
                                 ephemeralExpiration: newDuration,
-                                ephemeralSettingTimestamp: timestamp,
-                            },
+                                ephemeralSettingTimestamp: timestamp
+                            }
                         }
                     });
                 }
@@ -380,7 +392,7 @@ const makeMessagesRecvSocket = (config) => {
                     const blocklists = (0, WABinary_1.getBinaryNodeChildren)(child, 'item');
                     for (const { attrs } of blocklists) {
                         const blocklist = [attrs.jid];
-                        const type = (attrs.action === 'block') ? 'add' : 'remove';
+                        const type = attrs.action === 'block' ? 'add' : 'remove';
                         ev.emit('blocklist.update', { blocklist, type });
                     }
                 }
@@ -398,7 +410,11 @@ const makeMessagesRecvSocket = (config) => {
                     salt: linkCodeSalt,
                     info: 'link_code_pairing_key_bundle_encryption_key'
                 });
-                const encryptPayload = Buffer.concat([Buffer.from(authState.creds.signedIdentityKey.public), primaryIdentityPublicKey, random]);
+                const encryptPayload = Buffer.concat([
+                    Buffer.from(authState.creds.signedIdentityKey.public),
+                    primaryIdentityPublicKey,
+                    random
+                ]);
                 const encryptIv = (0, crypto_1.randomBytes)(12);
                 const encrypted = (0, Utils_1.aesEncryptGCM)(encryptPayload, linkCodePairingExpanded, encryptIv, Buffer.alloc(0));
                 const encryptedPayload = Buffer.concat([linkCodeSalt, encryptIv, encrypted]);
@@ -418,7 +434,7 @@ const makeMessagesRecvSocket = (config) => {
                             tag: 'link_code_companion_reg',
                             attrs: {
                                 jid: authState.creds.me.id,
-                                stage: 'companion_finish',
+                                stage: 'companion_finish'
                             },
                             content: [
                                 {
@@ -512,8 +528,7 @@ const makeMessagesRecvSocket = (config) => {
         const isLid = attrs.from.includes('lid');
         const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(attrs.participant || attrs.from, isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
         const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? attrs.from : attrs.recipient;
-        const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender')
-            && isNodeFromMe);
+        const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe);
         const key = {
             remoteJid,
             id: '',
@@ -535,11 +550,9 @@ const makeMessagesRecvSocket = (config) => {
                 processingMutex.mutex(async () => {
                     const status = (0, Utils_1.getStatusFromReceiptType)(attrs.type);
                     if (typeof status !== 'undefined' &&
-                        (
                         // basically, we only want to know when a message from us has been delivered to/read by the other person
                         // or another device of ours has read some messages
-                        status >= WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK ||
-                            !isNodeFromMe)) {
+                        (status >= WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK || !isNodeFromMe)) {
                         if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
                             if (attrs.participant) {
                                 const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
@@ -659,7 +672,8 @@ const makeMessagesRecvSocket = (config) => {
         if (response && ((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
             msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
         }
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
+        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER &&
+            node.attrs.sender_pn) {
             ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
         }
         try {
@@ -692,10 +706,12 @@ const makeMessagesRecvSocket = (config) => {
                         // no type in the receipt => message delivered
                         let type = undefined;
                         let participant = msg.key.participant;
-                        if (category === 'peer') { // special peer message
+                        if (category === 'peer') {
+                            // special peer message
                             type = 'peer_msg';
                         }
-                        else if (msg.key.fromMe) { // message was sent by us from a different device
+                        else if (msg.key.fromMe) {
+                            // message was sent by us from a different device
                             type = 'sender';
                             // need to specially handle this case
                             if ((0, WABinary_1.isJidUser)(msg.key.remoteJid)) {
@@ -758,9 +774,11 @@ const makeMessagesRecvSocket = (config) => {
             return 'RESOLVED';
         }
         const pdoMessage = {
-            placeholderMessageResendRequest: [{
+            placeholderMessageResendRequest: [
+                {
                     messageKey
-                }],
+                }
+            ],
             peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
         };
         setTimeout(() => {
@@ -783,7 +801,7 @@ const makeMessagesRecvSocket = (config) => {
             id: callId,
             date: new Date(+attrs.t * 1000),
             offline: !!attrs.offline,
-            status,
+            status
         };
         if (status === 'offer') {
             call.isVideo = !!(0, WABinary_1.getBinaryNodeChild)(infoChild, 'video');
@@ -828,9 +846,7 @@ const makeMessagesRecvSocket = (config) => {
                     key,
                     update: {
                         status: Types_1.WAMessageStatus.ERROR,
-                        messageStubParameters: [
-                            attrs.error
-                        ]
+                        messageStubParameters: [attrs.error]
                     }
                 }
             ]);
@@ -843,8 +859,7 @@ const makeMessagesRecvSocket = (config) => {
         await execTask();
         ev.flush();
         function execTask() {
-            return exec(node, false)
-                .catch(err => onUnexpectedError(err, identifier));
+            return exec(node, false).catch(err => onUnexpectedError(err, identifier));
         }
     };
     const makeOfflineNodeProcessor = () => {
@@ -902,8 +917,7 @@ const makeMessagesRecvSocket = (config) => {
         processNode('notification', node, 'handling notification', handleNotification);
     });
     ws.on('CB:ack,class:message', (node) => {
-        handleBadAck(node)
-            .catch(error => onUnexpectedError(error, 'handling bad ack'));
+        handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'));
     });
     ev.on('call', ([call]) => {
         // missed call + group call notification message generation
@@ -914,11 +928,13 @@ const makeMessagesRecvSocket = (config) => {
                     id: call.id,
                     fromMe: false
                 },
-                messageTimestamp: (0, Utils_1.unixTimestampSeconds)(call.date),
+                messageTimestamp: (0, Utils_1.unixTimestampSeconds)(call.date)
             };
             if (call.status === 'timeout') {
                 if (call.isGroup) {
-                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE;
+                    msg.messageStubType = call.isVideo
+                        ? Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO
+                        : Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE;
                 }
                 else {
                     msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_VOICE;
@@ -943,7 +959,7 @@ const makeMessagesRecvSocket = (config) => {
         sendRetryRequest,
         rejectCall,
         fetchMessageHistory,
-        requestPlaceholderResend,
+        requestPlaceholderResend
     };
 };
 exports.makeMessagesRecvSocket = makeMessagesRecvSocket;

package/lib/Socket/messages-send.d.ts

@@ -44,7 +44,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
     groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | WAMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
     groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
@@ -85,7 +85,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
     getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
-    resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
+    resyncAppState: (collections: readonly ("critical_unblock_low" | "regular_high" | "regular_low" | "critical_block" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
@@ -101,9 +101,9 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     type: "md";
     ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
+        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
-        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
+        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
         flush(force?: boolean): boolean;
         isBuffering(): boolean;
     };