Skip to content

Commit 171f460

Browse files
DavidsonGomesDavidsonGomes
committed
fix: ignoreJids in integrations dont work
1 parent 6d0ad5f commit 171f460

File tree

6 files changed

+136
-96
lines changed

6 files changed

+136
-96
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"build": "tsc --noEmit && tsup",
99
"start": "tsnd -r tsconfig-paths/register --files --transpile-only ./src/main.ts",
1010
"start:prod": "node dist/main",
11-
"dev:server": "clear && tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
12-
"test": "clear && tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts",
11+
"dev:server": "tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
12+
"test": "tsnd -r tsconfig-paths/register --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts",
1313
"lint": "eslint --fix --ext .ts src",
1414
"db:generate": "node runWithProvider.js \"npx prisma generate --schema ./prisma/DATABASE_PROVIDER-schema.prisma\"",
1515
"db:deploy": "node runWithProvider.js \"rm -rf ./prisma/migrations && cp -r ./prisma/DATABASE_PROVIDER-migrations ./prisma/migrations && npx prisma migrate deploy --schema ./prisma/DATABASE_PROVIDER-schema.prisma\"",

‎src/api/integrations/chatbot/dify/controllers/dify.controller.ts‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,25 @@ export class DifyController extends ChatbotController implements ChatbotControll
6464
},
6565
});
6666

67-
if (!data.expire) data.expire = defaultSettingCheck?.expire || 0;
68-
if (!data.keywordFinish) data.keywordFinish = defaultSettingCheck?.keywordFinish || '';
69-
if (!data.delayMessage) data.delayMessage = defaultSettingCheck?.delayMessage || 1000;
70-
if (!data.unknownMessage) data.unknownMessage = defaultSettingCheck?.unknownMessage || '';
71-
if (!data.listeningFromMe) data.listeningFromMe = defaultSettingCheck?.listeningFromMe || false;
72-
if (!data.stopBotFromMe) data.stopBotFromMe = defaultSettingCheck?.stopBotFromMe || false;
73-
if (!data.keepOpen) data.keepOpen = defaultSettingCheck?.keepOpen || false;
74-
if (!data.debounceTime) data.debounceTime = defaultSettingCheck?.debounceTime || 0;
75-
if (!data.ignoreJids) data.ignoreJids = defaultSettingCheck?.ignoreJids || [];
76-
if (!data.splitMessages) data.splitMessages = defaultSettingCheck?.splitMessages || false;
77-
if (!data.timePerChar) data.timePerChar = defaultSettingCheck?.timePerChar || 0;
67+
if (data.expire === undefined || data.expire === null) data.expire = defaultSettingCheck.expire;
68+
if (data.keywordFinish === undefined || data.keywordFinish === null)
69+
data.keywordFinish = defaultSettingCheck.keywordFinish;
70+
if (data.delayMessage === undefined || data.delayMessage === null)
71+
data.delayMessage = defaultSettingCheck.delayMessage;
72+
if (data.unknownMessage === undefined || data.unknownMessage === null)
73+
data.unknownMessage = defaultSettingCheck.unknownMessage;
74+
if (data.listeningFromMe === undefined || data.listeningFromMe === null)
75+
data.listeningFromMe = defaultSettingCheck.listeningFromMe;
76+
if (data.stopBotFromMe === undefined || data.stopBotFromMe === null)
77+
data.stopBotFromMe = defaultSettingCheck.stopBotFromMe;
78+
if (data.keepOpen === undefined || data.keepOpen === null) data.keepOpen = defaultSettingCheck.keepOpen;
79+
if (data.debounceTime === undefined || data.debounceTime === null)
80+
data.debounceTime = defaultSettingCheck.debounceTime;
81+
if (data.ignoreJids === undefined || data.ignoreJids === null) data.ignoreJids = defaultSettingCheck.ignoreJids;
82+
if (data.splitMessages === undefined || data.splitMessages === null)
83+
data.splitMessages = defaultSettingCheck?.splitMessages ?? false;
84+
if (data.timePerChar === undefined || data.timePerChar === null)
85+
data.timePerChar = defaultSettingCheck?.timePerChar ?? 0;
7886

