From 4b50ba79ec4c7cadfeb588dce94f85366bdfb746 Mon Sep 17 00:00:00 2001 From: Francis Breit Date: Mon, 2 Oct 2023 05:52:04 -0300 Subject: [PATCH] Update typebot.service.ts rervetendo para orig --- src/whatsapp/services/typebot.service.ts | 55 ++---------------------- 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/src/whatsapp/services/typebot.service.ts b/src/whatsapp/services/typebot.service.ts index 43682a1f..88dde9c3 100644 --- a/src/whatsapp/services/typebot.service.ts +++ b/src/whatsapp/services/typebot.service.ts @@ -99,8 +99,6 @@ export class TypebotService { const remoteJid = data.remoteJid; const url = data.url; const typebot = data.typebot; - // linha incluida por Francis: - const enabled_typebot = data.enabled_typebot; const variables = data.variables; const findTypebot = await this.find(instance); const sessions = (findTypebot.sessions as Session[]) ?? []; @@ -117,16 +115,9 @@ export class TypebotService { variables.forEach((variable) => { prefilledVariables[variable.name] = variable.value; }); - // linha incluida por Francis: - if (enabled_typebot !== false ) { - - let enabled_typebot = true; - -const response = await this.createNewSession(instance, { + const response = await this.createNewSession(instance, { url: url, - // linha incluida por Francis: - enabled_typebot: enabled_typebot, typebot: typebot, remoteJid: remoteJid, expire: expire, @@ -150,8 +141,6 @@ const response = await this.createNewSession(instance, { this.waMonitor.waInstances[instance.instanceName].sendDataWebhook(Events.TYPEBOT_START, { remoteJid: remoteJid, url: url, - // linha incluida por Francis: - enabled_typebot: enabled_typebot, typebot: typebot, prefilledVariables: prefilledVariables, sessionId: `${response.sessionId}`, @@ -159,50 +148,11 @@ const response = await this.createNewSession(instance, { } else { throw new Error("Session ID not found in response"); } - -} else { - -const id = Math.floor(Math.random() * 10000000000).toString(); - - const reqData = { - sessionId: id, - startParams: { - typebot: data.typebot, - prefilledVariables: prefilledVariables, - }, - }; - - const request = await axios.post(data.url + '/api/v1/sendMessage', reqData); - - await this.sendWAMessage( - instance, - remoteJid, - request.data.messages, - request.data.input, - request.data.clientSideActions, - ); - - this.waMonitor.waInstances[instance.instanceName].sendDataWebhook(Events.TYPEBOT_START, { - remoteJid: remoteJid, - url: url, - typebot: typebot, - variables: variables, - sessionId: id, - }); - - -} - - - - // ate aqui return { typebot: { ...instance, typebot: { - // linha incluida por Francis: - enabled_typebot: enabled_typebot, url: url, remoteJid: remoteJid, typebot: typebot, @@ -281,7 +231,6 @@ const id = Math.floor(Math.random() * 10000000000).toString(); }); const typebotData = { - // linha incluida por Francis new3: enabled: true, url: data.url, typebot: data.typebot, @@ -520,6 +469,7 @@ const id = Math.floor(Math.random() * 10000000000).toString(); }); const typebotData = { + enabled: true, url: url, typebot: typebot, expire: expire, @@ -554,6 +504,7 @@ const id = Math.floor(Math.random() * 10000000000).toString(); sessions.splice(sessions.indexOf(session), 1); const typebotData = { + enabled: true, url: url, typebot: typebot, expire: expire,