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

fix(core.gbapp): BASIC fixed on WhatsApp channel.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-06-05 14:40:21 -03:00
parent c36640e519
commit 1d316ef83b
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -349,6 +349,7 @@ export class GBVMService extends GBService {
step.activeDialog.state.options = {}; step.activeDialog.state.options = {};
step.activeDialog.state.options.cbId = (step.options as any).id; step.activeDialog.state.options.cbId = (step.options as any).id;
step.activeDialog.state.options.previousResolve = (step.options as any).previousResolve; step.activeDialog.state.options.previousResolve = (step.options as any).previousResolve;
GBLog.info('BASIC: Asking for input (HEAR).');
return await min.conversationalService.prompt(min, step, null); return await min.conversationalService.prompt(min, step, null);
}, },
async step => { async step => {

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

@ -236,12 +236,12 @@ export class AskDialog extends IGBDialog {
if (answer.content.endsWith('.docx')) { if (answer.content.endsWith('.docx')) {
const mainName = answer.content.replace(/\s|\-/gi, '').split('.')[0]; const mainName = answer.content.replace(/\s|\-/gi, '').split('.')[0];
await GBMinService.callVM(mainName, min, step); return await GBMinService.callVM(mainName, min, step);
} else { } else {
await service.sendAnswer(min, AskDialog.getChannel(step), step, answer); await service.sendAnswer(min, AskDialog.getChannel(step), step, answer);
return await step.replaceDialog('/ask', { isReturning: true });
} }
return await step.replaceDialog('/ask', { isReturning: true });
} }

10
packages/kb.gbapp/services/KBService.ts
View file

@ -409,7 +409,7 @@ export class KBService implements IGBKBService {
// Calls language translator. // Calls language translator.
let text = await min.conversationalService.translate(min, let text = await min.conversationalService.translate(min,
min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey, min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey,
min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint, min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
answer.content, answer.content,
@ -431,8 +431,10 @@ export class KBService implements IGBKBService {
}); });
// MSFT Translator breaks markdown, so we need to fix it: // MSFT Translator breaks markdown, so we need to fix it:
text = text.replace('! [', '![').replace('] (','](');
text = text.replace('! [', '![').replace('] (', '](');
text = text.replace(`[[embed url=`, process.env.BOT_URL + '/').replace(']]', ''); // TODO: Improve it.
const html = marked(text); const html = marked(text);
// According to the channel, formats the output optimized to it. // According to the channel, formats the output optimized to it.
@ -457,7 +459,7 @@ export class KBService implements IGBKBService {
const user = await sec.ensureUser(min.instance.instanceId, member.id, const user = await sec.ensureUser(min.instance.instanceId, member.id,
member.name, "", "web", member.name); member.name, "", "web", member.name);
const minBoot = GBServer.globals.minBoot as any; const minBoot = GBServer.globals.minBoot as any;
html = await min.conversationalService.translate(min, html = await min.conversationalService.translate(min,
min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey, min.instance.translatorKey ? min.instance.translatorKey : minBoot.instance.translatorKey,
min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint, min.instance.translatorEndpoint ? min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
html, html,

7
packages/whatsapp.gblib/services/WhatsappDirectLine.ts
View file

@ -418,7 +418,7 @@ export class WhatsappDirectLine extends GBService {
public async sendToDeviceEx(to, msg, locale) { public async sendToDeviceEx(to, msg, locale) {
const minBoot = GBServer.globals.minBoot as any; const minBoot = GBServer.globals.minBoot as any;
const text = await this.min.conversationalService.translate(this.min, const text = await this.min.conversationalService.translate(this.min,
this.min.instance.translatorKey ? this.min.instance.translatorKey : minBoot.instance.translatorKey, this.min.instance.translatorKey ? this.min.instance.translatorKey : minBoot.instance.translatorKey,
this.min.instance.translatorEndpoint ? this.min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint, this.min.instance.translatorEndpoint ? this.min.instance.translatorEndpoint : minBoot.instance.translatorEndpoint,
msg, msg,
@ -427,14 +427,15 @@ export class WhatsappDirectLine extends GBService {
await this.sendToDevice(to, text); await this.sendToDevice(to, text);
} }
public async sendToDevice(to, msg) { public async sendToDevice(to, msg) {
const cmd = '/audio '; const cmd = '/audio ';
if (msg.startsWith(cmd)) { if (msg.startsWith(cmd)) {
msg = msg.substr(cmd.length); msg = msg.substr(cmd.length);
return await this.sendTextAsAudioToDevice(to, msg); return await this.sendTextAsAudioToDevice(to, msg);
} } else {
else {
const options = { const options = {
method: 'POST', method: 'POST',