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

fix(core.gbapp): Trying to fix Word language finishing error.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-11-09 17:40:34 -03:00
parent 5f536a0ffa
commit 3ae1b75afd
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/core.gbapp/services/GBVMService.ts
View file

@ -194,7 +194,7 @@ export class GBVMService extends GBService {
}); });
code = code.replace(/set\s(.*)/gi, ($0, $1, $2) => { code = code.replace(/set\s(.*)/gi, ($0, $1, $2) => {
return `sys().set (${$1})`; return `sys().set (${$1})`;
}); });
code = code.replace(/(\w+)\s*\=\s*post\s*(.*),\s*(.*)/gi, ($0, $1, $2, $3) => { code = code.replace(/(\w+)\s*\=\s*post\s*(.*),\s*(.*)/gi, ($0, $1, $2, $3) => {
@ -224,7 +224,6 @@ export class GBVMService extends GBService {
return `sys().save(${$3})\n`; return `sys().save(${$3})\n`;
}); });
code = `${code}\n%>`; code = `${code}\n%>`;
return code; return code;
@ -378,19 +377,22 @@ export class GBVMService extends GBService {
}, },
async step => { async step => {
const cbId = step.activeDialog.state.options.cbId; const cbId = step.activeDialog.state.options.cbId;
const promise = min.cbMap[cbId].promise;
delete min.cbMap[cbId]; if (min.cbMap[cbId] !== null) {
try { const promise = min.cbMap[cbId].promise;
const opts = await promise(step, step.result); delete min.cbMap[cbId];
try {
return await step.replaceDialog('/hear', opts); const opts = await promise(step, step.result);
} catch (error) { return await step.replaceDialog('/hear', opts);
GBLog.error(`Error running BASIC code: ${error}`); } catch (error) {
const locale = step.context.activity.locale; GBLog.error(`Error running BASIC code: ${error}`);
step.context.sendActivity(Messages[locale].very_sorry_about_error); const locale = step.context.activity.locale;
step.context.sendActivity(Messages[locale].very_sorry_about_error);
return await step.replaceDialog('/ask', { isReturning: true }); return await step.replaceDialog('/ask', { isReturning: true });
}
} else {
GBLog.warn(`BASIC callback dialog called with no map for cbId: ${cbId}`);
await step.replaceDialog('/ask', { isReturning: true });
} }
} }
]) ])