From fb6e57b19a0434fffb8c9724fe3732281f0c496a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sat, 17 Feb 2024 22:21:40 -0300 Subject: [PATCH] fix(all): Locale in Audio is dynamic. --- .wwebjs_cache/2.2407.3.html | 2 + .../services/GBConversationalService.ts | 38 +++++++++---------- .../services/WhatsappDirectLine.ts | 9 ++--- 3 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 .wwebjs_cache/2.2407.3.html diff --git a/.wwebjs_cache/2.2407.3.html b/.wwebjs_cache/2.2407.3.html new file mode 100644 index 00000000..ada2808f --- /dev/null +++ b/.wwebjs_cache/2.2407.3.html @@ -0,0 +1,2 @@ +WhatsApp Web
WhatsApp
 End-to-end encrypted
\ No newline at end of file diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index d7fd01d6..ffda5e5b 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -528,22 +528,22 @@ export class GBConversationalService { } public static getIBMAudioModelNameFromLocale = locale => { const locales = { - "ar": "ar-MS_BroadbandModel", - "zh": "zh-CN_BroadbandModel", - "nl": "nl-NL_BroadbandModel", - "en": "en-US_BroadbandModel", - "fr": "fr-FR_BroadbandModel", - "de": "de-DE_BroadbandModel", - "it": "it-IT_BroadbandModel", - "ja": "ja-JP_BroadbandModel", - "ko": "ko-KR_BroadbandModel", - "pt": "pt-BR_BroadbandModel", - "es": "es-ES_BroadbandModel" + "ar": "ar-MS_BroadbandModel", + "zh": "zh-CN_BroadbandModel", + "nl": "nl-NL_BroadbandModel", + "en": "en-US_BroadbandModel", + "fr": "fr-FR_BroadbandModel", + "de": "de-DE_BroadbandModel", + "it": "it-IT_BroadbandModel", + "ja": "ja-JP_BroadbandModel", + "ko": "ko-KR_BroadbandModel", + "pt": "pt-BR_BroadbandModel", + "es": "es-ES_BroadbandModel" }; const languageCode = locale.substring(0, 2); return locales[languageCode] || "en-US_BroadbandModel"; -}; + }; public async playMarkdown(min: GBMinInstance, answer: string, channel: string, @@ -989,7 +989,7 @@ export class GBConversationalService { 'api-version': '3.0', to: language }).toString() - + let options = { method: 'POST', headers: { @@ -1006,10 +1006,10 @@ export class GBConversationalService { let results = await fetch(url, options); results = await results.json(); - if (results[0]){ + if (results[0]) { return results[0].translations[0].text; } - else{ + else { return text; } } catch (error) { @@ -1097,7 +1097,7 @@ export class GBConversationalService { // Detects user typed language and updates their locale profile if applies. - let locale = min.core.getParam( + let locale = user.locale ? user.locale : min.core.getParam( min.instance, 'Default User Language', GBConfigService.get('DEFAULT_USER_LANGUAGE')); @@ -1108,13 +1108,13 @@ export class GBConversationalService { 'Language Detector', false) != false; - - if (text.indexOf(' ') !== -1 && detectLanguage) { + + if (text.indexOf(' ') !== -1 && detectLanguage) { locale = await min.conversationalService.getLanguage(min, text); if (user.locale != locale) { user = await sec.updateUserLocale(user.userId, locale); await min.conversationalService.sendText(min, - step, `Changed language to: ${locale}`); + step, `Changed language to: ${locale}`); } } diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts index 34c52637..00d0aff6 100644 --- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts +++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts @@ -958,10 +958,7 @@ export class WhatsappDirectLine extends GBService { private async WhatsAppCallback(req, res) { try { - if (req.body && req.body.webhook) { - res.status(200); - res.end(); - + if (!req.body) { return; } @@ -1068,7 +1065,9 @@ export class WhatsappDirectLine extends GBService { user = await sec.ensureUser(urlMin, id, '', '', 'omnichannel', '', ''); user = await sec.updateUserInstance(id, urlMin.instance.instanceId); - user = await sec.updateUserLocale(user.userId, locale); + if (locale){ + user = await sec.updateUserLocale(user.userId, locale); + } }