From 92439d6bf667ea74bedfeb24c413bd97bcf5ad84 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Tue, 7 Jul 2020 10:15:39 -0300 Subject: [PATCH] new(core.gbapp): New keywords USERNAME MOBILE. --- packages/core.gbapp/services/GBAPIService.ts | 17 +++++++++++++++++ packages/core.gbapp/services/GBVMService.ts | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 8e54c18b..df91a70b 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -356,6 +356,23 @@ export class DialogClass { return step.context.activity.from.id; } + public async getUserName(step) { + return step.context.activity.from.name; + } + + public async getUserMobile(step) { + + if (isNaN(step.context.activity.from.id)) + { + return ('No mobile available.'); + } + else + { + return (step.context.activity.from.id); + } + + } + public async askEmail(step) { return await step.beginDialog('/gbasic-email'); } diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index ddddf95a..a6074d42 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -157,7 +157,8 @@ export class GBVMService extends GBService { from = this.getFrom(step) today = this.getToday(step) id = sys().getRandomId() - + username = this.getUserName(); + mobile = this.getUserMobile(); ${code} `; @@ -169,6 +170,7 @@ export class GBVMService extends GBService { code = code.replace(/(hear)\s*(\w+)/gi, ($0, $1, $2) => { return `${$2} = hear()`; }); + code = code.replace(/(\w)\s*\=\s*find\s*(.*)/gi, ($0, $1, $2, $3) => { return `${$1} = sys().find(${$2})\n`; });