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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +13 -9
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 565f200ebf - Show all commits

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.
*/
public async gotoDialog(step, fromOrDialogName: string, dialogName: string) {
public async gotoDialog(step, fromOrDialogName: string, dialogName: string) {
if (dialogName) {
let sec = new SecService();
let user = await sec.getUserFromSystemId(fromOrDialogName);
if (!user) {
user = await sec.ensureUser(this.min.instance.instanceId, fromOrDialogName,
fromOrDialogName, null, 'whatsapp', 'from', null);
if (dialogName.charAt(0) === '/') {
await step.beginDialog(fromOrDialogName);
} else {
let sec = new SecService();
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 {
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) => {
return `sys().gotoDialog(step, ${$3})\n`;
return `gotoDialog(step, ${$3})\n`;
});
code = code.replace(/(hear)\s*(\w+)/gi, ($0, $1, $2) => {