Add support for splitMessages and timePerChar in Integrations

This commit is contained in:
Davidson Gomes 2024-10-11 18:52:56 -03:00
parent d8061346da
commit 3af8f968c2
7 changed files with 36 additions and 51 deletions

View File

@ -3,7 +3,7 @@ FROM node:20-alpine AS builder
RUN apk update && \ RUN apk update && \
apk add git ffmpeg wget curl bash apk add git ffmpeg wget curl bash
LABEL version="2.1.2" description="Api to control whatsapp features through http requests." LABEL version="2.2.0" description="Api to control whatsapp features through http requests."
LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes" LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
LABEL contact="contato@atendai.com" LABEL contact="contato@atendai.com"

View File

@ -1,6 +1,6 @@
{ {
"name": "evolution-api", "name": "evolution-api",
"version": "2.1.2", "version": "2.2.0",
"description": "Rest api for communication with WhatsApp", "description": "Rest api for communication with WhatsApp",
"main": "./dist/main.js", "main": "./dist/main.js",
"type": "commonjs", "type": "commonjs",

View File

@ -0,0 +1,31 @@
-- AlterTable
ALTER TABLE "Dify" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "DifySetting" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "EvolutionBot" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "EvolutionBotSetting" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "Flowise" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "FlowiseSetting" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "OpenaiBot" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;
-- AlterTable
ALTER TABLE "OpenaiSetting" ADD COLUMN "splitMessages" BOOLEAN DEFAULT false,
ADD COLUMN "timePerChar" INTEGER DEFAULT 50;

View File

@ -767,7 +767,7 @@ export class EvolutionBotController extends ChatbotController implements Chatbot
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
if (!keepOpen) keepOpen = settings.keepOpen; if (!keepOpen) keepOpen = settings.keepOpen;
if (!debounceTime) debounceTime = settings.debounceTime; if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
if (!ignoreJids) ignoreJids = settings.ignoreJids; if (!ignoreJids) ignoreJids = settings.ignoreJids;
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false; if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0; if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;

View File

@ -767,7 +767,7 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
if (!keepOpen) keepOpen = settings.keepOpen; if (!keepOpen) keepOpen = settings.keepOpen;
if (!debounceTime) debounceTime = settings.debounceTime; if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
if (!ignoreJids) ignoreJids = settings.ignoreJids; if (!ignoreJids) ignoreJids = settings.ignoreJids;
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false; if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0; if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;

View File

@ -1005,7 +1005,7 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe; if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe; if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
if (!keepOpen) keepOpen = settings.keepOpen; if (!keepOpen) keepOpen = settings.keepOpen;
if (!debounceTime) debounceTime = settings.debounceTime; if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
if (!ignoreJids) ignoreJids = settings.ignoreJids; if (!ignoreJids) ignoreJids = settings.ignoreJids;
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false; if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0; if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;

View File

@ -670,52 +670,6 @@ export class TypebotController extends ChatbotController implements ChatbotContr
'init', 'init',
prefilledVariables, prefilledVariables,
); );
// const response = await this.typebotService.createNewSession(instanceData, {
// enabled: true,
// url: url,
// typebot: typebot,
// remoteJid: remoteJid,
// expire: expire,
// keywordFinish: keywordFinish,
// delayMessage: delayMessage,
// unknownMessage: unknownMessage,
// listeningFromMe: listeningFromMe,
// stopBotFromMe: stopBotFromMe,
// keepOpen: keepOpen,
// prefilledVariables: prefilledVariables,
// typebotId: findBot.id,
// });
// if (response.session) {
// await this.typebotService.sendWAMessage(
// instanceData,
// response.session,
// {
// expire: expire,
// keywordFinish: keywordFinish,
// delayMessage: delayMessage,
// unknownMessage: unknownMessage,
// listeningFromMe: listeningFromMe,
// stopBotFromMe: stopBotFromMe,
// keepOpen: keepOpen,
// },
// remoteJid,
// response.messages,
// response.input,
// response.clientSideActions,
// );
// this.waMonitor.waInstances[instance.instanceName].sendDataWebhook(Events.TYPEBOT_START, {
// remoteJid: remoteJid,
// url: url,
// typebot: typebot,
// prefilledVariables: prefilledVariables,
// sessionId: `${response.sessionId}`,
// });
// } else {
// throw new Error('Session ID not found in response');
// }
} else { } else {
const id = Math.floor(Math.random() * 10000000000).toString(); const id = Math.floor(Math.random() * 10000000000).toString();