fix: Fixed block/unblock contact (fix #498)

wppconnect-team · Oct 2, 2021 · 832fceb · 832fceb
1 parent fc65307
commit 832fceb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/src/api/layers/controls.layer.ts b/src/api/layers/controls.layer.ts
@@ -32,11 +32,13 @@ export class ControlsLayer extends UILayer {
    * @returns boolean
    */
   public async unblockContact(contactId: string) {
-    return evaluateAndReturn(
+    await evaluateAndReturn(
       this.page,
-      (contactId) => WAPI.unblockContact(contactId),
+      (contactId) => WPP.blocklist.unblockContact(contactId),
       contactId
     );
+
+    return true;
   }
 
   /**
@@ -46,11 +48,13 @@ export class ControlsLayer extends UILayer {
    * @returns boolean
    */
   public async blockContact(contactId: string) {
-    return evaluateAndReturn(
+    await evaluateAndReturn(
       this.page,
-      (contactId) => WAPI.blockContact(contactId),
+      (contactId) => WPP.blocklist.blockContact(contactId),
       contactId
     );
+
+    return true;
   }
 
   /**

diff --git a/src/lib/wapi/functions/block-contact.js b/src/lib/wapi/functions/block-contact.js
@@ -16,14 +16,6 @@
  */
 
 export async function blockContact(_id) {
-  if (!_id) {
-    return false;
-  }
-  const __contact = window.Store.Contact.get(_id);
-  if (__contact !== undefined) {
-    await Store.Block.blockContact(__contact);
-    return true;
-  } else {
-    return false;
-  }
+  await WPP.blocklist.blockContact(_id);
+  return true;
 }
diff --git a/src/lib/wapi/functions/unblock-contact.js b/src/lib/wapi/functions/unblock-contact.js
@@ -16,14 +16,6 @@
  */
 
 export async function unblockContact(_id) {
-  if (!_id) {
-    return false;
-  }
-  const __contact = window.Store.Contact.get(_id);
-  if (__contact !== undefined) {
-    await Store.Block.unblockContact(__contact);
-    return true;
-  } else {
-    return false;
-  }
+  await WPP.blocklist.unblockContact(_id);
+  return true;
 }