7987
if (!defaultSettingCheck) {
8088
await this.settings(instance, {
@@ -788,15 +796,15 @@ export class DifyController extends ChatbotController implements ChatbotControll
788796
let splitMessages = findBot?.splitMessages;
789797
let timePerChar = findBot?.timePerChar;
790798

791-
if (!expire) expire = settings.expire;
792-
if (!keywordFinish) keywordFinish = settings.keywordFinish;
793-
if (!delayMessage) delayMessage = settings.delayMessage;
794-
if (!unknownMessage) unknownMessage = settings.unknownMessage;
795-
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
796-
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
797-
if (!keepOpen) keepOpen = settings.keepOpen;
799+
if (expire === undefined || expire === null) expire = settings.expire;
800+
if (keywordFinish === undefined || keywordFinish === null) keywordFinish = settings.keywordFinish;
801+
if (delayMessage === undefined || delayMessage === null) delayMessage = settings.delayMessage;
802+
if (unknownMessage === undefined || unknownMessage === null) unknownMessage = settings.unknownMessage;
803+
if (listeningFromMe === undefined || listeningFromMe === null) listeningFromMe = settings.listeningFromMe;
804+
if (stopBotFromMe === undefined || stopBotFromMe === null) stopBotFromMe = settings.stopBotFromMe;
805+
if (keepOpen === undefined || keepOpen === null) keepOpen = settings.keepOpen;
798806
if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
799-
if (!ignoreJids) ignoreJids = settings.ignoreJids;
807+
if (ignoreJids === undefined || ignoreJids === null) ignoreJids = settings.ignoreJids;
800808
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
801809
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;
802810

‎src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,25 @@ export class EvolutionBotController extends ChatbotController implements Chatbot
6060
},
6161
});
6262

63-
if (!data.expire) data.expire = defaultSettingCheck?.expire || 0;
64-
if (!data.keywordFinish) data.keywordFinish = defaultSettingCheck?.keywordFinish || '';
65-
if (!data.delayMessage) data.delayMessage = defaultSettingCheck?.delayMessage || 1000;
66-
if (!data.unknownMessage) data.unknownMessage = defaultSettingCheck?.unknownMessage || '';
67-
if (!data.listeningFromMe) data.listeningFromMe = defaultSettingCheck?.listeningFromMe || false;
68-
if (!data.stopBotFromMe) data.stopBotFromMe = defaultSettingCheck?.stopBotFromMe || false;
69-
if (!data.keepOpen) data.keepOpen = defaultSettingCheck?.keepOpen || false;
70-
if (!data.debounceTime) data.debounceTime = defaultSettingCheck?.debounceTime || 0;
71-
if (!data.ignoreJids) data.ignoreJids = defaultSettingCheck?.ignoreJids || [];
72-
if (!data.splitMessages) data.splitMessages = defaultSettingCheck?.splitMessages || false;
73-
if (!data.timePerChar) data.timePerChar = defaultSettingCheck?.timePerChar || 0;
63+
if (data.expire === undefined || data.expire === null) data.expire = defaultSettingCheck.expire;
64+
if (data.keywordFinish === undefined || data.keywordFinish === null)
65+
data.keywordFinish = defaultSettingCheck.keywordFinish;
66+
if (data.delayMessage === undefined || data.delayMessage === null)
67+
data.delayMessage = defaultSettingCheck.delayMessage;
68+
if (data.unknownMessage === undefined || data.unknownMessage === null)
69+
data.unknownMessage = defaultSettingCheck.unknownMessage;
70+
if (data.listeningFromMe === undefined || data.listeningFromMe === null)
71+
data.listeningFromMe = defaultSettingCheck.listeningFromMe;
72+
if (data.stopBotFromMe === undefined || data.stopBotFromMe === null)
73+
data.stopBotFromMe = defaultSettingCheck.stopBotFromMe;
74+
if (data.keepOpen === undefined || data.keepOpen === null) data.keepOpen = defaultSettingCheck.keepOpen;
75+
if (data.debounceTime === undefined || data.debounceTime === null)
76+
data.debounceTime = defaultSettingCheck.debounceTime;
77+
if (data.ignoreJids === undefined || data.ignoreJids === null) data.ignoreJids = defaultSettingCheck.ignoreJids;
78+
if (data.splitMessages === undefined || data.splitMessages === null)
79+
data.splitMessages = defaultSettingCheck?.splitMessages ?? false;
80+
if (data.timePerChar === undefined || data.timePerChar === null)
81+
data.timePerChar = defaultSettingCheck?.timePerChar ?? 0;
7482

