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

fix(basic.gblib): Goto dialog within web.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-09-18 09:41:18 -03:00
parent 7c446699eb
commit 565f200ebf
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/basic.gblib/services/DialogKeywords.ts
View file

@ -453,18 +453,22 @@ export class DialogKeywords {
/** /**
* Prepares the next dialog to be shown to the specified user. * Prepares the next dialog to be shown to the specified user.
*/ */
public async gotoDialog(step, fromOrDialogName: string, dialogName: string) { public async gotoDialog(step, fromOrDialogName: string, dialogName: string) {
if (dialogName) { if (dialogName) {
let sec = new SecService(); if (dialogName.charAt(0) === '/') {
let user = await sec.getUserFromSystemId(fromOrDialogName); await step.beginDialog(fromOrDialogName);
if (!user) { } else {
user = await sec.ensureUser(this.min.instance.instanceId, fromOrDialogName, let sec = new SecService();
fromOrDialogName, null, 'whatsapp', 'from', null); let user = await sec.getUserFromSystemId(fromOrDialogName);
if (!user) {
user = await sec.ensureUser(this.min.instance.instanceId, fromOrDialogName,
fromOrDialogName, null, 'whatsapp', 'from', null);
}
await sec.updateUserHearOnDialog(user.userId, dialogName);
} }
await sec.updateUserHearOnDialog(user.userId, dialogName);
} }
else { else {
await step.beginDialog(dialogName); await step.beginDialog(fromOrDialogName);
} }
} }

2
packages/basic.gblib/services/GBVMService.ts
View file

@ -242,7 +242,7 @@ export class GBVMService extends GBService {
}); });
code = code.replace(/(go to)(\s)(.*)/gi, ($0, $1, $2, $3) => { code = code.replace(/(go to)(\s)(.*)/gi, ($0, $1, $2, $3) => {
return `sys().gotoDialog(step, ${$3})\n`; return `gotoDialog(step, ${$3})\n`;
}); });
code = code.replace(/(hear)\s*(\w+)/gi, ($0, $1, $2) => { code = code.replace(/(hear)\s*(\w+)/gi, ($0, $1, $2) => {