fix: Fixed setChatState function (fix #188)

wppconnect-team · May 18, 2021 · 3351bf7 · 3351bf7
1 parent b83fcbb
commit 3351bf7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/api/layers/sender.layer.ts b/src/api/layers/sender.layer.ts
@@ -22,6 +22,7 @@ import { convertToMP4GIF } from '../../utils/ffmpeg';
 import {
   base64MimeType,
   downloadFileToBase64,
+  evaluateAndReturn,
   fileToBase64,
   stickerSelect,
 } from '../helpers';
@@ -820,7 +821,8 @@ export class SenderLayer extends ListenerLayer {
    * @param chatId
    */
   public async setChatState(chatId: string, chatState: ChatState) {
-    return await this.page.evaluate(
+    return await evaluateAndReturn(
+      this.page,
       ({ chatState, chatId }) => {
         WAPI.sendChatstate(chatState, chatId);
       },

diff --git a/src/lib/wapi/functions/send-chat-state.js b/src/lib/wapi/functions/send-chat-state.js
@@ -16,18 +16,31 @@
  */
 
 export async function sendChatstate(state, chatId) {
+  state = parseInt(state, 10);
+
+  const chat = window.Store.Chat.get(chatId);
+
+  if (!chat) {
+    throw {
+      error: true,
+      code: 'chat_not_found',
+      message: 'Chat not found',
+    };
+  }
+
   switch (state) {
-    case '0':
-      await window.Store.ChatStates.sendChatStateComposing(chatId);
+    case 0:
+      window.Store.ChatStates.sendChatStateComposing(chat.id);
       break;
-    case '1':
-      await window.Store.ChatStates.sendChatStateRecording(chatId);
+    case 1:
+      window.Store.ChatStates.sendChatStateRecording(chat.id);
       break;
-    case '2':
-      await window.Store.ChatStates.sendChatStatePaused(chatId);
+    case 2:
+      window.Store.ChatStates.sendChatStatePaused(chat.id);
       break;
     default:
       return false;
   }
+
   return true;
 }