7583
if (!defaultSettingCheck) {
7684
await this.settings(instance, {
@@ -760,15 +768,15 @@ export class EvolutionBotController extends ChatbotController implements Chatbot
760768
let splitMessages = findBot?.splitMessages;
761769
let timePerChar = findBot?.timePerChar;
762770

763-
if (!expire) expire = settings.expire;
764-
if (!keywordFinish) keywordFinish = settings.keywordFinish;
765-
if (!delayMessage) delayMessage = settings.delayMessage;
766-
if (!unknownMessage) unknownMessage = settings.unknownMessage;
767-
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
768-
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
769-
if (!keepOpen) keepOpen = settings.keepOpen;
771+
if (expire === undefined || expire === null) expire = settings.expire;
772+
if (keywordFinish === undefined || keywordFinish === null) keywordFinish = settings.keywordFinish;
773+
if (delayMessage === undefined || delayMessage === null) delayMessage = settings.delayMessage;
774+
if (unknownMessage === undefined || unknownMessage === null) unknownMessage = settings.unknownMessage;
775+
if (listeningFromMe === undefined || listeningFromMe === null) listeningFromMe = settings.listeningFromMe;
776+
if (stopBotFromMe === undefined || stopBotFromMe === null) stopBotFromMe = settings.stopBotFromMe;
777+
if (keepOpen === undefined || keepOpen === null) keepOpen = settings.keepOpen;
770778
if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
771-
if (!ignoreJids) ignoreJids = settings.ignoreJids;
779+
if (ignoreJids === undefined || ignoreJids === null) ignoreJids = settings.ignoreJids;
772780
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
773781
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;
774782

‎src/api/integrations/chatbot/flowise/controllers/flowise.controller.ts‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,25 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
6060
},
6161
});
6262

63-
if (!data.expire) data.expire = defaultSettingCheck?.expire || 0;
64-
if (!data.keywordFinish) data.keywordFinish = defaultSettingCheck?.keywordFinish || '';
65-
if (!data.delayMessage) data.delayMessage = defaultSettingCheck?.delayMessage || 1000;
66-
if (!data.unknownMessage) data.unknownMessage = defaultSettingCheck?.unknownMessage || '';
67-
if (!data.listeningFromMe) data.listeningFromMe = defaultSettingCheck?.listeningFromMe || false;
68-
if (!data.stopBotFromMe) data.stopBotFromMe = defaultSettingCheck?.stopBotFromMe || false;
69-
if (!data.keepOpen) data.keepOpen = defaultSettingCheck?.keepOpen || false;
70-
if (!data.debounceTime) data.debounceTime = defaultSettingCheck?.debounceTime || 0;
71-
if (!data.ignoreJids) data.ignoreJids = defaultSettingCheck?.ignoreJids || [];
72-
if (!data.splitMessages) data.splitMessages = defaultSettingCheck?.splitMessages || false;
73-
if (!data.timePerChar) data.timePerChar = defaultSettingCheck?.timePerChar || 0;
63+
if (data.expire === undefined || data.expire === null) data.expire = defaultSettingCheck.expire;
64+
if (data.keywordFinish === undefined || data.keywordFinish === null)
65+
data.keywordFinish = defaultSettingCheck.keywordFinish;
66+
if (data.delayMessage === undefined || data.delayMessage === null)
67+
data.delayMessage = defaultSettingCheck.delayMessage;
68+
if (data.unknownMessage === undefined || data.unknownMessage === null)
69+
data.unknownMessage = defaultSettingCheck.unknownMessage;
70+
if (data.listeningFromMe === undefined || data.listeningFromMe === null)
71+
data.listeningFromMe = defaultSettingCheck.listeningFromMe;
72+
if (data.stopBotFromMe === undefined || data.stopBotFromMe === null)
73+
data.stopBotFromMe = defaultSettingCheck.stopBotFromMe;
74+
if (data.keepOpen === undefined || data.keepOpen === null) data.keepOpen = defaultSettingCheck.keepOpen;
75+
if (data.debounceTime === undefined || data.debounceTime === null)
76+
data.debounceTime = defaultSettingCheck.debounceTime;
77+
if (data.ignoreJids === undefined || data.ignoreJids === null) data.ignoreJids = defaultSettingCheck.ignoreJids;
78+
if (data.splitMessages === undefined || data.splitMessages === null)
79+
data.splitMessages = defaultSettingCheck?.splitMessages ?? false;
80+
if (data.timePerChar === undefined || data.timePerChar === null)
81+
data.timePerChar = defaultSettingCheck?.timePerChar ?? 0;
7482

