fix: Fixed getAllGroups method (fix #1089, fix #1188)

wppconnect-team · Jul 11, 2022 · 4efb0cf · 4efb0cf
1 parent 3e0a33d
commit 4efb0cf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/api/layers/retriever.layer.ts b/src/api/layers/retriever.layer.ts
@@ -156,17 +156,23 @@ export class RetrieverLayer extends SenderLayer {
    * @category Group
    * @returns array of groups
    */
-  public async getAllGroups(withNewMessagesOnly = false) {
-    if (withNewMessagesOnly) {
-      // prettier-ignore
-      const chats = await evaluateAndReturn(this.page,() => WAPI.getAllChatsWithNewMsg());
-      return chats.filter((chat) => chat.isGroup);
-    } else {
-      const chats = await evaluateAndReturn(this.page, () =>
-        WAPI.getAllChats()
-      );
-      return chats.filter((chat) => chat.isGroup);
-    }
+  public async getAllGroups(withNewMessagesOnly = false): Promise<Chat[]> {
+    return await evaluateAndReturn(
+      this.page,
+      async ({ withNewMessagesOnly }) => {
+        const chats = await WPP.chat.list({
+          onlyGroups: true,
+          onlyWithUnreadMessage: withNewMessagesOnly,
+        });
+
+        const groups = await Promise.all(
+          chats.map((c) => WPP.group.ensureGroup(c.id))
+        );
+
+        return groups.map((g) => WAPI._serializeChatObj(g));
+      },
+      { withNewMessagesOnly }
+    );
   }
 
   /**

diff --git a/src/types/WAPI.d.ts b/src/types/WAPI.d.ts
@@ -201,6 +201,7 @@ interface WAPI {
   waitNewAcknowledgements: (callback: Function) => void;
   waitNewMessages: (rmCallback: boolean, callback: Function) => void;
   _profilePicfunc: (contactId: string) => Promise<ProfilePicThumbObj>;
+  _serializeChatObj: (chat: any) => any;
 }
 
 declare global {