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

fix(all): Locale in Audio is dynamic.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-02-18 01:15:47 -03:00
parent fb6e57b19a
commit 03f94d0931
2 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/basic.gblib/services/GBVMService.ts
View file

@ -53,8 +53,6 @@ import { GuaribasUser } from '../../security.gbapp/models/index.js';
import { SystemKeywords } from './SystemKeywords.js';
import { Sequelize, QueryTypes } from '@sequelize/core';
/**
* @fileoverview Decision was to priorize security(isolation) and debugging,
* over a beautiful BASIC transpiler (to be done).
@ -807,6 +805,7 @@ export class GBVMService extends GBService {
let properties = [];
let description;
let table = null; // Used for TABLE keyword.
let talk = null;
let connection = null;
const tasks = [];
let fields = {};
@ -822,7 +821,7 @@ export class GBVMService extends GBService {
line = line.replace(/^\s*\d+\s*/gi, '');
if (!table){
if (!table && !talk){
for (let j = 0; j < keywords.length; j++) {
line = line.replace(keywords[j][0], keywords[j][1]); // TODO: Investigate delay here.
}
@ -845,6 +844,16 @@ export class GBVMService extends GBService {
emmit = false;
}
const endTalkKeyword = /^\s*END TALK\s*/gim;
let endTalkReg = endTalkKeyword.exec(line);
if (endTalkReg && talk) {
line = talk + '`})';
talk = null;
emmit = true;
}
const endTableKeyword = /^\s*END TABLE\s*/gim;
let endTableReg = endTableKeyword.exec(line);
if (endTableReg && table) {
@ -860,6 +869,13 @@ export class GBVMService extends GBService {
emmit = false;
}
// Inside BEGIN TALK
if (talk) {
talk += line + '\\n';
emmit = false;
}
// Inside BEGIN/END table pair containing FIELDS.
if (table && line.trim() !== '') {
@ -876,6 +892,13 @@ export class GBVMService extends GBService {
emmit = false;
}
const talkKeyword = /^\s*BEGIN TALK\s*/gim;
let talkReg = talkKeyword.exec(line);
if (talkReg && !talk) {
talk = "await dk.talk ({pid: pid, text: `";
emmit = false;
}
// Add additional lines returned from replacement.
let add = emmit ? line.split(/\r\n|\r|\n/).length : 0;

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

@ -481,22 +481,6 @@ export class WhatsappDirectLine extends GBService {
return; // Exit here.
}
if (message.type === 'ptt') {
if (process.env.AUDIO_DISABLED !== 'true') {
const media = await message.downloadMedia();
const buf = Buffer.from(media.data, 'base64');
text = await GBConversationalService.getTextFromAudioBuffer(
this.min.instance.speechKey,
this.min.instance.cloudLocation,
buf,
locale
);
} else {
await this.sendToDevice(user.userSystemId, `No momento estou apenas conseguindo ler mensagens de texto.`, null);
}
}
const conversationId = WhatsappDirectLine.conversationIds[botId + from + group];
const client = await this.directLineClient;
WhatsappDirectLine.lastMessage[botId + from] = message;
@ -958,7 +942,7 @@ export class WhatsappDirectLine extends GBService {
private async WhatsAppCallback(req, res) {
try {
if (!req.body) {
if (!req.body && req.type !== 'ptt') {
return;
}
@ -1033,22 +1017,22 @@ export class WhatsappDirectLine extends GBService {
GBLog.info(`A WhatsApp mobile requested instance for: ${botId}.`);
let urlMin: any = GBServer.globals.minInstances.filter(p => p.instance.botId === botId)[0];
// Detects user typed language and updates their locale profile if applies.
let min = urlMin;
let user = await sec.getUserFromSystemId(id);
const botNumber = urlMin ? urlMin.core.getParam(urlMin.instance, 'Bot Number', null) : null;
if (botNumber && GBServer.globals.minBoot.botId !== urlMin.botId) {
GBLog.info(`${id} fixed by bot number talked to: ${botId}.`);
let locale;
let locale = user?.locale ? user.locale: min.core.getParam(
min.instance,
'Default User Language',
GBConfigService.get('DEFAULT_USER_LANGUAGE'));
;
if (!user) {
// Detects user typed language and updates their locale profile if applies.
const min = urlMin;
locale = min.core.getParam(
min.instance,
'Default User Language',
GBConfigService.get('DEFAULT_USER_LANGUAGE'));
const detectLanguage =
min.core.getParam(
@ -1065,10 +1049,29 @@ export class WhatsappDirectLine extends GBService {
user = await sec.ensureUser(urlMin, id, '', '', 'omnichannel', '', '');
user = await sec.updateUserInstance(id, urlMin.instance.instanceId);
if (locale){
if (locale) {
user = await sec.updateUserLocale(user.userId, locale);
}
}
if (req.type === 'ptt') {
if (process.env.AUDIO_DISABLED !== 'true') {
const media = await req.downloadMedia();
const buf = Buffer.from(media.data, 'base64');
text = await GBConversationalService.getTextFromAudioBuffer(
this.min.instance.speechKey,
this.min.instance.cloudLocation,
buf,
user.locale
);
req.body = text;
} else {
await this.sendToDevice(user.userSystemId, `No momento estou apenas conseguindo ler mensagens de texto.`, null);
}
}
let activeMin;
@ -1135,12 +1138,12 @@ export class WhatsappDirectLine extends GBService {
// If bot has a fixed Find active bot instance.
activeMin = botNumber ? urlMin : toSwitchMin ? toSwitchMin : GBServer.globals.minBoot;
const min = activeMin;
min = activeMin;
// If it is the first time for the user, tries to auto-execute
// start dialog if any is specified in Config.xlsx.
if (user === null || user.hearOnDialog) {
user = await sec.ensureUser(activeMin, id, senderName, '', 'whatsapp', senderName, null);
const startDialog = user.hearOnDialog