Fix_Invalid_Trigger_Error_In_Match_Function

src/bot.js

@@ -206,8 +206,12 @@ bot.action('change_lang', (ctx) => {
 
 // User Interactions
 // User Interactions
-const locales = require('./locales');
-const match = (key) => [locales.uz[key], locales.ru[key], locales.en[key]];
+// Match Helper to get keywords from all languages
+const match = (key) => {
+    const locales = require('./locales');
+    const triggers = Object.values(locales).map(l => l[key]).filter(v => v); // Filter out undefined/null
+    return triggers.length > 0 ? triggers : [new RegExp(`^${key}$`)]; // Fallback if empty (shouldn't happen)
+};
 
 bot.hears(match('btn_catalog'), (ctx) => userController.showCategories(ctx));
 bot.hears(match('btn_cart'), (ctx) => userController.showCart(ctx));
@@ -221,194 +225,179 @@ bot.hears("👨‍💼 Admin Panel", (ctx) => {
 
 bot.hears(match('btn_contact'), (ctx) => {
     ctx.reply(ctx.i18n.contact_info, Markup.inlineKeyboard([
-        [Markup.button.url("📦 Mahsulotlar bo'yicha Admin", "https://t.me/isfandiyor_3")],
-        [Markup.button.url("🤖 Bot bo'yicha Admin", "https://t.me/IBROHM_7")]
-    ]));
-});
-
-bot.hears(match('btn_channel'), (ctx) => {
-    ctx.reply(ctx.i18n.btn_channel, Markup.inlineKeyboard([
-        [Markup.button.url("📢 Kanalga o'tish", "https://t.me/Pc_Store_Market")]
-    ]));
-});
-
-bot.hears(match('btn_group'), (ctx) => {
-    ctx.reply(ctx.i18n.btn_group, Markup.inlineKeyboard([
-        [Markup.button.url("👥 Guruhga o'tish", "https://t.me/Pc_Store_Market1")]
-    ]));
-});
-
-bot.hears(match('btn_invite'), (ctx) => userController.inviteFriends(ctx));
-bot.hears(match('btn_settings'), (ctx) => userController.settings(ctx));
-bot.hears(match('btn_back'), (ctx) => userController.start(ctx));
-
-// Language Change Button Handler
-bot.hears(match('btn_lang'), (ctx) => {
-    ctx.reply("🇺🇿 Iltimos, tilni tanlang:\n🇷🇺 Пожалуйста, выберите язык:\n🇬🇧 Please select a language:", Markup.inlineKeyboard([
-        [Markup.button.callback("🇺🇿 O'zbekcha", "set_lang_uz")],
-        [Markup.button.callback("🇷🇺 Русский", "set_lang_ru")],
-        [Markup.button.callback("🇬🇧 English", "set_lang_en")]
-    ]));
-});
-
-// Handle /start with Payload
-bot.start((ctx) => {
-    // Check for payload
-    const payload = ctx.startPayload; // Telegraf extracts this automatically "start 123" -> "123"
-
-    // Register User logic here (or ensure it's done) - Middlewares usually trigger first, ensuring user exists.
-    // Pass payload to controller
-    if (payload) {
-        userController.handleReferral(ctx, payload);
-    }
-
-    const user = ctx.from;
-    const welcomeText = `👋 <b>Assalomu alaykum, ${user.first_name}!</b>\n\n💻 <b>PC Store</b> botiga xush kelibsiz!\nSifati va halolligi kafolatlangan texnikalar makoni.\n\n👇 <i>Quyidagi bo'limlardan birini tanlang:</i>`;
-    userController.start(ctx, welcomeText);
-});
-
-bot.hears("🔎 Qidiruv", (ctx) => userController.startSearch(ctx));
-bot.hears("📦 Buyurtmalarim", (ctx) => userController.showOrderHistory(ctx));
-bot.hears("⚙️ Sozlamalar", (ctx) => userController.settings(ctx));
-
-bot.action("set_name", (ctx) => {
-    ctx.deleteMessage();
-    userController.changeName(ctx);
-});
-
-
-// Handle Category Selection
-bot.action(/cat_(.+)/, async (ctx) => {
-    const catId = ctx.match[1];
-    const Category = require('./models/Category');
-    const userController = require('./controllers/userController');
-
-    // Check if this category has subcategories
-    const subCount = await Category.countDocuments({ parent: catId });
-
-    if (subCount > 0) {
-        // Show Subcategories
-        return userController.showSubCategories(ctx, catId);
-    } else {
-        // Show Products (Leaf Category)
-        return userController.showProducts(ctx, catId);
-    }
-});
-
-// Carousel Navigation
-// Carousel Navigation (New)
-bot.action(/br_(.+)_(.+)_(.+)/, (ctx) => {
-    // pattern: br_catId_prodIndex_mediaIndex
-    const catId = "cat_" + ctx.match[1];
-    const prodIndex = parseInt(ctx.match[2]);
-    const mediaIndex = parseInt(ctx.match[3]);
-    userController.browseCategory(ctx, catId, prodIndex, mediaIndex);
-});
-
-// Backward compatibility or redirect
-bot.action(/browse_(.+)_(.+)/, (ctx) => {
-    const catId = "cat_" + ctx.match[1];
-    const index = parseInt(ctx.match[2]);
-    userController.browseCategory(ctx, catId, index, 0);
-});
-
-bot.action(/rate_ask_(.+)/, (ctx) => userController.askRating(ctx, ctx.match[1]));
-bot.action(/rate_save_(.+)_(.+)/, (ctx) => userController.saveRating(ctx, ctx.match[1], ctx.match[2]));
-
-bot.action("back_to_cats", (ctx) => {
-    ctx.deleteMessage();
-    userController.showCategories(ctx);
-});
-
-bot.action("noop", (ctx) => ctx.answerCbQuery()); // Do nothing for page counter
-
-bot.action(/prod_(.+)/, (ctx) => {
-    ctx.answerCbQuery();
-    userController.showProduct(ctx, ctx.match[1]);
-});
-
-bot.action(/add_cart_(.+)/, (ctx) => {
-    userController.addToCart(ctx, ctx.match[1]);
-});
-
-bot.action("clear_cart", (ctx) => userController.clearCart(ctx));
-bot.action(/remove_item_(.+)/, (ctx) => userController.removeItem(ctx, parseInt(ctx.match[1])));
-
-bot.action("checkout", (ctx) => {
-    ctx.answerCbQuery();
-    ctx.deleteMessage(); // Clear cart message
-    ctx.scene.enter('CHECKOUT_SCENE');
-});
-
-bot.action("my_orders_list", (ctx) => {
-    ctx.deleteMessage();
-    userController.showOrderHistory(ctx);
-});
-
-bot.action("back_to_menu", (ctx) => {
-    ctx.deleteMessage();
-    ctx.reply("Asosiy menyu:", Markup.keyboard(userController.getMenuButtons(ctx)).resize());
-    // Wait, getMenuButtons is not exported or defined nicely. userController.start(ctx) sends the menu.
-    // Let's just call userController.start(ctx);
-    userController.start(ctx);
-});
-
-bot.action(/my_order_(.+)/, (ctx) => userController.showOrderDetails(ctx, ctx.match[1]));
-
-// Handle Text (Search & Settings)
-// This MUST be the last text handler
-bot.on('text', async (ctx, next) => {
-    // 1. Check Search
-    let isHandled = await userController.handleSearch(ctx);
-    if (isHandled) return;
+        bot.hears(match('btn_invite'), (ctx) => userController.inviteFriends(ctx));
+    bot.hears(match('btn_settings'), (ctx) => userController.settings(ctx));
+    bot.hears(match('btn_back'), (ctx) => userController.start(ctx));
+
+    // Language Change Button Handler
+    // We need to ensure 'btn_lang' exists in ALL locales or filter(Boolean) handles it.
+    // In locales.js we added 'btn_lang' to all 3 languages.
+    bot.hears(match('btn_lang'), (ctx) => {
+        ctx.reply("🇺🇿 Iltimos, tilni tanlang:\n🇷🇺 Пожалуйста, выберите язык:\n🇬🇧 Please select a language:", Markup.inlineKeyboard([
+            [Markup.button.callback("🇺🇿 O'zbekcha", "set_lang_uz")],
+            [Markup.button.callback("🇷🇺 Русский", "set_lang_ru")],
+            [Markup.button.callback("🇬🇧 English", "set_lang_en")]
+        ]));
+    });
+
+    // Handle /start with Payload
+    bot.start((ctx) => {
+        // Check for payload
+        const payload = ctx.startPayload; // Telegraf extracts this automatically "start 123" -> "123"
+
+        // Register User logic here (or ensure it's done) - Middlewares usually trigger first, ensuring user exists.
+        // Pass payload to controller
+        if (payload) {
+            userController.handleReferral(ctx, payload);
+        }
 
-    // 2. Check Name Change
-    isHandled = await userController.handleNameChange(ctx);
-    if (isHandled) return;
+        const user = ctx.from;
+        const welcomeText = `👋 <b>Assalomu alaykum, ${user.first_name}!</b>\n\n💻 <b>PC Store</b> botiga xush kelibsiz!\nSifati va halolligi kafolatlangan texnikalar makoni.\n\n👇 <i>Quyidagi bo'limlardan birini tanlang:</i>`;
+        userController.start(ctx, welcomeText);
+    });
+
+    bot.hears("🔎 Qidiruv", (ctx) => userController.startSearch(ctx));
+    bot.hears("📦 Buyurtmalarim", (ctx) => userController.showOrderHistory(ctx));
+    bot.hears("⚙️ Sozlamalar", (ctx) => userController.settings(ctx));
+
+    bot.action("set_name", (ctx) => {
+        ctx.deleteMessage();
+        userController.changeName(ctx);
+    });
+
+
+    // Handle Category Selection
+    bot.action(/cat_(.+)/, async (ctx) => {
+        const catId = ctx.match[1];
+        const Category = require('./models/Category');
+        const userController = require('./controllers/userController');
+
+        // Check if this category has subcategories
+        const subCount = await Category.countDocuments({ parent: catId });
+
+        if (subCount > 0) {
+            // Show Subcategories
+            return userController.showSubCategories(ctx, catId);
+        } else {
+            // Show Products (Leaf Category)
+            return userController.showProducts(ctx, catId);
+        }
+    });
+
+    // Carousel Navigation
+    // Carousel Navigation (New)
+    bot.action(/br_(.+)_(.+)_(.+)/, (ctx) => {
+        // pattern: br_catId_prodIndex_mediaIndex
+        const catId = "cat_" + ctx.match[1];
+        const prodIndex = parseInt(ctx.match[2]);
+        const mediaIndex = parseInt(ctx.match[3]);
+        userController.browseCategory(ctx, catId, prodIndex, mediaIndex);
+    });
+
+    // Backward compatibility or redirect
+    bot.action(/browse_(.+)_(.+)/, (ctx) => {
+        const catId = "cat_" + ctx.match[1];
+        const index = parseInt(ctx.match[2]);
+        userController.browseCategory(ctx, catId, index, 0);
+    });
+
+    bot.action(/rate_ask_(.+)/, (ctx) => userController.askRating(ctx, ctx.match[1]));
+    bot.action(/rate_save_(.+)_(.+)/, (ctx) => userController.saveRating(ctx, ctx.match[1], ctx.match[2]));
+
+    bot.action("back_to_cats", (ctx) => {
+        ctx.deleteMessage();
+        userController.showCategories(ctx);
+    });
+
+    bot.action("noop", (ctx) => ctx.answerCbQuery()); // Do nothing for page counter
+
+    bot.action(/prod_(.+)/, (ctx) => {
+        ctx.answerCbQuery();
+        userController.showProduct(ctx, ctx.match[1]);
+    });
+
+    bot.action(/add_cart_(.+)/, (ctx) => {
+        userController.addToCart(ctx, ctx.match[1]);
+    });
+
+    bot.action("clear_cart", (ctx) => userController.clearCart(ctx));
+    bot.action(/remove_item_(.+)/, (ctx) => userController.removeItem(ctx, parseInt(ctx.match[1])));
+
+    bot.action("checkout", (ctx) => {
+        ctx.answerCbQuery();
+        ctx.deleteMessage(); // Clear cart message
+        ctx.scene.enter('CHECKOUT_SCENE');
+    });
+
+    bot.action("my_orders_list", (ctx) => {
+        ctx.deleteMessage();
+        userController.showOrderHistory(ctx);
+    });
+
+    bot.action("back_to_menu", (ctx) => {
+        ctx.deleteMessage();
+        ctx.reply("Asosiy menyu:", Markup.keyboard(userController.getMenuButtons(ctx)).resize());
+        // Wait, getMenuButtons is not exported or defined nicely. userController.start(ctx) sends the menu.
+        // Let's just call userController.start(ctx);
+        userController.start(ctx);
+    });
 
-    return next();
-});
+    bot.action(/my_order_(.+)/, (ctx) => userController.showOrderDetails(ctx, ctx.match[1]));
 
+    // Handle Text (Search & Settings)
+    // This MUST be the last text handler
+    bot.on('text', async (ctx, next) => {
+        // 1. Check Search
+        let isHandled = await userController.handleSearch(ctx);
+        if (isHandled) return;
 
-// Launch with Retry Logic and DNS Check
-// const dns = require('dns'); // Already imported at the top
+        // 2. Check Name Change
+        isHandled = await userController.handleNameChange(ctx);
+        if (isHandled) return;
 
-const launchBot = async () => {
-    try {
-        // Clear any stuck webhooks
-        await bot.telegram.deleteWebhook({ drop_pending_updates: true });
-        console.log('🔄 Webhook tozalandi...');
-
-        await bot.launch({
-            dropPendingUpdates: true
-        });
-        console.log('✅ Bot muvaffaqiyatli ishga tushdi!');
-    } catch (err) {
-        console.error('Botni ishga tushirishda xatolik:', err);
-        if (err.description && err.description.includes('Conflict')) {
-            console.warn("⚠️ DIQQAT: Botni boshqa joyda (masalan, kompyuteringizda terminalda) o'chirishingiz kerak! Serverda ikkita bot bitta token bilan ishlayapti.");
+        return next();
+    });
+
+
+    // Launch with Retry Logic and DNS Check
+    // const dns = require('dns'); // Already imported at the top
+
+    const launchBot = async () => {
+        try {
+            // Clear any stuck webhooks
+            await bot.telegram.deleteWebhook({ drop_pending_updates: true });
+            console.log('🔄 Webhook tozalandi...');
+
+            await bot.launch({
+                dropPendingUpdates: true
+            });
+            console.log('✅ Bot muvaffaqiyatli ishga tushdi!');
+        } catch (err) {
+            console.error('Botni ishga tushirishda xatolik:', err);
+            if (err.description && err.description.includes('Conflict')) {
+                console.warn("⚠️ DIQQAT: Botni boshqa joyda (masalan, kompyuteringizda terminalda) o'chirishingiz kerak! Serverda ikkita bot bitta token bilan ishlayapti.");
+            }
+            console.log('5 soniyadan keyin qayta urunib ko\'ramiz...');
+            setTimeout(launchBot, 5000); // Retry after 5 seconds
         }
-        console.log('5 soniyadan keyin qayta urunib ko\'ramiz...');
-        setTimeout(launchBot, 5000); // Retry after 5 seconds
-    }
-};
-
-launchBot();
-
-// Enable graceful stop
-process.once('SIGINT', () => bot.stop('SIGINT'));
-process.once('SIGTERM', () => bot.stop('SIGTERM'));
-
-// Add HTTP Server for Hugging Face Spaces (Health Check)
-const http = require('http');
-const PORT = process.env.PORT || 7860;
-http.createServer((req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/plain' });
-    res.write('Bot is running!');
-    res.end();
-}).listen(PORT, () => {
-    console.log(`Server listening on port ${PORT}`);
-});
-
-module.exports = bot;
+    };
+
+    launchBot();
+
+    // Enable graceful stop
+    process.once('SIGINT', () => bot.stop('SIGINT'));
+    process.once('SIGTERM', () => bot.stop('SIGTERM'));
+
+    // Add HTTP Server for Hugging Face Spaces (Health Check)
+    const http = require('http');
+    const PORT = process.env.PORT || 7860;
+    http.createServer((req, res) => {
+        res.writeHead(200, { 'Content-Type': 'text/plain' });
+        res.write('Bot is running!');
+        res.end();
+    }).listen(PORT, () => {
+        console.log(`Server listening on port ${PORT}`);
+    });
+
+    module.exports = bot;