7583
if (!defaultSettingCheck) {
7684
await this.settings(instance, {
@@ -760,15 +768,15 @@ export class FlowiseController extends ChatbotController implements ChatbotContr
760768
let splitMessages = findBot?.splitMessages;
761769
let timePerChar = findBot?.timePerChar;
762770

763-
if (!expire) expire = settings.expire;
764-
if (!keywordFinish) keywordFinish = settings.keywordFinish;
765-
if (!delayMessage) delayMessage = settings.delayMessage;
766-
if (!unknownMessage) unknownMessage = settings.unknownMessage;
767-
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
768-
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
769-
if (!keepOpen) keepOpen = settings.keepOpen;
771+
if (expire === undefined || expire === null) expire = settings.expire;
772+
if (keywordFinish === undefined || keywordFinish === null) keywordFinish = settings.keywordFinish;
773+
if (delayMessage === undefined || delayMessage === null) delayMessage = settings.delayMessage;
774+
if (unknownMessage === undefined || unknownMessage === null) unknownMessage = settings.unknownMessage;
775+
if (listeningFromMe === undefined || listeningFromMe === null) listeningFromMe = settings.listeningFromMe;
776+
if (stopBotFromMe === undefined || stopBotFromMe === null) stopBotFromMe = settings.stopBotFromMe;
777+
if (keepOpen === undefined || keepOpen === null) keepOpen = settings.keepOpen;
770778
if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
771-
if (!ignoreJids) ignoreJids = settings.ignoreJids;
779+
if (ignoreJids === undefined || ignoreJids === null) ignoreJids = settings.ignoreJids;
772780
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
773781
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;
774782

‎src/api/integrations/chatbot/openai/controllers/openai.controller.ts‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,25 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
201201
},
202202
});
203203

