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

fix(basic.gblib): Fixing bad regexp.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2021-02-07 18:28:54 -03:00
parent 93d11e101a
commit 5d6d147ad4
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -260,11 +260,11 @@ export class GBVMService extends GBService {
return `transfer (step)\n`;
});
code = code.replace(/(exit)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
code = code.replace(/(exit)/gi, () => {
return `resolve();\n`;
});
code = code.replace(/(show menu)(?=(?:[^"]|"[^"]*")*$)/gi, () => {
code = code.replace(/(show menu)/gi, () => {
return `showMenu (step)\n`;
});
@ -424,25 +424,25 @@ export class GBVMService extends GBService {
code = code.replace(/("[^"]*"|'[^']*')|\btalk\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.talk' : $1;
});
code = code.replace(/\bhear\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\bhear\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.hear' : $1;
});
code = code.replace(/\bsendEmail\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\bsendEmail\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendEmail' : $1;
});
code = code.replace(/\baskEmail\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\baskEmail\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.askEmail' : $1;
});
code = code.replace(/\bsendFileTo\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\bsendFileTo\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendFileTo' : $1;
});
code = code.replace(/\bsendFile\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\bsendFile\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.sendFile' : $1;
});
code = code.replace(/\bsetLanguage\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\bsetLanguage\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.setLanguage' : $1;
});
code = code.replace(/\btransfer\b(?=(?:[^"]|"[^"]*")*$)/gi, ($0, $1) => {
code = code.replace(/\btransfer\b/gi, ($0, $1) => {
return $1 === undefined ? 'this.transfer' : $1;
});
code = code.replace(/("[^"]*"|'[^']*')|\bmenu\b/gi, ($0, $1) => {

11
packages/kb.gbapp/dialogs/AskDialog.ts
View file

@ -153,7 +153,7 @@ export class AskDialog extends IGBDialog {
let text = step.options.query;
text = text.replace(/<([^>]+?)([^>]*?)>(.*?)<\/\1>/gi, '');
// When no text is typed, the start dialog is invoked again
// when people type just the @botName in MSTEAMS for example.
@ -164,8 +164,8 @@ export class AskDialog extends IGBDialog {
return step.endDialog();
}
const locale = step.context.activity.locale;
// Stops any content on projector.
@ -234,7 +234,10 @@ export class AskDialog extends IGBDialog {
if (answer) {
return await AskDialog.handleAnswer(service, min, step, answer);
} else if (!(await min.conversationalService.routeNLP(step, min, text))) {
await min.conversationalService.sendText(min, step, Messages[locale].did_not_find);
const message = min.core.getParam<string>(min.instance, 'Not Found Message',
Messages[locale].did_not_find);
await min.conversationalService.sendText(min, step, message);
return await step.replaceDialog('/ask', { isReturning: true });
}
}