refactor: improve changes and fix CI

Author: Anyitechs

bot/messages.ts

@@ -26,9 +26,10 @@ import { IFiat } from '../util/fiatModel';
 import { CommunityContext } from './modules/community/communityContext';
 import { imageCache } from '../util/imageCache';
 import { ImageProcessingError } from '../util/errors';
-const { I18n } = require('@grammyjs/i18n');
 import { Community } from '../models';
 
+const { I18n } = require('@grammyjs/i18n');
+
 const startMessage = async (ctx: MainContext) => {
   try {
     const holdInvoiceExpiration = holdInvoiceExpirationInSecs();

bot/modules/community/scenes.communityAdmin.ts

@@ -1,5 +1,6 @@
 import { Scenes } from 'telegraf';
 import { CommunityContext } from './communityContext';
+import { isValidLanguage } from '../../../util/languages';
 
 import * as CommunityEvents from '../events/community';
 
@@ -39,21 +40,23 @@ const communityAdmin = () => {
 
   scene.command('/setlanguage', async (ctx: CommunityContext) => {
     try {
-      const [, language] = ctx.message!.text.trim().split(' ');
-      const lang = language?.toLowerCase();
-      
-      // Check if language is valid
-      const validLanguages = ['en', 'es', 'fr', 'de', 'it', 'pt', 'ru', 'uk', 'ko', 'fa'];
-      if (!lang || !validLanguages.includes(lang)) {
+      const [, maybeLanguage] = ctx.message!.text.split(' ');
+      if (!maybeLanguage || maybeLanguage.trim() === '') {
         return ctx.reply(ctx.i18n.t('wizard_community_invalid_language'));
       }
-      
+
+      const language = maybeLanguage.trim().toLowerCase();
+      if (!isValidLanguage(language)) {
+        return ctx.reply(ctx.i18n.t('wizard_community_invalid_language'));
+      }
+
       const { community } = ctx.scene.state as any;
-      community.language = lang;
+      community.language = language;
       await community.save();
-      await ctx.reply(ctx.i18n.t('community_language_updated', { language: lang }));
+      await ctx.reply(ctx.i18n.t('community_language_updated', { language }));
       CommunityEvents.communityUpdated(community);
     } catch (err) {
+      console.error('setlanguage error:', err);
       return ctx.reply(ctx.i18n.t('generic_error'));
     }
   });

bot/modules/community/scenes.ts

@@ -12,6 +12,7 @@ import {
 } from './messages';
 import { CommunityContext } from './communityContext';
 import * as commAdmin from './scenes.communityAdmin';
+import { isValidLanguage } from '../../../util/languages';
 
 const CURRENCIES = parseInt(process.env.COMMUNITY_CURRENCIES || '10');
 
@@ -165,10 +166,8 @@ const createCommunitySteps = {
 
       ctx.wizard.state.error = null;
       const lang = text.trim().toLowerCase();
-      
-      // Check if language is valid
-      const validLanguages = ['en', 'es', 'fr', 'de', 'it', 'pt', 'ru', 'uk', 'ko', 'fa'];
-      if (!validLanguages.includes(lang)) {
+
+      if (!isValidLanguage(lang)) {
         ctx.telegram.deleteMessage(ctx.chat!.id, ctx.message!.message_id);
         ctx.wizard.state.error = ctx.i18n.t('wizard_community_invalid_language');
         return await ctx.wizard.state.updateUI();
@@ -896,13 +895,11 @@ export const updateLanguageCommunityWizard = new Scenes.WizardScene(
       if (ctx.message === undefined) return ctx.scene.leave();
 
       const lang = ctx.message.text.trim().toLowerCase();
-      // Check if language is valid
-      const validLanguages = ['en', 'es', 'fr', 'de', 'it', 'pt', 'ru', 'uk', 'ko', 'fa'];
-      if (!validLanguages.includes(lang)) {
+      if (!isValidLanguage(lang)) {
         ctx.deleteMessage();
         return await ctx.reply(ctx.i18n.t('wizard_community_invalid_language'));
       }
-      
+
       const { community } = ctx.wizard.state;
       community.language = lang;
       await community.save();

bot/ordersActions.ts

@@ -15,9 +15,11 @@ import { UserDocument } from '../models/user';
 import { HasTelegram, MainContext } from './start';
 import { IOrder } from '../models/order';
 import { IFiat } from '../util/fiatModel';
+
 import * as OrderEvents from './modules/events/orders';
 
 const { ObjectId } = require('mongoose').Types;
+const { I18n } = require('@grammyjs/i18n');
 
 interface CreateOrderArguments {
   type: string;
@@ -84,7 +86,6 @@ const createOrder = async (
 
       // Get community language for description
       if (community.language) {
-        const { I18n } = require('@grammyjs/i18n');
         descriptionI18n = new I18n({
           defaultLanguageOnMissing: true,
           locale: community.language,

locales/de.yaml

@@ -585,8 +585,8 @@ community_admin_help: |
   /setlanguage <lang> - Configure community's language for published messages.
 community_npub_updated: You added the community's pubkey ${npub} successfully!
 community_language_updated: You updated the community's language to ${language} successfully!
-wizard_community_enter_language: Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)
-wizard_community_invalid_language: Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa
+wizard_community_enter_language: 'Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)'
+wizard_community_invalid_language: 'Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa'
 # END modules/community
 
 # START modules/orders

locales/en.yaml

@@ -574,8 +574,8 @@ community_admin_help: |
   /setlanguage <lang> - Configure community's language for published messages.
 community_npub_updated: You added the community's pubkey ${npub} successfully!
 community_language_updated: You updated the community's language to ${language} successfully!
-wizard_community_enter_language: Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)
-wizard_community_invalid_language: Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa
+wizard_community_enter_language: 'Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)'
+wizard_community_invalid_language: 'Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa'
 language: Language
 # END modules/community
 

locales/es.yaml

@@ -569,8 +569,8 @@ community_admin_help: |
   /setlanguage <lang> - Configura el idioma de la comunidad para los mensajes publicados.
 community_npub_updated: Has configurado la pubkey ${npub} de la comunidad exitosamente!
 community_language_updated: Has configurado el idioma ${language} de la comunidad exitosamente!
-wizard_community_enter_language: Ingresa el idioma de la comunidad, ej: es, en, pt, fr, de, it, etc.
-wizard_community_invalid_language: El idioma debe ser uno de los siguientes: es, en, pt, fr, de, it, etc.
+wizard_community_enter_language: 'Ingresa el idioma de la comunidad, ej: es, en, pt, fr, de, it, etc.'
+wizard_community_invalid_language: 'El idioma debe ser uno de los siguientes: es, en, pt, fr, de, it, etc.'
 # END modules/community
 
 # START modules/nostr

locales/fa.yaml

@@ -567,8 +567,8 @@ community_admin_help: |
   /setnpub <npub> - کلید عمومی جامعه را پیکربندی کنید. رویدادهای ناستر با این کلید عمومی برچسب‌گذاری می‌شوند.
   /setlanguage <lang> - Configure community's language for published messages.
 community_language_updated: You updated the community's language to ${language} successfully!
-wizard_community_enter_language: Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)
-wizard_community_invalid_language: Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa
+wizard_community_enter_language: 'Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)'
+wizard_community_invalid_language: 'Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa'
 community_npub_updated: شما کلیدعمومی کامیونیتی ${npub} را با موفقیت اضافه کردید!
 # END modules/community
 

locales/fr.yaml

@@ -566,8 +566,8 @@ community_admin_help: |
   /setnpub <npub> - Configurer la clé publique de la communauté.
   /setlanguage <lang> - Configurer la langue de la communauté pour les messages publiés.
 community_language_updated: Vous avez configuré la langue de la communauté en ${language} avec succès !
-wizard_community_enter_language: Entrez le code de la langue de votre communauté (en, es, fr, de, it, pt, ru, uk, ko, fa)
-wizard_community_invalid_language: Code de langue invalide. Veuillez entrer l'un des suivants - en, es, fr, de, it, pt, ru, uk, ko, fa
+wizard_community_enter_language: 'Entrez le code de la langue de votre communauté (en, es, fr, de, it, pt, ru, uk, ko, fa)'
+wizard_community_invalid_language: "Code de langue invalide. Veuillez entrer l'un des suivants - en, es, fr, de, it, pt, ru, uk, ko, fa"
 community_npub_updated: Vous avez ajouté la clé publique de la communauté ${npub} avec succès !
 # END modules/community
 

locales/it.yaml

@@ -581,8 +581,8 @@ community_admin_help: |
   /setnpub <npub> - Configure community's public key.
   /setlanguage <lang> - Configure community's language for published messages.
 community_language_updated: You updated the community's language to ${language} successfully!
-wizard_community_enter_language: Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)
-wizard_community_invalid_language: Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa
+wizard_community_enter_language: 'Enter the language code for your community (en, es, fr, de, it, pt, ru, uk, ko, fa)'
+wizard_community_invalid_language: 'Invalid language code. Please enter one of the following - en, es, fr, de, it, pt, ru, uk, ko, fa'
 community_npub_updated: You added the community's pubkey ${npub} successfully!
 # END modules/community