feat: wrap up translation logic

api/src/chat/controllers/block.controller.spec.ts

@@ -19,7 +19,10 @@ import { AttachmentService } from '@/attachment/services/attachment.service';
 import { ContentRepository } from '@/cms/repositories/content.repository';
 import { ContentModel } from '@/cms/schemas/content.schema';
 import { ContentService } from '@/cms/services/content.service';
+import { LanguageRepository } from '@/i18n/repositories/language.repository';
+import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
+import { LanguageService } from '@/i18n/services/language.service';
 import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
@@ -86,6 +89,7 @@ describe('BlockController', () => {
           UserModel,
           RoleModel,
           PermissionModel,
+          LanguageModel,
         ]),
       ],
       providers: [
@@ -97,6 +101,7 @@ describe('BlockController', () => {
         UserRepository,
         RoleRepository,
         PermissionRepository,
+        LanguageRepository,
         BlockService,
         LabelService,
         CategoryService,
@@ -105,6 +110,7 @@ describe('BlockController', () => {
         UserService,
         RoleService,
         PermissionService,
+        LanguageService,
         PluginService,
         LoggerService,
         {

api/src/chat/services/block.service.spec.ts

@@ -7,6 +7,7 @@
  * 3. SaaS Restriction: This software, or any derivative of it, may not be used to offer a competing product or service (SaaS) without prior written consent from Hexastack. Offering the software as a service or using it in a commercial cloud environment without express permission is strictly prohibited.
  */
 
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Test } from '@nestjs/testing';
@@ -28,7 +29,10 @@ import OfflineHandler from '@/extensions/channels/offline/index.channel';
 import { OFFLINE_CHANNEL_NAME } from '@/extensions/channels/offline/settings';
 import { Offline } from '@/extensions/channels/offline/types';
 import OfflineEventWrapper from '@/extensions/channels/offline/wrapper';
+import { LanguageRepository } from '@/i18n/repositories/language.repository';
+import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
+import { LanguageService } from '@/i18n/services/language.service';
 import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { Settings } from '@/setting/schemas/types';
@@ -92,6 +96,7 @@ describe('BlockService', () => {
           ContentModel,
           AttachmentModel,
           LabelModel,
+          LanguageModel,
         ]),
       ],
       providers: [
@@ -100,11 +105,13 @@ describe('BlockService', () => {
         ContentTypeRepository,
         ContentRepository,
         AttachmentRepository,
+        LanguageRepository,
         BlockService,
         CategoryService,
         ContentTypeService,
         ContentService,
         AttachmentService,
+        LanguageService,
         {
           provide: PluginService,
           useValue: {},
@@ -130,6 +137,14 @@ describe('BlockService', () => {
           },
         },
         EventEmitter2,
+        {
+          provide: CACHE_MANAGER,
+          useValue: {
+            del: jest.fn(),
+            get: jest.fn(),
+            set: jest.fn(),
+          },
+        },
       ],
     }).compile();
     blockService = module.get<BlockService>(BlockService);

api/src/chat/services/block.service.ts

@@ -14,6 +14,7 @@ import { AttachmentService } from '@/attachment/services/attachment.service';
 import EventWrapper from '@/channel/lib/EventWrapper';
 import { ContentService } from '@/cms/services/content.service';
 import { I18nService } from '@/i18n/services/i18n.service';
+import { LanguageService } from '@/i18n/services/language.service';
 import { LoggerService } from '@/logger/logger.service';
 import { Nlp } from '@/nlp/lib/types';
 import { PluginService } from '@/plugins/plugins.service';
@@ -44,6 +45,7 @@ export class BlockService extends BaseService<Block, BlockPopulate, BlockFull> {
     private readonly pluginService: PluginService,
     private readonly logger: LoggerService,
     protected readonly i18n: I18nService,
+    protected readonly languageService: LanguageService,
   ) {
     super(repository);
   }
@@ -108,12 +110,9 @@ export class BlockService extends BaseService<Block, BlockPopulate, BlockFull> {
       // Check & catch user language through NLP
       const nlp = event.getNLP();
       if (nlp) {
-        const settings = await this.settingService.getSettings();
+        const languages = await this.languageService.getLanguages();
         const lang = nlp.entities.find((e) => e.entity === 'language');
-        if (
-          lang &&
-          settings.nlp_settings.languages.indexOf(lang.value) !== -1
-        ) {
+        if (lang && Object.keys(languages).indexOf(lang.value) !== -1) {
           const profile = event.getSender();
           profile.language = lang.value;
           event.setSender(profile);
@@ -369,12 +368,11 @@ export class BlockService extends BaseService<Block, BlockPopulate, BlockFull> {
    * @returns The text message translated and tokens being replaces with values
    */
   processText(text: string, context: Context, settings: Settings): string {
-    const lang =
-      context && context.user && context.user.language
-        ? context.user.language
-        : settings.nlp_settings.default_lang;
     // Translate
-    text = this.i18n.t(text, { lang, defaultValue: text });
+    text = this.i18n.t(text, {
+      lang: context.user.language,
+      defaultValue: text,
+    });
     // Replace context tokens
     text = this.processTokenReplacements(text, context, settings);
     return text;