fix: getchats

README.md

@@ -622,9 +622,6 @@ const messages = await client.getAllUnreadMessages();
 // Retrieve all chats
 const chats = await client.getAllChats();
 
-// Retrieve all groups
-const chats = await client.getAllGroups();
-
 // Retrieve profile fic (as url)
 const url = await client.getProfilePicFromServer('000000000000@c.us');
 

src/api/layers/retriever.layer.ts

@@ -111,34 +111,70 @@ export class RetrieverLayer extends SenderLayer {
    * @returns array of [Chat]
    */
   public async getAllChats() {
-    return await this.page.evaluate(() => WAPI.getAllChats());
+    return await this.page.evaluate(() => {
+      let chats = WAPI.getAllChats();
+      return WAPI.fixChat(chats);
+    });
   }
 
   /**
    * Retrieves all grups
    * @returns array of [Chat]
    */
   public async getAllChatsGroups() {
-    const chats = await this.page.evaluate(() => WAPI.getAllChats());
-    return chats.filter((chat) => chat.kind === 'group');
+    return await this.page.evaluate(() => {
+      let chats = WAPI.getAllChats(),
+        filter = chats.filter((chat) => chat.kind === 'group');
+      return WAPI.fixChat(filter);
+    });
   }
 
   /**
    * Retrieves all chats Contacts
    * @returns array of [Chat]
    */
   public async getAllChatsContacts() {
-    const chats = await this.page.evaluate(() => WAPI.getAllChats());
-    return chats.filter((chat) => chat.kind === 'chat');
+    return await this.page.evaluate(() => {
+      let chats = WAPI.getAllChats(),
+        filter = chats.filter((chat) => chat.kind === 'chat');
+      return WAPI.fixChat(filter);
+    });
   }
 
   /**
    * Retrieves all chats Transmission list
    * @returns array of [Chat]
    */
   public async getAllChatsTransmission() {
-    const chats = await this.page.evaluate(() => WAPI.getAllChats());
-    return chats.filter((chat) => chat.kind === 'broadcast');
+    return await this.page.evaluate(() => {
+      let chats = WAPI.getAllChats(),
+        filter = chats.filter((chat) => chat.kind === 'broadcast');
+      return WAPI.fixChat(filter);
+    });
+  }
+
+  /**
+   * Retrieve all groups new messages
+   * @returns array of groups
+   */
+  public async getChatGroupNewMsg() {
+    return await this.page.evaluate(() => {
+      var chats = WAPI.getAllChatsWithNewMsg(),
+        filter = chats.filter((chat) => chat.kind === 'group');
+      return WAPI.fixChat(filter);
+    });
+  }
+
+  /**
+   * Retrieve all contacts new messages
+   * @returns array of groups
+   */
+  public async getChatContactNewMsg() {
+    return await this.page.evaluate(() => {
+      var chats = WAPI.getAllChatsWithNewMsg(),
+        filter = chats.filter((chat) => chat.kind === 'chat');
+      return WAPI.fixChat(filter);
+    });
   }
 
   /**
@@ -165,26 +201,6 @@ export class RetrieverLayer extends SenderLayer {
     );
   }
 
-  /**
-   * Retrieve all groups new messages
-   * @returns array of groups
-   */
-  public async getChatGroupNewMsg() {
-    // prettier-ignore
-    const chats = await this.page.evaluate(() => WAPI.getAllChatsWithNewMsg());
-    return chats.filter((chat) => chat.kind === 'group');
-  }
-
-  /**
-   * Retrieve all contacts new messages
-   * @returns array of groups
-   */
-  public async getChatContactNewMsg() {
-    // prettier-ignore
-    const chats = await this.page.evaluate(() => WAPI.getAllChatsWithNewMsg());
-    return chats.filter((chat) => chat.kind === 'chat');
-  }
-
   /**
    * Retrieves contact detail object of given contact id
    * @param contactId

src/api/model/chat.ts

@@ -57,31 +57,31 @@ import { GroupMetadata } from './group-metadata';
 import { Id } from './id';
 
 export interface Chat {
-  id: Id;
-  pendingMsgs: boolean;
-  lastReceivedKey: LastReceivedKey;
-  t: number;
-  unreadCount: number;
   archive: boolean;
+  changeNumberNewJid: Id;
+  changeNumberOldJid: Id;
+  contact: Contact;
+  ephemeralDuration: number;
+  ephemeralSettingTimestamp: number;
+  groupMetadata: GroupMetadata;
+  id: Id;
+  isAnnounceGrpRestrict: boolean;
+  isGroup: boolean;
+  isOnline: null | boolean;
   isReadOnly: boolean;
+  kind: string;
+  lastReceivedKey: LastReceivedKey;
+  lastSeen: null | number | boolean;
+  modifyTag: number;
+  msgs: null;
   muteExpiration: number;
   name: string;
   notSpam: boolean;
+  pendingMsgs: boolean;
   pin: number;
-  msgs: null;
-  kind: string;
-  isGroup: boolean;
-  contact: Contact;
-  groupMetadata: GroupMetadata;
   presence: Presence;
-  /**
-   * @deprecated This is unreliable. Use the method {@link Whatsapp.getChatIsOnline} instead.
-   */
-  isOnline: null | boolean;
-  /**
-   * @deprecated This is unreliable. Use the method {@link Whatsapp.getLastSeen} instead.
-   */
-  lastSeen: null | number | boolean;
+  t: number;
+  unreadCount: number;
 }
 
 export interface ProfilePicThumbObj {

src/api/model/group-metadata.ts

@@ -55,13 +55,22 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 import { Id } from '.';
 
 export interface GroupMetadata {
-  id: Id;
+  announce: boolean;
   creation: number;
+  desc: string;
+  descId: string;
+  desOwner: Id;
+  descTime: number;
+  ephemeralDuration: number;
+  id: Id;
+  noFrequentlyForwarded: boolean;
   owner: {
     server: string;
     user: string;
     _serialized: string;
   };
   participants: any[];
   pendingParticipants: any[];
+  restrict: boolean;
+  support: boolean;
 }

src/lib/wapi/helper/fix-chat.js

@@ -0,0 +1,96 @@
+/*
+NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mMMMMMMMMMNNNmmNNNMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmNMMNMMMMNNNNNmmmddhdddNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mddNMMNy:/odNmmddmmNNmdhhddmNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmmdNMNd:--+dNmmddhhddmmhsyhhmdmmNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNmdNmy:.-oyNmmmhmdhho+sososyhhhddNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmmNdh+-`.:oyNNdmmdmmdo-://oysssyhhhdmNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+Nmmmoyyyo+osdNmdmmddNNhs+/::/+osyssydyhdNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NNmhsymMMNmmmmdmdNNddNmsso+++////ossssyyhdmNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mhhhmNNMNNNhssshhmmddmmssyooooso/::+oysshhhhmMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmdhdddNNdyoosyhdmddmmmsoooooyysyys/::/oyyhhhyMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mdddhddmhsooshdmdmdhhyyyysso/ooo+syhhs/-/+shyhMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+dyyhdmd+ososhdmdmyyhhhhhhhyo++o/+///+ohhso++sdMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+dhdmNNdsossyhmdmsydhssssyhhs/++o/o+//:++yhhy+/hNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mdmNNNNmhysshddyshdyyy/oss+s::/:://++///++++/::hmNNNNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NNMNNNmmNNdymNNhshdshdyhdysh+sy+-:++osssosss++yNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNNNmdNNmNmmmNmyyddyyhdhydyohys/-oo+osssysyyohNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmNNNhdNmmNNmNMMNhyyhhhdhyyhmmyh+-/s+sysssyyhyydNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mNMMMhdNdmMNMMMMMNNmdhdddmhdmmNho/-osoyyo++oyddhhNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NMMMNmhNdNMNMNMMNmNNNmmmdyoohmhoyo::hsooo++oooydhymMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMNNNhmNNMmmNMNNmmmmdmmdyhhoyddddoo++yoyysooossyhsmMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMNNNmmNNNmdNdNmmddhhhdNNhsmNssdooo/dso++osyyysoymMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMNNNNmNNNNNmddmmNhshNmmmNmNMdhNsh/ohho++/:++MMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MNNNMMNNNNmmmhhhhdyosdNmdmMMhoNmhdmys+ooo++/+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmNNNMMNNNNmddmdoodmMMNmmNNhssdmNMMMNdNd/osomMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNdhMNmNNMNmdNddohmMMNNNmdmdddNMMMMMMMMmMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNhmMmmmmNNmdNyoNMNmNmdhyyyhdhoyNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmdmMmmddddNmmdys+hmMMMmmhysssyy++dMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmdNMMdmdddmmNNyshmNNNNNNNdhhs+yy//dMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNMMMdmdddmmMNysdmNNMMMNhhNdhs+y+/:mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmNMMNhmmddNNNMdyydmMMMNdyshNhyoss+:/MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmNMMddmmmmNMNMNdsymNNmdhhdNMNdhsss+:yMMMMMMMMMMMMMMMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMdhmmmmmNMNNMmshNMMMmmMMMMMmNdyo+//NMMMMMMMMMMMMMMMhNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMmhmmmmmmNMMNNMyshdhhhyhNMMMMMMdhso+sMMMMMMMMMMMMMMMhmMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMmdmmmmmmmNMMMmNm+ys++oyyNMMMMMMNmmyyoyNMMMMMMMMMMMMMddMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NmmmmmmmmmmmNMNNmNNyyo+/oohNMMMMMMMMdhhsshmMMMMMMMMMMMyNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+mmNNNNNNmmmmNMMNmmddNmmdhhdmMMMMMMMMMNddhssshmmNNNmmdhdMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+NNNNNNNNNNNNNNNNmNNNNMMMMMNomMMMMMMMMMNNmdhhyyyyyyyhdmMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+Nd+oNMMMMMMMmodo++++++++++m..yNMMMMMNo+mNMMmhssshdNMMNhNMMMMMMMMMMMddMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MN+ /NMMMMMm: d` -ssssss+`d. `+mMMMMN. dNm+:+syso//hNN--yNMMMMMMMd+`yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMN+ /NMMMm: oM` +NMMMMMNdN. /`.yNMMN. dh.omMMMMMNy.oM- `:hNMMMm+.  yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMN/ /NMm: oNy` :sssmMMMMN. dh-`/mMN. d-/NMMMMMMMMy`m- y/`/dmo..o: yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMN/ /m: +NNy. /yyyNMMMMN. dNNo`.yN- d.oNMMMMMMMMd d- mNh-`.`+mN/ yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMN/ . +NMMN- oNMMMMMNdN. dMMMd:`/. ds.dNMMMMMMm::M- dMMNy/dMMN/ yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMN/ +NMMMN- /yyyyyys d. dMMMMNo`  dNy-+ymmmho-+NN- dMMMMMMMMN/ yMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMNyNMMMMN+::::::::::m+/mMMMMMMd: dMMNho///+'ymMMN+/mMMMMMMMMNs/hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMMNMMMMMMMMMMMMMMMMMMMMMMMMMMMMNsmMMMMMMMMMMMMMMNNNNMMNNNMMNNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMNMMNMNMMMNMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMNMNMMMNMMNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNNNNMMNNNMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMMMMMMMMMMMsMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+*/
+export async function fixChat(chatData) {
+  if (
+    typeof chatData === 'object' &&
+    Array.isArray(chatData) &&
+    chatData.length
+  ) {
+    const rows = chatData.length,
+      result = chatData;
+    for (let i = 0; i < rows; i++) {
+      result[i].sender =
+        typeof result[i].sender === 'object'
+          ? await result.sender
+          : result.sender;
+
+      if (result[i].contact) {
+        result[i].contact =
+          typeof result[i].contact === 'object'
+            ? await result[i].contact
+            : result[i].contact;
+      }
+      if (result[i].chat) {
+        result[i].chat =
+          typeof result[i].chat === 'object'
+            ? await result[i].chat
+            : result[i].chat;
+      }
+      if (result[i].chat && result[i].chat.contact) {
+        result[i].chat.contact =
+          typeof result[i].chat.contact === 'object'
+            ? await result[i].chat.contact
+            : result[i].chat.contact;
+      }
+
+      if (result[i].hasOwnProperty('msgUnsyncedButtonReplyMsgs')) {
+        result[i].msgUnsyncedButtonReplyMsgs = 'undefined';
+      }
+    }
+    return result;
+  } else {
+    return false;
+  }
+}

src/lib/wapi/helper/index.js

@@ -56,3 +56,4 @@ export { base64ToFile } from './base64-to-file';
 export { getFileHash } from './get-file-hash';
 export { generateMediaKey } from './generate-media-key';
 export { arrayBufferToBase64 } from './array-buffer-to-base64';
+export { fixChat } from './fix-chat';

src/lib/wapi/wapi.js

@@ -161,6 +161,7 @@ import {
   generateMediaKey,
   getFileHash,
   arrayBufferToBase64,
+  fixChat,
 } from './helper';
 import {
   addNewMessagesListener,
@@ -221,12 +222,16 @@ if (typeof window.WAPI === 'undefined') {
     lastRead: {},
   };
 
+  //helpers
+  window.WAPI.fixChat = fixChat;
+
   //class
   window.WAPI.callbackWile = new callbackWile();
 
   //others
   window.WAPI.interfaceMute = interfaceMute;
   window.WAPI.isInsideChat = isInsideChat;
+
   //Profile
   window.WAPI.setProfilePic = setProfilePic;
   window.WAPI.getSessionTokenBrowser = getSessionTokenBrowser;

src/types/WAPI.d.ts

@@ -95,6 +95,7 @@ interface WAPI {
     skipMyMessages: boolean
   ) => any;
   getAllChats: () => Chat[];
+  fixChat: (chats: Chat[]) => Promise<Chat[] | Boolean>;
   getAllChatsWithMessages: (withNewMessageOnly?: boolean) => Chat[];
   getAllChatsWithNewMsg: () => Chat[];
   getAllContacts: () => Contact[];