fix: settings on dify, flowise and openai

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 expire = findBot?.expire;
-      let stopBotFromMe = findBot.stopBotFromMe;
+      let keywordFinish = findBot?.keywordFinish;
-      let debounceTime = findBot.debounceTime;
+      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 (!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,
         );

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';
@@ -349,12 +350,7 @@ export class DifyService {
     }
   }
 
-  private async sendMessageWhatsApp(
+  private async sendMessageWhatsApp(instance: any, remoteJid: string, message: string, settings: DifySetting) {
-    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(
+          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,
       );
     }
 

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 expire = findBot?.expire;
-      let stopBotFromMe = findBot.stopBotFromMe;
+      let keywordFinish = findBot?.keywordFinish;
-      let debounceTime = findBot.debounceTime;
+      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 (!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,
         );

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 expire = findBot?.expire;
-      let stopBotFromMe = findBot.stopBotFromMe;
+      let keywordFinish = findBot?.keywordFinish;
-      let debounceTime = findBot.debounceTime;
+      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 (!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,
         );

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 expire = findBot?.expire;
-      let listeningFromMe = findBot.listeningFromMe;
+      let keywordFinish = findBot?.keywordFinish;
-      let stopBotFromMe = findBot.stopBotFromMe;
+      let delayMessage = findBot?.delayMessage;
-      let debounceTime = findBot.debounceTime;
+      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 (!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,
             );
           }