fix: fix function useHere()

orkestral · Oct 15, 2020 · dd0564e · dd0564e
1 parent 4b0f597
commit dd0564e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -668,11 +668,7 @@ There are some tricks for a better usage of venom.
 
 client.onStateChange((state) => {
   console.log('State changed: ', state);
-  const conflits = [
-    venom.SocketState.CONFLICT,
-    venom.SocketState.UNPAIRED,
-    venom.SocketState.UNLAUNCHED,
-  ];
+  const conflits = ['CONFLICT', 'UNPAIRED', 'UNLAUNCHED', 'UNPAIRED_IDLE'];
   if (conflits.includes(state)) {
     client.useHere();
     // Detect a logout

diff --git a/src/api/whatsapp.ts b/src/api/whatsapp.ts
@@ -64,6 +64,7 @@ import { useragentOverride } from '../config/WAuserAgente';
 declare module WAPI {
   const arrayBufferToBase64: (buffer: ArrayBuffer) => string;
   const downloadFile: (data: string) => Promise<string | boolean>;
+  const takeOver: () => boolean;
 }
 
 export class Whatsapp extends ControlsLayer {
@@ -95,18 +96,7 @@ export class Whatsapp extends ControlsLayer {
    * Dont rely on this method
    */
   public async useHere() {
-    await this.page.waitForFunction(
-      () => {
-        const useHereClass = '.S7_rT.FV2Qy';
-        return document.querySelector(useHereClass);
-      },
-      { timeout: 0 }
-    );
-
-    await this.page.evaluate(() => {
-      const useHereClass = '.S7_rT.FV2Qy';
-      (<any>document.querySelector(useHereClass)).click();
-    });
+    return await this.page.evaluate(() => WAPI.takeOver());
   }
 
   /**

diff --git a/src/lib/wapi/wapi.js b/src/lib/wapi/wapi.js
@@ -477,3 +477,8 @@ window.WAPI.archiveChat = async function (id, archive) {
     .then((_) => true)
     .catch((_) => false);
 };
+
+window.WAPI.takeOver = async function () {
+  await Store.State.default.takeover();
+  return true;
+};