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

fix(all): Fix user switching on a single chip.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-09-09 16:19:17 -03:00
parent b69ffa91d9
commit 9ab41597af
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1034,8 +1034,15 @@ export class WhatsappDirectLine extends GBService {
} }
const sec = new SecService(); const sec = new SecService();
let user = await sec.getUserFromSystemId(id); let user = await sec.getUserFromSystemId(id);
// Tries to find if user wants to switch bots.
let toSwitchMin = GBServer.globals.minInstances.filter(
p => p.instance.botId.toLowerCase() === text.toLowerCase()
)[0];
GBLog.info(`A WhatsApp mobile 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)[0]; let urlMin: any = GBServer.globals.minInstances.filter(p => p.instance.botId === botId)[0];
@ -1101,12 +1108,6 @@ export class WhatsappDirectLine extends GBService {
return; return;
} }
// Tries to find if user wants to switch bots.
let toSwitchMin = GBServer.globals.minInstances.filter(
p => p.instance.botId.toLowerCase() === text.toLowerCase()
)[0];
if (!toSwitchMin) { if (!toSwitchMin) {
toSwitchMin = GBServer.globals.minInstances.filter(p => toSwitchMin = GBServer.globals.minInstances.filter(p =>
p.instance.activationCode ? p.instance.activationCode.toLowerCase() === text.toLowerCase() : false p.instance.activationCode ? p.instance.activationCode.toLowerCase() === text.toLowerCase() : false
@ -1160,6 +1161,7 @@ export class WhatsappDirectLine extends GBService {
// So gets the new bot instance information and prepares to // So gets the new bot instance information and prepares to
// auto start dialog if any is specified. // auto start dialog if any is specified.
activeMin = toSwitchMin; activeMin = toSwitchMin;
const instance = await this.min.core.loadInstanceByBotId(activeMin.botId); const instance = await this.min.core.loadInstanceByBotId(activeMin.botId);
await sec.updateUserInstance(id, instance.instanceId); await sec.updateUserInstance(id, instance.instanceId);
@ -1167,6 +1169,7 @@ export class WhatsappDirectLine extends GBService {
const startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null); const startDialog = activeMin.core.getParam(activeMin.instance, 'Start Dialog', null);
if (startDialog) { if (startDialog) {
GBLog.info(`Calling /start for Auto start : ${startDialog} for ${activeMin.instance.botId}...`); GBLog.info(`Calling /start for Auto start : ${startDialog} for ${activeMin.instance.botId}...`);
if (provider === 'chatapi') { if (provider === 'chatapi') {
req.body.messages[0].body = `/start`; req.body.messages[0].body = `/start`;