whatsapp-web.js 1.33.2 → 1.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-web.js",
-  "version": "1.33.2",
+  "version": "1.34.0",
   "description": "Library for interacting with the WhatsApp Web API ",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/src/Client.js

@@ -2343,19 +2343,17 @@ class Client extends EventEmitter {
      * @returns {Promise<Array<{ lid: string, pn: string }>>}
      */
     async getContactLidAndPhone(userIds) {
-        return await this.pupPage.evaluate((userIds) => {
-            !Array.isArray(userIds) && (userIds = [userIds]);
-            return userIds.map(userId => {
-                const wid = window.Store.WidFactory.createWid(userId);
-                const isLid = wid.server === 'lid';
-                const lid = isLid ? wid : window.Store.LidUtils.getCurrentLid(wid);
-                const phone = isLid ? window.Store.LidUtils.getPhoneNumber(wid) : wid;
+        return await this.pupPage.evaluate(async (userIds) => {
+            if (!Array.isArray(userIds)) userIds = [userIds];
+
+            return await Promise.all(userIds.map(async (userId) => {
+                const { lid, phone } = await window.WWebJS.enforceLidAndPnRetrieval(userId);
 
                 return {
-                    lid: lid._serialized,
-                    pn: phone._serialized
+                    lid: lid?._serialized,
+                    pn: phone?._serialized
                 };
-            });
+            }));
         }, userIds);
     }
 }

package/src/structures/GroupChat.js

@@ -195,12 +195,12 @@ class GroupChat extends Chat {
     async removeParticipants(participantIds) {
         return await this.client.pupPage.evaluate(async (chatId, participantIds) => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
-            const participants = participantIds.map(p => {
-                const wid = window.Store.WidFactory.createWid(p);
-                const lid = wid.server!=='lid' ? window.Store.LidUtils.getCurrentLid(wid) : wid;
-                const phone = wid.server=='lid' ? window.Store.LidUtils.getPhoneNumber(wid) : wid;
-                return chat.groupMetadata.participants.get(lid?._serialized) || chat.groupMetadata.participants.get(phone?._serialized);
-            }).filter(p => Boolean(p));
+            const participants = (await Promise.all(participantIds.map(async p => {
+                const { lid, phone } = await window.WWebJS.enforceLidAndPnRetrieval(p);
+
+                return chat.groupMetadata.participants.get(lid?._serialized) ||
+                    chat.groupMetadata.participants.get(phone?._serialized);
+            }))).filter(Boolean);
             await window.Store.GroupParticipants.removeParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);
@@ -214,12 +214,12 @@ class GroupChat extends Chat {
     async promoteParticipants(participantIds) {
         return await this.client.pupPage.evaluate(async (chatId, participantIds) => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
-            const participants = participantIds.map(p => {
-                const wid = window.Store.WidFactory.createWid(p);
-                const lid = wid.server!=='lid' ? window.Store.LidUtils.getCurrentLid(wid) : wid;
-                const phone = wid.server=='lid' ? window.Store.LidUtils.getPhoneNumber(wid) : wid;
-                return chat.groupMetadata.participants.get(lid?._serialized) || chat.groupMetadata.participants.get(phone?._serialized);
-            }).filter(p => Boolean(p));
+            const participants = (await Promise.all(participantIds.map(async p => {
+                const { lid, phone } = await window.WWebJS.enforceLidAndPnRetrieval(p);
+
+                return chat.groupMetadata.participants.get(lid?._serialized) ||
+                    chat.groupMetadata.participants.get(phone?._serialized);
+            }))).filter(Boolean);
             await window.Store.GroupParticipants.promoteParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);
@@ -233,12 +233,12 @@ class GroupChat extends Chat {
     async demoteParticipants(participantIds) {
         return await this.client.pupPage.evaluate(async (chatId, participantIds) => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
-            const participants = participantIds.map(p => {
-                const wid = window.Store.WidFactory.createWid(p);
-                const lid = wid.server!=='lid' ? window.Store.LidUtils.getCurrentLid(wid) : wid;
-                const phone = wid.server=='lid' ? window.Store.LidUtils.getPhoneNumber(wid) : wid;
-                return chat.groupMetadata.participants.get(lid?._serialized) || chat.groupMetadata.participants.get(phone?._serialized);
-            }).filter(p => Boolean(p));
+            const participants = (await Promise.all(participantIds.map(async p => {
+                const { lid, phone } = await window.WWebJS.enforceLidAndPnRetrieval(p);
+
+                return chat.groupMetadata.participants.get(lid?._serialized) ||
+                    chat.groupMetadata.participants.get(phone?._serialized);
+            }))).filter(Boolean);
             await window.Store.GroupParticipants.demoteParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);

package/src/util/Injected/Store.js

@@ -102,6 +102,7 @@ exports.ExposeStore = () => {
     window.Store.PinnedMsgUtils = window.require('WAWebSendPinMessageAction');
     window.Store.UploadUtils = window.require('WAWebUploadManager');
     window.Store.WAWebStreamModel = window.require('WAWebStreamModel');
+    window.Store.FindOrCreateChat = window.require('WAWebFindChatAction');
     
     window.Store.Settings = {
         ...window.require('WAWebUserPrefsGeneral'),
@@ -210,14 +211,21 @@ exports.ExposeStore = () => {
      * @param {Function} callback Modified function
      */
     window.injectToFunction = (target, callback) => {
-        const module = window.require(target.module);
-        const originalFunction = module[target.function];
-        const modifiedFunction = (...args) => callback(originalFunction, ...args);
-        module[target.function] = modifiedFunction;
+        let module = window.require(target.module);
+
+        const path = target.function.split('.');
+        const funcName = path.pop();
+        for (const key of path) {
+            module = module[key];
+        }
+
+        const originalFunction = module[funcName];
+        module[funcName] = (...args) => callback(originalFunction, ...args);
     };
 
     window.injectToFunction({ module: 'WAWebBackendJobsCommon', function: 'mediaTypeFromProtobuf' }, (func, ...args) => { const [proto] = args; return proto.locationMessage ? null : func(...args); });
 
     window.injectToFunction({ module: 'WAWebE2EProtoUtils', function: 'typeAttributeFromProtobuf' }, (func, ...args) => { const [proto] = args; return proto.locationMessage || proto.groupInviteMessage ? 'text' : func(...args); });
 
+    window.injectToFunction({ module: 'WAWebLid1X1MigrationGating', function: 'Lid1X1MigrationUtils.isLidMigrated' }, () => false);
 };

package/src/util/Injected/Utils.js

@@ -249,7 +249,7 @@ exports.LoadUtils = () => {
 
         if (typeof chat.id?.isGroup === 'function' && chat.id.isGroup()) {
             from = chat.groupMetadata && chat.groupMetadata.isLidAddressingMode ? lidUser : meUser;
-            participant = window.Store.WidFactory.toUserWidOrThrow(from);
+            participant = window.Store.WidFactory.asUserWidOrThrow(from);
         }
 
         const newMsgKey = new window.Store.MsgKey({
@@ -539,7 +539,7 @@ exports.LoadUtils = () => {
                 chat = null;
             }
         } else {
-            chat = window.Store.Chat.get(chatWid) || (await window.Store.Chat.find(chatWid));
+            chat = window.Store.Chat.get(chatWid) || (await window.Store.FindOrCreateChat.findOrCreateLatestChat(chatWid))?.chat;
         }
 
         return getAsModel && chat
@@ -1144,4 +1144,26 @@ exports.LoadUtils = () => {
         const statuses = window.Store.Status.getModelsArray();
         return statuses.map(status => window.WWebJS.getStatusModel(status));
     };
+
+    window.WWebJS.enforceLidAndPnRetrieval = async (userId) => {
+        const wid = window.Store.WidFactory.createWid(userId);
+        const isLid = wid.server === 'lid';
+
+        let lid = isLid ? wid : window.Store.LidUtils.getCurrentLid(wid);
+        let phone = isLid ? window.Store.LidUtils.getPhoneNumber(wid) : wid;
+
+        if (!isLid && !lid) {
+            const queryResult = await window.Store.QueryExist(wid);
+            if (!queryResult?.wid) return {};
+            lid = window.Store.LidUtils.getCurrentLid(wid);
+        }
+
+        if (isLid && !phone) {
+            const queryResult = await window.Store.QueryExist(wid);
+            if (!queryResult?.wid) return {};
+            phone = window.Store.LidUtils.getPhoneNumber(wid);
+        }
+
+        return { lid, phone };
+    };
 };