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

Fix ignoreJids on typebot

Browse Source
This commit is contained in:
Judson Cairo 2024-09-18 21:47:37 -03:00
parent 9a1d5664c9
commit aeb422b3f7
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@
* Fixed chatwoot screen * Fixed chatwoot screen
* It is now possible to send images via the Evolution Channel * It is now possible to send images via the Evolution Channel
* Removed "version" from docker-compose as it is obsolete (https://dev.to/ajeetraina/do-we-still-use-version-in-compose-3inp) * Removed "version" from docker-compose as it is obsolete (https://dev.to/ajeetraina/do-we-still-use-version-in-compose-3inp)
* Fixed typebot ignoreJids being used only from default settings
# 2.1.0 (2024-08-26 15:33) # 2.1.0 (2024-08-26 15:33)

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

@ -974,14 +974,6 @@ export class TypebotController extends ChatbotController implements ChatbotContr
if (!instanceData) throw new Error('Instance not found'); if (!instanceData) throw new Error('Instance not found');
const settings = await this.prismaRepository.typebotSetting.findFirst({
where: {
instanceId: instance.instanceId,
},
});
if (this.checkIgnoreJids(settings?.ignoreJids, remoteJid)) return;
const session = await this.getSession(remoteJid, instance); const session = await this.getSession(remoteJid, instance);
const content = getConversationMessage(msg); const content = getConversationMessage(msg);
@ -996,6 +988,12 @@ export class TypebotController extends ChatbotController implements ChatbotContr
if (!findBot) return; if (!findBot) return;
const settings = await this.prismaRepository.typebotSetting.findFirst({
where: {
instanceId: instance.instanceId,
},
});
const url = findBot?.url; const url = findBot?.url;
const typebot = findBot?.typebot; const typebot = findBot?.typebot;
let expire = findBot?.expire; let expire = findBot?.expire;
@ -1006,32 +1004,19 @@ export class TypebotController extends ChatbotController implements ChatbotContr
let stopBotFromMe = findBot?.stopBotFromMe; let stopBotFromMe = findBot?.stopBotFromMe;
let keepOpen = findBot?.keepOpen; let keepOpen = findBot?.keepOpen;
let debounceTime = findBot?.debounceTime; let debounceTime = findBot?.debounceTime;
let ignoreJids = findBot?.ignoreJids;
if ( if (!expire) expire = settings.expire;
!expire || if (!keywordFinish) keywordFinish = settings.keywordFinish;
!keywordFinish || if (!delayMessage) delayMessage = settings.delayMessage;
!delayMessage || if (!unknownMessage) unknownMessage = settings.unknownMessage;
!unknownMessage || if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
!listeningFromMe || if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
!stopBotFromMe || if (!keepOpen) keepOpen = settings.keepOpen;
!keepOpen if (!debounceTime) debounceTime = settings.debounceTime;
) { if (!ignoreJids) ignoreJids = settings.ignoreJids;
if (!expire) expire = settings.expire;
if (!keywordFinish) keywordFinish = settings.keywordFinish; if (this.checkIgnoreJids(ignoreJids, remoteJid)) return;
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;
}
const key = msg.key as { const key = msg.key as {
id: string; id: string;