NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-13 15:14:49 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fixed bot fallback not working on integrations

Browse Source
This commit is contained in:
Davidson Gomes 2024-10-04 19:08:23 -03:00
parent 2d732c8071
commit d7ddb99fb0
7 changed files with 101 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -28,6 +28,7 @@
* Fixed getBase64FromMediaMessage with convertToMp4
* Fixed bug when send message when don't have mentionsEveryOne on payload
* Does not search message without chatwoot Message Id for reply
* Fixed bot fallback not working on integrations
# 2.1.1 (2024-09-22 10:31)

22
src/api/integrations/chatbot/dify/controllers/dify.controller.ts
View File

@ -726,7 +726,7 @@ export class DifyController extends ChatbotController implements ChatbotControll
const content = getConversationMessage(msg);
const findBot = (await this.findBotTrigger(
let findBot = (await this.findBotTrigger(
this.botRepository,
this.settingsRepository,
content,
@ -734,7 +734,25 @@ export class DifyController extends ChatbotController implements ChatbotControll
session,
)) as DifyModel;
if (!findBot) return;
if (!findBot) {
const fallback = await this.settingsRepository.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (fallback?.difyIdFallback) {
const findFallback = await this.botRepository.findFirst({
where: {
id: fallback.difyIdFallback,
},
});
findBot = findFallback;
} else {
return;
}
}
let expire = findBot?.expire;
let keywordFinish = findBot?.keywordFinish;

22
src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts
View File

@ -698,7 +698,7 @@ export class EvolutionBotController extends ChatbotController implements Chatbot
const content = getConversationMessage(msg);
const findBot = (await this.findBotTrigger(
let findBot = (await this.findBotTrigger(
this.botRepository,
this.settingsRepository,
content,
@ -706,7 +706,25 @@ export class EvolutionBotController extends ChatbotController implements Chatbot
session,
)) as EvolutionBot;
if (!findBot) return;
if (!findBot) {
const fallback = await this.settingsRepository.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (fallback?.botIdFallback) {
const findFallback = await this.botRepository.findFirst({
where: {
id: fallback.botIdFallback,
},
});
findBot = findFallback;
} else {
return;
}
}
let expire = findBot?.expire;
let keywordFinish = findBot?.keywordFinish;

22
src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts
View File

@ -698,7 +698,7 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
const content = getConversationMessage(msg);
const findBot = (await this.findBotTrigger(
let findBot = (await this.findBotTrigger(
this.botRepository,
this.settingsRepository,
content,
@ -706,7 +706,25 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
session,
)) as Flowise;
if (!findBot) return;
if (!findBot) {
const fallback = await this.settingsRepository.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (fallback?.flowiseIdFallback) {
const findFallback = await this.botRepository.findFirst({
where: {
id: fallback.flowiseIdFallback,
},
});
findBot = findFallback;
} else {
return;
}
}
let expire = findBot?.expire;
let keywordFinish = findBot?.keywordFinish;

22
src/api/integrations/chatbot/openai/controllers/openai.controller.ts
View File

@ -935,7 +935,7 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
const content = getConversationMessage(msg);
const findBot = (await this.findBotTrigger(
let findBot = (await this.findBotTrigger(
this.botRepository,
this.settingsRepository,
content,
@ -943,7 +943,25 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
session,
)) as OpenaiBot;
if (!findBot) return;
if (!findBot) {
const fallback = await this.settingsRepository.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (fallback?.openaiIdFallback) {
const findFallback = await this.botRepository.findFirst({
where: {
id: fallback.openaiIdFallback,
},
});
findBot = findFallback;
} else {
return;
}
}
let expire = findBot?.expire;
let keywordFinish = findBot?.keywordFinish;

22
src/api/integrations/chatbot/typebot/controllers/typebot.controller.ts
View File

@ -985,7 +985,7 @@ export class TypebotController extends ChatbotController implements ChatbotContr
const content = getConversationMessage(msg);
const findBot = (await this.findBotTrigger(
let findBot = (await this.findBotTrigger(
this.botRepository,
this.settingsRepository,
content,
@ -993,7 +993,25 @@ export class TypebotController extends ChatbotController implements ChatbotContr
session,
)) as TypebotModel;
if (!findBot) return;
if (!findBot) {
const fallback = await this.settingsRepository.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (fallback?.typebotIdFallback) {
const findFallback = await this.botRepository.findFirst({
where: {
id: fallback.typebotIdFallback,
},
});
findBot = findFallback;
} else {
return;
}
}
const settings = await this.prismaRepository.typebotSetting.findFirst({
where: {

16
src/utils/findBotByTrigger.ts
View File

@ -129,21 +129,5 @@ export const findBotByTrigger = async (
if (findTriggerContains) return findTriggerContains;
const fallback = await settingsRepository.findFirst({
where: {
instanceId: instanceId,
},
});
if (fallback?.openaiIdFallback) {
const findFallback = await botRepository.findFirst({
where: {
id: fallback.openaiIdFallback,
},
});
if (findFallback) return findFallback;
}
return null;
};