Restore_Admin_Panel_And_Fix_Language_Logic

src/controllers/userController.js

@@ -21,9 +21,9 @@ exports.start = (ctx, text) => {
         buttons = [
             [btn(i18n.btn_catalog, "🛍 Katalog"), btn(i18n.btn_search, "🔎 Qidiruv")],
             [btn(i18n.btn_orders, "📦 Buyurtmalarim"), btn(i18n.btn_cart, "🛒 Savat")],
+            ["👨‍💼 Admin Panel", btn(i18n.btn_contact, "📞 Aloqa")], // JOINED
             [btn(i18n.btn_channel, "📢 Kanal"), btn(i18n.btn_group, "👥 Guruh")],
-            [btn(i18n.btn_contact, "📞 Aloqa"), btn(i18n.btn_lang, "🌍 Til")],
-            [btn(i18n.btn_invite, "👥 Taklif")]
+            [btn(i18n.btn_invite, "👥 Taklif"), btn(i18n.btn_lang, "🌍 Til")]
         ];
     } else {
         buttons = [

src/main.js

@@ -104,16 +104,27 @@ bot.start(async (ctx) => {
     try {
         const user = ctx.from;
         let dbUser = await User.findOne({ id: user.id });
+
+        // Handle Referral
+        const payload = ctx.startPayload;
+
         if (!dbUser) {
-            dbUser = await new User({
+            // NEW USER: Create with null language to force selection
+            dbUser = new User({
                 id: user.id,
                 first_name: user.first_name,
-                username: user.username
-            }).save();
+                username: user.username,
+                language: null // Explicitly null
+            });
+            await dbUser.save();
+
+            // If referral exists, handle it
+            if (payload && payload !== user.id.toString()) {
+                userController.handleReferral(ctx, payload);
+            }
         }
 
-        // Language Check inside Start
-        // Even if middleware didn't catch it (because isStart was true), we must prompt it here.
+        // FORCE LANGUAGE SELECTION IF NULL
         if (!dbUser.language) {
             return ctx.reply("🇺🇿 Iltimos, tilni tanlang:\n🇷🇺 Пожалуйста, выберите язык:\n🇬🇧 Please select a language:", Markup.inlineKeyboard([
                 [Markup.button.callback("🇺🇿 O'zbekcha", "set_lang_uz")],
@@ -122,11 +133,11 @@ bot.start(async (ctx) => {
             ]));
         }
 
-        // Attach locale manually for this request if it wasn't attached by middleware (rare case but safe)
+        // If language exists, proceed to menu
+        // Attach locale using the user's language
         const locales = require('./locales');
         ctx.i18n = locales[dbUser.language] || locales.uz;
 
-        // Pass control to controller
         userController.start(ctx);
     } catch (err) {
         console.error(err);