diff --git a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts index 35f0bda1..f98ff470 100644 --- a/src/api/integrations/chatbot/dify/controllers/dify.controller.ts +++ b/src/api/integrations/chatbot/dify/controllers/dify.controller.ts @@ -736,17 +736,25 @@ export class DifyController extends ChatbotController implements ChatbotControll if (!findBot) return; - let listeningFromMe = findBot.listeningFromMe; - let stopBotFromMe = findBot.stopBotFromMe; - let debounceTime = findBot.debounceTime; + let expire = findBot?.expire; + let keywordFinish = findBot?.keywordFinish; + let delayMessage = findBot?.delayMessage; + let unknownMessage = findBot?.unknownMessage; + let listeningFromMe = findBot?.listeningFromMe; + let stopBotFromMe = findBot?.stopBotFromMe; + let keepOpen = findBot?.keepOpen; + let debounceTime = findBot?.debounceTime; + let ignoreJids = findBot?.ignoreJids; - if (!listeningFromMe || !stopBotFromMe || !debounceTime) { - if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; - - if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; - - if (!debounceTime) debounceTime = settings.debounceTime; - } + if (!expire) expire = settings.expire; + if (!keywordFinish) keywordFinish = settings.keywordFinish; + if (!delayMessage) delayMessage = settings.delayMessage; + if (!unknownMessage) unknownMessage = settings.unknownMessage; + if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; + if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; + if (!keepOpen) keepOpen = settings.keepOpen; + if (!debounceTime) debounceTime = settings.debounceTime; + if (!ignoreJids) ignoreJids = settings.ignoreJids; const key = msg.key as { id: string; @@ -782,7 +790,18 @@ export class DifyController extends ChatbotController implements ChatbotControll remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, debouncedContent, msg?.pushName, ); @@ -793,7 +812,18 @@ export class DifyController extends ChatbotController implements ChatbotControll remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, content, msg?.pushName, ); diff --git a/src/api/integrations/chatbot/dify/services/dify.service.ts b/src/api/integrations/chatbot/dify/services/dify.service.ts index 66c55ab2..4c3f3f2e 100644 --- a/src/api/integrations/chatbot/dify/services/dify.service.ts +++ b/src/api/integrations/chatbot/dify/services/dify.service.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { InstanceDto } from '@api/dto/instance.dto'; import { PrismaRepository } from '@api/repository/repository.service'; import { WAMonitoringService } from '@api/services/monitor.service'; @@ -14,7 +15,7 @@ export class DifyService { private readonly waMonitor: WAMonitoringService, private readonly configService: ConfigService, private readonly prismaRepository: PrismaRepository, - ) { } + ) {} private readonly logger = new Logger('DifyService'); @@ -349,12 +350,7 @@ export class DifyService { } } - private async sendMessageWhatsApp( - instance: any, - remoteJid: string, - message: string, - settings: DifySetting - ) { + private async sendMessageWhatsApp(instance: any, remoteJid: string, message: string, settings: DifySetting) { const linkRegex = /(!?)\[(.*?)\]\((.*?)\)/g; let textBuffer = ''; @@ -393,20 +389,18 @@ export class DifyService { delay: settings?.delayMessage || 1000, text: textBuffer.trim(), }, - false + false, ); textBuffer = ''; } if (mediaType === 'audio') { - await instance.audioWhatsapp( - { - number: remoteJid.split('@')[0], - delay: settings?.delayMessage || 1000, - audio: url, - caption: altText, - } - ); + await instance.audioWhatsapp({ + number: remoteJid.split('@')[0], + delay: settings?.delayMessage || 1000, + audio: url, + caption: altText, + }); } else { await instance.mediaMessage( { @@ -416,7 +410,7 @@ export class DifyService { media: url, caption: altText, }, - false + false, ); } } else { @@ -440,7 +434,7 @@ export class DifyService { delay: settings?.delayMessage || 1000, text: textBuffer.trim(), }, - false + false, ); } diff --git a/src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts b/src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts index a82dfadb..a2af0c5b 100644 --- a/src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts +++ b/src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts @@ -708,17 +708,25 @@ export class EvolutionBotController extends ChatbotController implements Chatbot if (!findBot) return; - let listeningFromMe = findBot.listeningFromMe; - let stopBotFromMe = findBot.stopBotFromMe; - let debounceTime = findBot.debounceTime; + let expire = findBot?.expire; + let keywordFinish = findBot?.keywordFinish; + let delayMessage = findBot?.delayMessage; + let unknownMessage = findBot?.unknownMessage; + let listeningFromMe = findBot?.listeningFromMe; + let stopBotFromMe = findBot?.stopBotFromMe; + let keepOpen = findBot?.keepOpen; + let debounceTime = findBot?.debounceTime; + let ignoreJids = findBot?.ignoreJids; - if (!listeningFromMe || !stopBotFromMe || !debounceTime) { - if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; - - if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; - - if (!debounceTime) debounceTime = settings.debounceTime; - } + if (!expire) expire = settings.expire; + if (!keywordFinish) keywordFinish = settings.keywordFinish; + if (!delayMessage) delayMessage = settings.delayMessage; + if (!unknownMessage) unknownMessage = settings.unknownMessage; + if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; + if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; + if (!keepOpen) keepOpen = settings.keepOpen; + if (!debounceTime) debounceTime = settings.debounceTime; + if (!ignoreJids) ignoreJids = settings.ignoreJids; const key = msg.key as { id: string; @@ -754,7 +762,18 @@ export class EvolutionBotController extends ChatbotController implements Chatbot remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, debouncedContent, msg?.pushName, ); @@ -765,7 +784,18 @@ export class EvolutionBotController extends ChatbotController implements Chatbot remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, content, msg?.pushName, ); diff --git a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts index 0e8f340e..3ba2d1cc 100644 --- a/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts +++ b/src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts @@ -708,17 +708,25 @@ export class FlowiseController extends ChatbotController implements ChatbotContr if (!findBot) return; - let listeningFromMe = findBot.listeningFromMe; - let stopBotFromMe = findBot.stopBotFromMe; - let debounceTime = findBot.debounceTime; + let expire = findBot?.expire; + let keywordFinish = findBot?.keywordFinish; + let delayMessage = findBot?.delayMessage; + let unknownMessage = findBot?.unknownMessage; + let listeningFromMe = findBot?.listeningFromMe; + let stopBotFromMe = findBot?.stopBotFromMe; + let keepOpen = findBot?.keepOpen; + let debounceTime = findBot?.debounceTime; + let ignoreJids = findBot?.ignoreJids; - if (!listeningFromMe || !stopBotFromMe || !debounceTime) { - if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; - - if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; - - if (!debounceTime) debounceTime = settings.debounceTime; - } + if (!expire) expire = settings.expire; + if (!keywordFinish) keywordFinish = settings.keywordFinish; + if (!delayMessage) delayMessage = settings.delayMessage; + if (!unknownMessage) unknownMessage = settings.unknownMessage; + if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; + if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; + if (!keepOpen) keepOpen = settings.keepOpen; + if (!debounceTime) debounceTime = settings.debounceTime; + if (!ignoreJids) ignoreJids = settings.ignoreJids; const key = msg.key as { id: string; @@ -754,7 +762,18 @@ export class FlowiseController extends ChatbotController implements ChatbotContr remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, debouncedContent, msg?.pushName, ); @@ -765,7 +784,18 @@ export class FlowiseController extends ChatbotController implements ChatbotContr remoteJid, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, content, msg?.pushName, ); diff --git a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts index 87d1fb4e..f0fb6276 100644 --- a/src/api/integrations/chatbot/openai/controllers/openai.controller.ts +++ b/src/api/integrations/chatbot/openai/controllers/openai.controller.ts @@ -945,18 +945,25 @@ export class OpenaiController extends ChatbotController implements ChatbotContro if (!findBot) return; - // verify default settings - let listeningFromMe = findBot.listeningFromMe; - let stopBotFromMe = findBot.stopBotFromMe; - let debounceTime = findBot.debounceTime; + let expire = findBot?.expire; + let keywordFinish = findBot?.keywordFinish; + let delayMessage = findBot?.delayMessage; + let unknownMessage = findBot?.unknownMessage; + let listeningFromMe = findBot?.listeningFromMe; + let stopBotFromMe = findBot?.stopBotFromMe; + let keepOpen = findBot?.keepOpen; + let debounceTime = findBot?.debounceTime; + let ignoreJids = findBot?.ignoreJids; - if (!listeningFromMe || !stopBotFromMe || !debounceTime) { - if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; - - if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; - - if (!debounceTime) debounceTime = settings.debounceTime; - } + if (!expire) expire = settings.expire; + if (!keywordFinish) keywordFinish = settings.keywordFinish; + if (!delayMessage) delayMessage = settings.delayMessage; + if (!unknownMessage) unknownMessage = settings.unknownMessage; + if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; + if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; + if (!keepOpen) keepOpen = settings.keepOpen; + if (!debounceTime) debounceTime = settings.debounceTime; + if (!ignoreJids) ignoreJids = settings.ignoreJids; const key = msg.key as { id: string; @@ -994,7 +1001,18 @@ export class OpenaiController extends ChatbotController implements ChatbotContro key.fromMe, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, debouncedContent, ); } @@ -1006,7 +1024,18 @@ export class OpenaiController extends ChatbotController implements ChatbotContro pushName, findBot, session, - settings, + { + ...settings, + expire, + keywordFinish, + delayMessage, + unknownMessage, + listeningFromMe, + stopBotFromMe, + keepOpen, + debounceTime, + ignoreJids, + }, debouncedContent, ); }