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

Merge branch 'main' of https://github.com/GeneralBots/BotServer

Browse source
This commit is contained in:
rodrigorodriguez 2023-03-24 19:19:47 -03:00
commit 7bdc57a4a1
4 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/azuredeployer.gbapp/services/AzureDeployerService.ts
View file

@ -359,6 +359,8 @@ export class AzureDeployerService implements IGBInstallationDeployer {
GBLog.info(`Enabling resource providers...`); GBLog.info(`Enabling resource providers...`);
await this.enableResourceProviders('Microsoft.BotService'); await this.enableResourceProviders('Microsoft.BotService');
await this.enableResourceProviders('Microsoft.Web');
await this.enableResourceProviders('Microsoft.Sql');
GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`); GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`);
await this.createDeployGroup(name, instance.cloudLocation); await this.createDeployGroup(name, instance.cloudLocation);

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

@ -773,6 +773,7 @@ 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;
if (min !== minBoot) {
min.whatsAppDirectLine = new WhatsappDirectLine( min.whatsAppDirectLine = new WhatsappDirectLine(
min, min,
min.botId, min.botId,
@ -784,6 +785,7 @@ export class GBMinService {
); );
await min.whatsAppDirectLine.setup(false); await min.whatsAppDirectLine.setup(false);
} }
}
// Setups default BOT Framework dialogs. // Setups default BOT Framework dialogs.

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

@ -283,7 +283,7 @@ export class GBSSR {
// Tries to find botId from URL. // Tries to find botId from URL.
const minBoot = GBServer.globals.minInstances[0]; const minBoot = GBServer.globals.minBoot;
let botId = let botId =
req.originalUrl && req.originalUrl === '/' ? req.originalUrl && req.originalUrl === '/' ?
minBoot.botId : minBoot.botId :
@ -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.