From bc70ec8b073854adafcda744c21337a7e1a18058 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Wed, 25 Oct 2023 08:19:44 -0300
Subject: [PATCH] fix: start session

---
 src/whatsapp/services/typebot.service.ts  | 8 ++++----
 src/whatsapp/services/whatsapp.service.ts | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/whatsapp/services/typebot.service.ts b/src/whatsapp/services/typebot.service.ts
index 30f1cb53..f29de04f 100644
--- a/src/whatsapp/services/typebot.service.ts
+++ b/src/whatsapp/services/typebot.service.ts
@@ -518,7 +518,7 @@ export class TypebotService {
             const newSessions = await this.clearSessions(instance, remoteJid);
 
             const typebotData = {
-              enabled: true,
+              enabled: findTypebot.enabled,
               url: url,
               typebot: typebot,
               expire: expire,
@@ -598,7 +598,7 @@ export class TypebotService {
           sessions.splice(sessions.indexOf(session), 1);
 
           const typebotData = {
-            enabled: true,
+            enabled: findTypebot.enabled,
             url: url,
             typebot: typebot,
             expire: expire,
@@ -639,7 +639,7 @@ export class TypebotService {
     });
 
     const typebotData = {
-      enabled: true,
+      enabled: findTypebot.enabled,
       url: url,
       typebot: typebot,
       expire: expire,
@@ -674,7 +674,7 @@ export class TypebotService {
       sessions.splice(sessions.indexOf(session), 1);
 
       const typebotData = {
-        enabled: true,
+        enabled: findTypebot.enabled,
         url: url,
         typebot: typebot,
         expire: expire,
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index 9aab7d29..c922cd63 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -1601,7 +1601,11 @@ export class WAStartupService {
         );
       }
 
-      if (this.localTypebot.enabled || this.localTypebot.sessions?.length > 0) {
+      const typebotSessionRemoteJid = this.localTypebot.sessions?.find(
+        (session) => session.remoteJid === received.key.remoteJid,
+      );
+
+      if (this.localTypebot.enabled || typebotSessionRemoteJid) {
         if (!(this.localTypebot.listening_from_me === false && messageRaw.key.fromMe === true)) {
           await this.typebotService.sendTypebot(
             { instanceName: this.instance.name },