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

new(whatsapp.gblib): Multiple providers can be loaded at once.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2022-07-08 13:22:23 -03:00
parent 975e7a1d89
commit 4f93b626d1
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -373,8 +373,6 @@ export class GBMinService {
} }
} }
let activeMin;
let botId; let botId;
if (chatapi) { if (chatapi) {
@ -387,8 +385,14 @@ export class GBMinService {
botId = WhatsappDirectLine.phones[req.body.phoneId]; botId = WhatsappDirectLine.phones[req.body.phoneId];
} }
GBLog.info(`Client requested instance for: ${botId}.`); GBLog.info(`A WhatsApp mobile requested instance for: ${botId}.`);
let urlMin: any = GBServer.globals.minInstances.filter
(p => p.instance.botId === botId);
const botNumber = urlMin.core.getParam(urlMin.instance, 'Bot Number', null);
let activeMin;
// Processes group behaviour. // Processes group behaviour.
@ -396,6 +400,7 @@ export class GBMinService {
text = text.replace(/\@\d+ /gi, ''); text = text.replace(/\@\d+ /gi, '');
if (chatapi) { if (chatapi) {
// Ensures that the bot group is the active bot for the user (like switching). // Ensures that the bot group is the active bot for the user (like switching).
const message = req.body.messages[0]; const message = req.body.messages[0];
@ -415,7 +420,6 @@ export class GBMinService {
} }
} }
// Detects if the welcome message is enabled. // Detects if the welcome message is enabled.
if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') { if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') {
@ -431,9 +435,10 @@ export class GBMinService {
)[0]; )[0];
} }
// Find active bot instance. // If bot has a fixed Find active bot instance.
activeMin = toSwitchMin ? toSwitchMin : GBServer.globals.minBoot; activeMin = botNumber ? urlMin :
toSwitchMin ? toSwitchMin : GBServer.globals.minBoot;
// If it is the first time for the user, tries to auto-execute // If it is the first time for the user, tries to auto-execute
// start dialog if any is specified in Config.xlsx. // start dialog if any is specified in Config.xlsx.

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

@ -87,7 +87,7 @@ export class WhatsappDirectLine extends GBService {
this.whatsappServiceKey = whatsappServiceKey; this.whatsappServiceKey = whatsappServiceKey;
this.whatsappServiceNumber = whatsappServiceNumber; this.whatsappServiceNumber = whatsappServiceNumber;
this.whatsappServiceUrl = whatsappServiceUrl; this.whatsappServiceUrl = whatsappServiceUrl;
this.chatapi = whatsappServiceNumber.indexOf(';') > -1 ? false : true; this.chatapi = whatsappServiceNumber.indexOf(';') > -1 ? false : false;
} }
public static async asyncForEach(array, callback) { public static async asyncForEach(array, callback) {