From b736f04103efb37370a040a77c9a5ed523a2703d Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 11 Nov 2020 11:10:40 -0300 Subject: [PATCH] fix(core.gbapp): New key word SEND FILE TO added. --- packages/core.gbapp/services/GBAPIService.ts | 12 ++++++++++-- packages/core.gbapp/services/GBVMService.ts | 3 +++ packages/kb.gbapp/services/KBService.ts | 2 -- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 75ecde6eb..766498f14 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -537,12 +537,20 @@ export class DialogClass { // TODO: Choose Fuse with country code or consent IP. } + + public async sendFileTo(step, mobile, filename, caption) { + return await this.internalSendFile(null, mobile, filename, caption); + } public async sendFile(step, filename, caption) { + return await this.internalSendFile(step, null, filename, caption); + } + + private async internalSendFile(step, mobile, filename, caption) { if (filename.indexOf('.md') > -1) { GBLog.info(`BASIC: Sending the contents of ${filename} markdown to mobile.`); let md = await this.min.kbService.getAnswerTextByMediaName(this.min.instance.instanceId, filename); - await this.min.conversationalService.sendMarkdownToMobile(this.min, step, null, md); + await this.min.conversationalService.sendMarkdownToMobile(this.min, step, mobile, md); } else { GBLog.info(`BASIC: Sending the file ${filename} to mobile.`); let url = urlJoin( @@ -554,7 +562,7 @@ export class DialogClass { filename ); - await this.min.conversationalService.sendFile(this.min, step, null, url, caption); + await this.min.conversationalService.sendFile(this.min, step, mobile, url, caption); } } diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index e739fa1e3..813d4fb8e 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -219,6 +219,9 @@ export class GBVMService extends GBService { code = code.replace(/(send file)(\s*)(.*)/gi, ($0, $1, $2, $3) => { return `sendFile (step, ${$3})\n`; }); + code = code.replace(/(send file to)(\s*)(.*)/gi, ($0, $1, $2, $3) => { + return `sendFileTo (step, ${$3})\n`; + }); code = code.replace(/(save)(\s)(.*)/gi, ($0, $1, $2, $3) => { return `sys().save(${$3})\n`; diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts index c7472d6dd..4bdc6bc2c 100644 --- a/packages/kb.gbapp/services/KBService.ts +++ b/packages/kb.gbapp/services/KBService.ts @@ -631,8 +631,6 @@ export class KBService implements IGBKBService { where: { instanceId: instance.instanceId, packageId: packageId } }); await this.undeployPackageFromStorage(instance, packageId); - - GBLog.info('Remember to call rebuild index manually after package removal.'); } private async undeployPackageFromStorage(instance: any, packageId: number) {