GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c36640e519 - Show all commits

4
packages/core.gbapp/services/GBMinService.ts
View file

@ -146,7 +146,7 @@ export class GBMinService {
if (process.env.WHATSAPP_WELCOME_DISABLED !== "true") { if (process.env.WHATSAPP_WELCOME_DISABLED !== "true") {
let toSwitchMin = GBServer.globals.minInstances.filter(p => p.instance.botId.toLowerCase() === text.toLowerCase())[0]; let toSwitchMin = GBServer.globals.minInstances.filter(p => p.instance.botId.toLowerCase() === text.toLowerCase())[0];
if (!toSwitchMin) { if (!toSwitchMin) {
toSwitchMin = GBServer.globals.minInstances.filter(p => p.instance.activationCode.toLowerCase() === text.toLowerCase())[0]; toSwitchMin = GBServer.globals.minInstances.filter(p => p.instance.activationCode ? p.instance.activationCode.toLowerCase() === text.toLowerCase() : false)[0];
} }
activeMin = toSwitchMin ? toSwitchMin : GBServer.globals.minBoot; activeMin = toSwitchMin ? toSwitchMin : GBServer.globals.minBoot;
@ -716,7 +716,7 @@ export class GBMinService {
user.locale = locale; user.locale = locale;
await user.save(); await user.save();
const minBoot = GBServer.globals.minBoot as any; const minBoot = GBServer.globals.minBoot as any;
query = await min.conversationalService.translate(min, query = await min.conversationalService.translate(min,
min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey, min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey,
min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint, min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
query, query,

2
packages/kb.gbapp/services/KBService.ts
View file

@ -443,7 +443,7 @@ export class KBService implements IGBKBService {
} }
else if (channel === 'whatsapp') { else if (channel === 'whatsapp') {
await conversationalService.sendMarkdownToMobile(min, step, null, text); await conversationalService.sendMarkdownToMobile(min, step, user.userSystemId, text);
} }
else { else {
await min.conversationalService.sendText(min, step, html); await min.conversationalService.sendText(min, step, html);