204-
if (!data.openaiCredsId) data.openaiCredsId = defaultSettingCheck?.openaiCredsId || null;
205-
if (!data.expire) data.expire = defaultSettingCheck?.expire || 0;
206-
if (!data.keywordFinish) data.keywordFinish = defaultSettingCheck?.keywordFinish || '';
207-
if (!data.delayMessage) data.delayMessage = defaultSettingCheck?.delayMessage || 1000;
208-
if (!data.unknownMessage) data.unknownMessage = defaultSettingCheck?.unknownMessage || '';
209-
if (!data.listeningFromMe) data.listeningFromMe = defaultSettingCheck?.listeningFromMe || false;
210-
if (!data.stopBotFromMe) data.stopBotFromMe = defaultSettingCheck?.stopBotFromMe || false;
211-
if (!data.keepOpen) data.keepOpen = defaultSettingCheck?.keepOpen || false;
212-
if (!data.debounceTime) data.debounceTime = defaultSettingCheck?.debounceTime || 0;
213-
if (!data.ignoreJids) data.ignoreJids = defaultSettingCheck?.ignoreJids || [];
214-
if (!data.splitMessages) data.splitMessages = defaultSettingCheck?.splitMessages || false;
215-
if (!data.timePerChar) data.timePerChar = defaultSettingCheck?.timePerChar || 0;
204+
if (data.expire === undefined || data.expire === null) data.expire = defaultSettingCheck.expire;
205+
if (data.keywordFinish === undefined || data.keywordFinish === null)
206+
data.keywordFinish = defaultSettingCheck.keywordFinish;
207+
if (data.delayMessage === undefined || data.delayMessage === null)
208+
data.delayMessage = defaultSettingCheck.delayMessage;
209+
if (data.unknownMessage === undefined || data.unknownMessage === null)
210+
data.unknownMessage = defaultSettingCheck.unknownMessage;
211+
if (data.listeningFromMe === undefined || data.listeningFromMe === null)
212+
data.listeningFromMe = defaultSettingCheck.listeningFromMe;
213+
if (data.stopBotFromMe === undefined || data.stopBotFromMe === null)
214+
data.stopBotFromMe = defaultSettingCheck.stopBotFromMe;
215+
if (data.keepOpen === undefined || data.keepOpen === null) data.keepOpen = defaultSettingCheck.keepOpen;
216+
if (data.debounceTime === undefined || data.debounceTime === null)
217+
data.debounceTime = defaultSettingCheck.debounceTime;
218+
if (data.ignoreJids === undefined || data.ignoreJids === null) data.ignoreJids = defaultSettingCheck.ignoreJids;
219+
if (data.splitMessages === undefined || data.splitMessages === null)
220+
data.splitMessages = defaultSettingCheck?.splitMessages ?? false;
221+
if (data.timePerChar === undefined || data.timePerChar === null)
222+
data.timePerChar = defaultSettingCheck?.timePerChar ?? 0;
216223

217224
if (!data.openaiCredsId) {
218225
throw new Error('Openai Creds Id is required');
@@ -998,15 +1005,15 @@ export class OpenaiController extends ChatbotController implements ChatbotContro
9981005
let splitMessages = findBot?.splitMessages;
9991006
let timePerChar = findBot?.timePerChar;
10001007

1001-
if (!expire) expire = settings.expire;
1002-
if (!keywordFinish) keywordFinish = settings.keywordFinish;
1003-
if (!delayMessage) delayMessage = settings.delayMessage;
1004-
if (!unknownMessage) unknownMessage = settings.unknownMessage;
1005-
if (!listeningFromMe) listeningFromMe = settings.listeningFromMe;
1006-
if (!stopBotFromMe) stopBotFromMe = settings.stopBotFromMe;
1007-
if (!keepOpen) keepOpen = settings.keepOpen;
1008+
if (expire === undefined || expire === null) expire = settings.expire;
1009+
if (keywordFinish === undefined || keywordFinish === null) keywordFinish = settings.keywordFinish;
1010+
if (delayMessage === undefined || delayMessage === null) delayMessage = settings.delayMessage;
1011+
if (unknownMessage === undefined || unknownMessage === null) unknownMessage = settings.unknownMessage;
1012+
if (listeningFromMe === undefined || listeningFromMe === null) listeningFromMe = settings.listeningFromMe;
1013+
if (stopBotFromMe === undefined || stopBotFromMe === null) stopBotFromMe = settings.stopBotFromMe;
1014+
if (keepOpen === undefined || keepOpen === null) keepOpen = settings.keepOpen;
10081015
if (debounceTime === undefined || debounceTime === null) debounceTime = settings.debounceTime;
1009-
if (!ignoreJids) ignoreJids = settings.ignoreJids;
1016+
if (ignoreJids === undefined || ignoreJids === null) ignoreJids = settings.ignoreJids;
10101017
if (splitMessages === undefined || splitMessages === null) splitMessages = settings?.splitMessages ?? false;
10111018
if (timePerChar === undefined || timePerChar === null) timePerChar = settings?.timePerChar ?? 0;
10121019

0 commit comments

Comments
 (0)