@queenanya/baileys 8.2.7 → 8.3.2

package/lib/Socket/chats.d.ts

@@ -1,7 +1,6 @@
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto';
-import { BotListInfo, ChatModification, ContactAction, MessageUpsertType, SocketConfig, WABusinessProfile, WAMediaUpload, WAPatchCreate, WAPresence, WAPrivacyCallValue, WAPrivacyGroupAddValue, WAPrivacyMessagesValue, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '../Types';
-import { LabelActionBody } from '../Types/Label';
+import { BotListInfo, ChatModification, MessageUpsertType, SocketConfig, WABusinessProfile, WAMediaUpload, WAPatchCreate, WAPresence, WAPrivacyCallValue, WAPrivacyGroupAddValue, WAPrivacyMessagesValue, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '../Types';
 import { BinaryNode } from '../WABinary';
 import { USyncQuery } from '../WAUSync';
 export declare const makeChatsSocket: (config: SocketConfig) => {
@@ -26,8 +25,8 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     fetchDisappearingDuration: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     fetchStatus: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull: (jid: string, content: WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull2: (jid: string, content: WAMediaUpload) => Promise<void>;
+    updateProfilePictureFull: any;
+    updateProfilePictureFull2: any;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
@@ -42,12 +41,9 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     updateGroupsAddPrivacy: (value: WAPrivacyGroupAddValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
     getBusinessProfile: (jid: string) => Promise<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: ChatModification, jid: string) => Promise<void>;
     cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
-    addOrEditContact: (jid: string, contact: ContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;

package/lib/Socket/chats.js

@@ -10,6 +10,7 @@ const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
+const chat_set_1 = require("./chat-set");
 const make_mutex_1 = require("../Utils/make-mutex");
 const process_message_1 = __importDefault(require("../Utils/process-message"));
 const WABinary_1 = require("../WABinary");
@@ -206,59 +207,6 @@ const makeChatsSocket = (config) => {
             ]
         });
     };
-    /** update the profile picture for yourself or a group as Full */
-    const updateProfilePictureFull = async (jid, content) => {
-        let targetJid;
-        if (!jid) {
-            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
-        }
-        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
-        }
-        const { img } = await (0, Utils_1.generateProfilePictureFull)(content);
-        await query({
-            tag: 'iq',
-            attrs: {
-                target: targetJid,
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set',
-                xmlns: 'w:profile:picture'
-            },
-            content: [
-                {
-                    tag: 'picture',
-                    attrs: { type: 'image' },
-                    content: img
-                }
-            ]
-        });
-    };
-    const updateProfilePictureFull2 = async (jid, content) => {
-        let targetJid;
-        if (!jid) {
-            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
-        }
-        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
-        }
-        const { preview } = await (0, Utils_1.generateProfilePictureFP)(content);
-        await query({
-            tag: 'iq',
-            attrs: {
-                target: targetJid,
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set',
-                xmlns: 'w:profile:picture'
-            },
-            content: [
-                {
-                    tag: 'picture',
-                    attrs: { type: 'image' },
-                    content: preview
-                }
-            ]
-        });
-    };
     /** remove the profile picture for yourself or a group */
     const removeProfilePicture = async (jid) => {
         let targetJid;
@@ -543,16 +491,18 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name,
+                    name: me.name.replace(/@/g, ''),
                     type
                 }
             });
         }
         else {
+            const { server } = (0, WABinary_1.jidDecode)(toJid);
+            const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
                 attrs: {
-                    from: me.id,
+                    from: isLid ? me.lid : me.id,
                     to: toJid,
                 },
                 content: [
@@ -725,32 +675,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Add or Edit Contact
-     */
-    const addOrEditContact = (jid, contact) => {
-        return chatModify({
-            contact
-        }, jid);
-    };
-    /**
-     * Remove Contact
-     */
-    const removeContact = (jid) => {
-        return chatModify({
-            contact: null
-        }, jid);
-    };
-    /**
-     * Adds label
-     */
-    const addLabel = (jid, labels) => {
-        return chatModify({
-            addLabel: {
-                ...labels
-            }
-        }, jid);
-    };
     /**
      * Adds label for the chats
      */
@@ -901,7 +825,6 @@ const makeChatsSocket = (config) => {
         if (receivedPendingNotifications && // if we don't have the app state key
             // we keep buffering events until we finally have
             // the key and can sync the messages
-            // todo scrutinize
             !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
             ev.buffer();
             needToFlushWithAppStateSync = true;
@@ -922,8 +845,8 @@ const makeChatsSocket = (config) => {
         fetchDisappearingDuration,
         fetchStatus,
         updateProfilePicture,
-        updateProfilePictureFull,
-        updateProfilePictureFull2,
+        updateProfilePictureFull: chat_set_1.updateProfilePictureFull,
+        updateProfilePictureFull2: chat_set_1.updateProfilePictureFull2,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
@@ -941,9 +864,6 @@ const makeChatsSocket = (config) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
-        addOrEditContact,
-        removeContact,
-        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,

package/lib/Socket/groups.d.ts

@@ -2,6 +2,7 @@ import { proto } from '../../WAProto';
 import { GroupMetadata, ParticipantAction, SocketConfig, WAMessageKey } from '../Types';
 import { BinaryNode } from '../WABinary';
 export declare const makeGroupsSocket: (config: SocketConfig) => {
+    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<any>;
     groupMetadata: (jid: string) => Promise<GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -64,8 +65,8 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull2: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
+    updateProfilePictureFull: any;
+    updateProfilePictureFull2: any;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
@@ -80,12 +81,9 @@ export declare const makeGroupsSocket: (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>;
-    addOrEditContact: (jid: string, contact: import("../Types").ContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;

package/lib/Socket/groups.js

@@ -67,6 +67,7 @@ const makeGroupsSocket = (config) => {
     });
     return {
         ...sock,
+        groupQuery,
         groupMetadata,
         groupCreate: async (subject, participants) => {
             const key = (0, Utils_1.generateMessageIDV2)();
@@ -278,12 +279,14 @@ const extractGroupMetadata = (result) => {
     let desc;
     let descId;
     let descOwner;
-    let descOwnerPn;
+    let descOwnerLid;
     let descTime;
     if (descChild) {
         desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
-        descOwner = descChild.attrs.participant;
-        descOwnerPn = descChild.attrs.participant_pn ? (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn) : undefined;
+        descOwner = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn || descChild.attrs.participant);
+        if (group.attrs.addressing_mode === 'lid') {
+            descOwnerLid = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant);
+        }
         descId = descChild.attrs.id;
         descTime = descChild.attrs.t ? +descChild.attrs.t : undefined;
     }
@@ -295,17 +298,17 @@ const extractGroupMetadata = (result) => {
         id: groupId,
         addressingMode: group.attrs.addressing_mode,
         subject: group.attrs.subject,
-        subjectOwner: group.attrs.s_o,
-        subjectOwnerPn: group.attrs.s_o_pn ? (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o_pn) : undefined,
+        subjectOwner: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o_pn || group.attrs.s_o),
+        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o) } : {}),
         subjectTime: group.attrs.s_t ? +group.attrs.s_t : undefined,
         size: groupSize || (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
         creation: group.attrs.creation ? +group.attrs.creation : undefined,
-        owner: group.attrs.creator ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) : undefined,
-        onwerPn: group.attrs.creator_pn ? (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn) : undefined,
+        owner: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn || group.attrs.creator),
+        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) } : {}),
         desc,
         descId,
         descOwner,
-        descOwnerPn,
+        descOwnerLid,
         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'),
@@ -316,7 +319,8 @@ const extractGroupMetadata = (result) => {
         memberAddMode,
         participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
             return {
-                id: attrs.phone_number || attrs.jid,
+                id: attrs.jid,
+                jid: attrs.phone_number || attrs.jid,
                 lid: attrs.lid || attrs.jid,
                 admin: (attrs.type || null),
             };

package/lib/Socket/index.d.ts

@@ -29,7 +29,6 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: import("../Types").MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: import("../Types").WAMessageKey[], type: import("../Types").MessageReceiptType) => Promise<void>;
-    getButtonArgs: (message: import("../Types").WAProto.IMessage) => import("..").BinaryNode["attrs"];
     readMessages: (keys: import("../Types").WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<import("../Types").MediaConnInfo>;
     waUploadToServer: import("../Types").WAMediaUploadFunction;
@@ -43,7 +42,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: import("../Types").WAProto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: import("../Types").WAProto.IWebMessageInfo) => Promise<import("../Types").WAProto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -65,6 +64,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     newsletterReactMessage: (jid: string, server_id: string, code?: string) => Promise<void>;
     newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    groupQuery: (jid: string, type: "get" | "set", content: import("..").BinaryNode[]) => Promise<any>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -113,8 +113,8 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull2: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
+    updateProfilePictureFull: any;
+    updateProfilePictureFull2: any;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
@@ -129,12 +129,9 @@ 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>;
-    addOrEditContact: (jid: string, contact: import("../Types").ContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;

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

@@ -19,7 +19,6 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: WAMessageKey[], type: MessageReceiptType) => Promise<void>;
-    getButtonArgs: (message: proto.IMessage) => BinaryNode["attrs"];
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<import("../Types").MediaConnInfo>;
     waUploadToServer: import("../Types").WAMediaUploadFunction;
@@ -33,7 +32,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -55,6 +54,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     newsletterReactMessage: (jid: string, server_id: string, code?: string) => Promise<void>;
     newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<any>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -103,8 +103,8 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     fetchDisappearingDuration: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     fetchStatus: (...jids: string[]) => Promise<import("..").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull2: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
+    updateProfilePictureFull: any;
+    updateProfilePictureFull2: any;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
@@ -119,12 +119,9 @@ 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>;
-    addOrEditContact: (jid: string, contact: import("../Types").ContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;

package/lib/Socket/messages-recv.js

@@ -16,9 +16,9 @@ const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
 const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
-    const { logger, retryRequestDelayMs, maxMsgRetryCount, ignoreMsgLoading, getMessage, shouldIgnoreJid } = 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, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, groupMetadata, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, 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({
@@ -35,11 +35,6 @@ const makeMessagesRecvSocket = (config) => {
     });
     let sendActiveReceipts = false;
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
-        // If ws not connected - logs it and return
-        if (!ws.isOpen) {
-            logger.warn({ attrs: attrs }, 'Client not connected, cannot send ack');
-            return;
-        }
         const stanza = {
             tag: 'ack',
             attrs: {
@@ -67,7 +62,6 @@ const makeMessagesRecvSocket = (config) => {
         await sendNode(stanza);
     };
     const offerCall = async (toJid, isVideo = false) => {
-        const ToJidm = `${toJid}`;
         const callId = (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase().substring(0, 64);
         const offerContent = [];
         offerContent.push({ tag: 'audio', attrs: { enc: 'opus', rate: '16000' }, content: undefined });
@@ -89,9 +83,7 @@ const makeMessagesRecvSocket = (config) => {
         offerContent.push({ tag: 'capability', attrs: { ver: '1' }, content: new Uint8Array([1, 4, 255, 131, 207, 4]) });
         offerContent.push({ tag: 'encopt', attrs: { keygen: '2' }, content: undefined });
         const encKey = (0, crypto_1.randomBytes)(32);
-        const usrr = toJid.split('@')[0];
-        const srvr = toJid.split('@')[1];
-        const devices = (await getUSyncDevices([toJid], true, false)).map(({ user, device }) => toJid);
+        const devices = (await getUSyncDevices([toJid], true, false)).map(({ user, device }) => (0, WABinary_1.jidEncode)(user, 's.whatsapp.net', device));
         await assertSessions(devices, true);
         const { nodes: destinations, shouldIncludeDeviceIdentity } = await createParticipantNodes(devices, {
             call: {
@@ -192,7 +184,7 @@ const makeMessagesRecvSocket = (config) => {
                 ]
             };
             if (node.attrs.recipient) {
-                receipt.attrs.recipient = (0, WABinary_1.getBotJid)(node.attrs.recipient);
+                receipt.attrs.recipient = node.attrs.recipient;
             }
             if (node.attrs.participant) {
                 receipt.attrs.participant = node.attrs.participant;
@@ -423,9 +415,6 @@ const makeMessagesRecvSocket = (config) => {
             case 'encrypt':
                 await handleEncryptNotification(node);
                 break;
-            case 'newsletter':
-                // TO DO
-                break;
             case 'devices':
                 const devices = (0, WABinary_1.getBinaryNodeChildren)(child, 'device');
                 if ((0, WABinary_1.areJidsSameUser)(child.attrs.jid, authState.creds.me.id)) {
@@ -721,11 +710,6 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleMessage = async (node) => {
         var _a, _b, _c;
-        if (ignoreMsgLoading && node.attrs.offline) {
-            logger.debug({ key: node.attrs.key }, 'ignored offline message');
-            await sendMessageAck(node);
-            return;
-        }
         if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
             await sendMessageAck(node);
@@ -753,7 +737,7 @@ const makeMessagesRecvSocket = (config) => {
                 placeholderResendCache.del(node.attrs.id);
             }
         }
-        const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger, getMessage);
+        const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
         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];
         }
@@ -763,7 +747,7 @@ const makeMessagesRecvSocket = (config) => {
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    var _a, _b, _c;
+                    var _a, _b, _c, _d, _e, _f;
                     await decrypt();
                     // message failed to decrypt
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
@@ -789,6 +773,20 @@ const makeMessagesRecvSocket = (config) => {
                     else {
                         // no type in the receipt => message delivered
                         let type = undefined;
+                        if ((_b = msg.key.participant) === null || _b === void 0 ? void 0 : _b.endsWith('@lid')) {
+                            msg.key.participant = node.attrs.participant_pn || authState.creds.me.id;
+                        }
+                        if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid) && ((_f = (_e = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.extendedTextMessage) === null || _d === void 0 ? void 0 : _d.contextInfo) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.endsWith('@lid'))) {
+                            if (msg.message.extendedTextMessage.contextInfo) {
+                                const metadata = await groupMetadata(msg.key.remoteJid);
+                                const sender = msg.message.extendedTextMessage.contextInfo.participant;
+                                const found = metadata.participants.find(p => p.id === sender);
+                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
+                            }
+                        }
+                        if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
+                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                        }
                         let participant = msg.key.participant;
                         if (category === 'peer') { // special peer message
                             type = 'peer_msg';
@@ -811,9 +809,6 @@ const makeMessagesRecvSocket = (config) => {
                             await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
                         }
                     }
-                    if (((_b = node.attrs) === null || _b === void 0 ? void 0 : _b.addressing_mode) === 'lid' && ((_c = node.attrs) === null || _c === void 0 ? void 0 : _c.participant_pn)) {
-                        msg.key.participant = (0, WABinary_1.jidNormalizedUser)(node.attrs.participant_pn);
-                    }
                     (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
                     await sendMessageAck(node);
                     await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');

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

@@ -9,7 +9,6 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: WAMessageKey[], type: MessageReceiptType) => Promise<void>;
-    getButtonArgs: (message: proto.IMessage) => BinaryNode["attrs"];
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<MediaConnInfo>;
     waUploadToServer: import("../Types").WAMediaUploadFunction;
@@ -23,7 +22,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -45,6 +44,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     newsletterReactMessage: (jid: string, server_id: string, code?: string) => Promise<void>;
     newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<any>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -93,8 +93,8 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     fetchDisappearingDuration: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     fetchStatus: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
-    updateProfilePictureFull2: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
+    updateProfilePictureFull: any;
+    updateProfilePictureFull2: any;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
@@ -109,12 +109,9 @@ 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>;
-    addOrEditContact: (jid: string, contact: import("../Types").ContactAction) => Promise<void>;
-    removeContact: (jid: string) => Promise<void>;
-    addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;