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

fix(core.gblib): SSR fixing about botId.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-03-20 16:14:58 -03:00
parent 56b687792b
commit 799715a9ee
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,16 +773,18 @@ export class GBMinService {
await min.whatsAppDirectLine.setup(true); await min.whatsAppDirectLine.setup(true);
} else { } else {
const minBoot = GBServer.globals.minBoot as any; const minBoot = GBServer.globals.minBoot as any;
min.whatsAppDirectLine = new WhatsappDirectLine( if (min !== minBoot) {
min, min.whatsAppDirectLine = new WhatsappDirectLine(
min.botId, min,
min.instance.whatsappBotKey, min.botId,
minBoot.instance.whatsappServiceKey, min.instance.whatsappBotKey,
minBoot.instance.whatsappServiceNumber, minBoot.instance.whatsappServiceKey,
minBoot.instance.whatsappServiceUrl, minBoot.instance.whatsappServiceNumber,
group minBoot.instance.whatsappServiceUrl,
); group
await min.whatsAppDirectLine.setup(false); );
await min.whatsAppDirectLine.setup(false);
}
} }
// Setups default BOT Framework dialogs. // Setups default BOT Framework dialogs.

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

@ -295,7 +295,9 @@ export class GBSSR {
if (!min) { if (!min) {
min = req.url === '/' min = req.url === '/'
? minBoot ? minBoot
: GBServer.globals.minInstances.filter(p => p.instance.activationCode.toLowerCase() === botId.toLowerCase())[0]; : GBServer.globals.minInstances.filter(p =>
p.instance.activationCode ? p.instance.activationCode.toLowerCase() === botId.toLowerCase()
: null)[0];
} }
if (!min) { if (!min) {
botId = minBoot.botId; botId = minBoot.botId;

2
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -1042,7 +1042,7 @@ export class WhatsappDirectLine extends GBService {
} }
} }
// Detects if the welcome message is enabled.z // Detects if the welcome message is enabled.
if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') { if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') {
// Tries to find if user wants to switch bots. // Tries to find if user wants to switch bots.