From c1fac1b000f7277a680bcebfc04aed457e718305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3nalan=20de=20Lima?= <jonalan7@gmail.com>
Date: Wed, 24 Nov 2021 09:10:27 -0300
Subject: [PATCH] fix: get me and State

---
 src/api/helpers/scrape-desconnect.ts          | 2 +-
 src/api/layers/host.layer.ts                  | 2 +-
 src/lib/wapi/functions/check-number-status.js | 2 +-
 src/lib/wapi/functions/check-send-exist.js    | 8 ++++++--
 src/lib/wapi/listeners/add-on-state-change.js | 8 ++++----
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/api/helpers/scrape-desconnect.ts b/src/api/helpers/scrape-desconnect.ts
index 0dec83667..5f8d08008 100644
--- a/src/api/helpers/scrape-desconnect.ts
+++ b/src/api/helpers/scrape-desconnect.ts
@@ -60,7 +60,7 @@ declare global {
 }
 export async function scrapeDesconnected(page: Page): Promise<boolean> {
   const result = await page.evaluate(() => {
-    const scrape = window.Store.State.default.on('change:state');
+    const scrape = window.Store.State.Socket.on('change:state');
     if (
       scrape.__x_stream === 'DISCONNECTED' &&
       scrape.__x_state === 'CONNECTED'
diff --git a/src/api/layers/host.layer.ts b/src/api/layers/host.layer.ts
index cb766377b..1445c309e 100644
--- a/src/api/layers/host.layer.ts
+++ b/src/api/layers/host.layer.ts
@@ -361,7 +361,7 @@ export class HostLayer {
   public async getConnectionState(): Promise<SocketState> {
     return await this.page.evaluate(() => {
       //@ts-ignore
-      return Store.State.default.state;
+      return Store.State.Socket.state;
     });
   }
 
diff --git a/src/lib/wapi/functions/check-number-status.js b/src/lib/wapi/functions/check-number-status.js
index cb89013e8..6d8ab68e1 100644
--- a/src/lib/wapi/functions/check-number-status.js
+++ b/src/lib/wapi/functions/check-number-status.js
@@ -8,7 +8,7 @@ export async function checkNumberStatus(id, conn = true) {
     }
 
     if (conn === true) {
-      const connection = window.Store.State.default.state;
+      const connection = window.Store.State.Socket.state;
       if (connection !== 'CONNECTED') {
         Object.assign(err, {
           text: 'No connection with WhatsApp',
diff --git a/src/lib/wapi/functions/check-send-exist.js b/src/lib/wapi/functions/check-send-exist.js
index ca65c3002..a5da54486 100644
--- a/src/lib/wapi/functions/check-send-exist.js
+++ b/src/lib/wapi/functions/check-send-exist.js
@@ -54,7 +54,7 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 */
 export function scope(id, erro, status, text = null, result = null) {
   const object = {
-    me: Store.Me.attributes,
+    me: WAPI.getHost(),
     to: id,
     erro: erro,
     text: text,
@@ -154,7 +154,11 @@ export async function sendExist(chatId, returnChat = true, Send = true) {
   }
   let ck = await window.WAPI.checkNumberStatus(chatId, false);
 
-  if (ck.status === 404 && !chatId.includes('@g.us')) {
+  if (
+    ck.status === 404 &&
+    !chatId.includes('@g.us') &&
+    !chatId.includes('@broadcast')
+  ) {
     return WAPI.scope(chatId, true, ck.status, 'The number does not exist');
   }
 
diff --git a/src/lib/wapi/listeners/add-on-state-change.js b/src/lib/wapi/listeners/add-on-state-change.js
index 07db63ddd..ddd4e567e 100644
--- a/src/lib/wapi/listeners/add-on-state-change.js
+++ b/src/lib/wapi/listeners/add-on-state-change.js
@@ -56,12 +56,12 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 export function addOnStateChange() {
   let initialized = false;
   const getData = () => {
-    return window.Store.State.default.state;
+    return window.Store.State.Socket.state;
   };
 
   window.WAPI.onStateChange = function (callback) {
     window.WAPI.waitForStore('State', () => {
-      window.Store.State.default.on('change:state', () => callback(getData()));
+      window.Store.State.Socket.on('change:state', () => callback(getData()));
       if (!initialized) {
         initialized = true;
         callback(getData());
@@ -74,12 +74,12 @@ export function addOnStateChange() {
 export function addOnStreamChange() {
   let initialized = false;
   let getData = () => {
-    return window.Store.State.default.stream;
+    return window.Store.State.Socket.stream;
   };
 
   window.WAPI.onStreamChange = function (callback) {
     window.WAPI.waitForStore('State', () => {
-      window.Store.State.default.on('change:stream', () => callback(getData()));
+      window.Store.State.Socket.on('change:stream', () => callback(getData()));
       if (!initialized) {
         initialized = true;
         callback(getData());