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

new(Whatsapp.gblib): Now agents will be translated into user language before send text.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2020-05-17 22:36:00 +00:00
parent f67eb02d24
commit 57f9965132
3 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -3273,9 +3273,9 @@
} }
}, },
"botlib": { "botlib": {
"version": "1.5.1", "version": "1.5.2",
"resolved": "https://registry.npmjs.org/botlib/-/botlib-1.5.1.tgz", "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.5.2.tgz",
"integrity": "sha512-oT+cPxEpjQ4bKdeQfrVVzFnJRCmcH76GR5XL5Zez9npjfsYXttgLAM5DSMJzRo2VxO0X1OwN8UxvkUkTjCsCUA==", "integrity": "sha512-drDSpfwN8dQe9X0+YkOFEP0wOfzvbumga3UlR0kB/4Zkt22jPlDXdCmS6e83hV9/93XMibwCgdKpF6WnKeZ8Zg==",
"requires": { "requires": {
"async": "3.1.0", "async": "3.1.0",
"botbuilder": "4.7.0", "botbuilder": "4.7.0",

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

@ -164,6 +164,14 @@ export class WhatsappDirectLine extends GBService {
} }
GBLog.info(`GBWhatsapp: RCV ${from}(${fromName}): ${text})`); GBLog.info(`GBWhatsapp: RCV ${from}(${fromName}): ${text})`);
const id = req.body.messages[0].chatId.split('@')[0];
const senderName = req.body.messages[0].senderName;
let sec = new SecService();
const user = await sec.ensureUser(this.min.instance.instanceId, id,
senderName, "", "whatsapp", senderName);
const locale = user.locale ? user.locale : 'pt';
if (message.type === "ptt") { if (message.type === "ptt") {
const options = { const options = {
@ -177,7 +185,7 @@ export class WhatsappDirectLine extends GBService {
text = await GBConversationalService.getTextFromAudioBuffer( text = await GBConversationalService.getTextFromAudioBuffer(
this.min.instance.speechKey, this.min.instance.speechKey,
this.min.instance.cloudLocation, this.min.instance.cloudLocation,
buf, this.locale buf, locale
); );
} }
@ -185,14 +193,6 @@ export class WhatsappDirectLine extends GBService {
const conversationId = this.conversationIds[from]; const conversationId = this.conversationIds[from];
let client = await this.directLineClient; let client = await this.directLineClient;
const id = req.body.messages[0].chatId.split('@')[0];
const senderName = req.body.messages[0].senderName;
let sec = new SecService();
const user = await sec.ensureUser(this.min.instance.instanceId, id,
senderName, "", "whatsapp", senderName);
if (user.agentMode === "self") { if (user.agentMode === "self") {
let manualUser = await sec.getUserFromAgentSystemId(id); let manualUser = await sec.getUserFromAgentSystemId(id);
@ -206,38 +206,39 @@ export class WhatsappDirectLine extends GBService {
let message = await this.min.kbService.getAnswerTextByMediaName(this.min.instance.instanceId, filename); let message = await this.min.kbService.getAnswerTextByMediaName(this.min.instance.instanceId, filename);
if (message === null) { if (message === null) {
await this.sendToDevice(user.userSystemId, `File ${filename} not found in any .gbkb published. Check the name or publish again the associated .gbkb.`); await this.sendToDeviceEx(user.userSystemId, `File ${filename} not found in any .gbkb published. Check the name or publish again the associated .gbkb.`,
locale);
} else { } else {
await this.min.conversationalService.sendMarkdownToMobile(this.min, null, user.userSystemId, message); await this.min.conversationalService.sendMarkdownToMobile(this.min, null, user.userSystemId, message);
} }
} else if (text === '/qt') { } else if (text === '/qt') {
// TODO: Transfers only in pt-br for now. // TODO: Transfers only in pt-br for now.
await this.sendToDevice(manualUser.userSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId)); await this.sendToDeviceEx(manualUser.userSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId), locale);
await this.sendToDevice(user.agentSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId)); await this.sendToDeviceEx(user.agentSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId), locale);
await sec.updateCurrentAgent(manualUser.userSystemId, this.min.instance.instanceId, null); await sec.updateCurrentAgent(manualUser.userSystemId, this.min.instance.instanceId, null);
} }
else { else {
GBLog.info(`HUMAN AGENT (${id}) TO USER ${manualUser.userSystemId}: ${text}`); GBLog.info(`HUMAN AGENT (${id}) TO USER ${manualUser.userSystemId}: ${text}`);
this.sendToDevice(manualUser.userSystemId, `${manualUser.agentSystemId}: ${text}`); this.sendToDeviceEx(manualUser.userSystemId, `${manualUser.agentSystemId}: ${text}`, locale);
} }
} }
} }
else if (user.agentMode === "human") { else if (user.agentMode === "human") {
let agent = await sec.getUserFromSystemId(user.agentSystemId); let agent = await sec.getUserFromSystemId(user.agentSystemId);
if (text === '/t') { if (text === '/t') {
await this.sendToDevice(user.userSystemId, `Você já está sendo atendido por ${agent.userSystemId}.`); await this.sendToDeviceEx(user.userSystemId, `Você já está sendo atendido por ${agent.userSystemId}.`, locale);
} }
else if (text === '/qt' || text === "Sair" || text === "Fechar") { else if (text === '/qt' || text === "Sair" || text === "Fechar") {
// TODO: Transfers only in pt-br for now. // TODO: Transfers only in pt-br for now.
await this.sendToDevice(id, Messages[this.locale].notify_end_transfer(this.min.instance.botId)); await this.sendToDeviceEx(id, Messages[this.locale].notify_end_transfer(this.min.instance.botId), locale);
await this.sendToDevice(user.agentSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId)); await this.sendToDeviceEx(user.agentSystemId, Messages[this.locale].notify_end_transfer(this.min.instance.botId), locale);
await sec.updateCurrentAgent(id, this.min.instance.instanceId, null); await sec.updateCurrentAgent(id, this.min.instance.instanceId, null);
} }
else { else {
GBLog.info(`USER (${id}) TO AGENT ${user.userSystemId}: ${text}`); GBLog.info(`USER (${id}) TO AGENT ${user.userSystemId}: ${text}`);
this.sendToDevice(user.agentSystemId, `${id}: ${text}`); this.sendToDeviceEx(user.agentSystemId, `${id}: ${text}`, locale);
} }
} }
@ -408,6 +409,16 @@ export class WhatsappDirectLine extends GBService {
await this.sendFileToDevice(to, url, 'Audio', msg); await this.sendFileToDevice(to, url, 'Audio', msg);
} }
public async sendToDeviceEx(to, msg, locale) {
const text = await this.min.conversationalService.translate(
this.min.instance.translatorKey,
this.min.instance.translatorEndpoint,
msg,
locale
);
await this.sendToDevice(to, text);
}
public async sendToDevice(to, msg) { public async sendToDevice(to, msg) {
const cmd = '/audio '; const cmd = '/audio ';

2
src/app.ts
View file

@ -158,7 +158,7 @@ export class GBServer {
GBLog.info(`Publishing instances...`); GBLog.info(`Publishing instances...`);
const packageInstance = await importer.importIfNotExistsBotPackage( const packageInstance = await importer.importIfNotExistsBotPackage(
GBConfigService.get('CLOUD_GROUP'), GBConfigService.get('BOT_ID'),
'boot.gbot', 'boot.gbot',
'packages/boot.gbot' 'packages/boot.gbot'
); );