fix: Fixed WPP.blocklist.isBlocked (fix #1231)

wppconnect-team · Jul 26, 2023 · 353a3c2 · 353a3c2
1 parent b7c4c98
commit 353a3c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/blocklist/functions/blockContact.ts b/src/blocklist/functions/blockContact.ts
@@ -21,6 +21,7 @@ import { ContactModel, ContactStore, Wid } from '../../whatsapp';
 import { SANITIZED_VERSION_STR } from '../../whatsapp/contants';
 import * as wa_functions from '../../whatsapp/functions';
 import { BlocklistResult } from '../types';
+import { isBlocked } from './isBlocked';
 
 export async function blockContact(
   chatId: string | Wid
@@ -41,6 +42,6 @@ export async function blockContact(
 
   return {
     wid,
-    isBlocked: contact.isBlocked(),
+    isBlocked: isBlocked(wid),
   };
 }
diff --git a/src/blocklist/functions/isBlocked.ts b/src/blocklist/functions/isBlocked.ts
@@ -15,12 +15,12 @@
  */
 
 import { assertWid } from '../../assert';
-import { ContactModel, ContactStore, Wid } from '../../whatsapp';
+import { BlocklistStore, Wid } from '../../whatsapp';
 
 export function isBlocked(chatId: string | Wid): boolean {
   const wid = assertWid(chatId);
 
-  const contact = ContactStore.get(wid) || new ContactModel({ id: wid });
+  const contact = BlocklistStore.get(wid);
 
-  return contact.isBlocked();
+  return !!contact;
 }
diff --git a/src/blocklist/functions/unblockContact.ts b/src/blocklist/functions/unblockContact.ts
@@ -18,6 +18,7 @@ import { assertWid } from '../../assert';
 import { ContactModel, ContactStore, Wid } from '../../whatsapp';
 import * as wa_functions from '../../whatsapp/functions';
 import { BlocklistResult } from '../types';
+import { isBlocked } from './isBlocked';
 
 export async function unblockContact(
   chatId: string | Wid
@@ -30,6 +31,6 @@ export async function unblockContact(
 
   return {
     wid,
-    isBlocked: contact.isBlocked(),
+    isBlocked: isBlocked(wid),
   };
 }