djs-builder 0.7.9 → 0.7.10

package/README.md

@@ -481,9 +481,9 @@ const modal = CreateModal({
       },
     },
     {
-      type: "label",
+      type: "text",
       components: {
-        label: "Thank you for your input!",
+        content: "Thank you for your input!",
       },
     },
   ],
@@ -526,6 +526,8 @@ await interaction.showModal(modal);
     type: "string",
     options: {
       id: "country",
+      mine_label: "Choose Your Country", // Label displayed above the menu
+      mine_description: "Please select your country from the list below", // Optional description
       placeholder: "Select your country",
       min: 1,
       max: 1,
@@ -571,9 +573,9 @@ await interaction.showModal(modal);
 
 ```js
 {
-  type: "label",
+  type: "text",
   components: {
-    label: "Please fill out the form above.",
+    content: "Please fill out the form above.",
   },
 },
 ```
@@ -598,6 +600,8 @@ Same as CreateRow select menus.
 
 - `type` → `"string" | "user" | "role" | "channel"`
 - `id` → customId for menu
+- `mine_label` → Label displayed above the menu component (defaults to "Select an option")
+- `mine_description` → Description text displayed below the menu label (optional)
 - `placeholder` → Text shown before selection
 - `min` / `max` → Min/Max selectable values
 - `data` → Options array (for string select only)
@@ -622,9 +626,9 @@ Same as CreateRow select menus.
 - `label` → Label
 - `description` → Description
 
-#### 🔹 Label
+#### 🔹 text
 
-- `label` → Text to display
+- `content` → Text to display
 
 ---
 

package/function/dash.js

@@ -12,8 +12,20 @@ const DiscordStrategy = require("passport-discord").Strategy;
 const path = require("path");
 const Table = require("cli-table3");
 const chalk = require("chalk");
-
-const { Level } = require("./level");
+const mongoose = require("mongoose");
+
+const { 
+  Level, 
+  levelGuild,
+  resetUser, 
+  xpNeeded, 
+  calculateLevel, 
+  getUserRank,
+  getGuildConfig,
+  updateGuildConfig,
+  deleteGuildConfig,
+  clearConfigCache,
+} = require("./level");
 const {
   Blacklist,
   addToBlacklist,
@@ -94,6 +106,7 @@ function dashboard(client, options) {
     res.locals.user = req.user || null;
     res.locals.client = client;
     res.locals.path = req.path;
+    res.locals.dashboardEnabled = options.Dashboard !== false; // الإعداد من الكود
     next();
   });
 
@@ -255,25 +268,91 @@ function dashboard(client, options) {
     const guild = client.guilds.cache.get(req.params.guildId);
     if (!guild) return res.redirect("/dashboard");
 
+    const mongoConnected = mongoose.connection.readyState === 1;
+    let levelConfigDb = null;
+    let configSource = null;
+    let databaseEnabled = false; // Only true if guild uses Dashboard mode in setLevel
+
+    // Check if modifying via dashboard is allowed
+    const canModify = options.Dashboard !== false;
+
+    // Check if guild uses Dashboard mode (Dashboard: true in setLevel)
+    const usesDashboardMode = client.levelDashboardGuilds && client.levelDashboardGuilds.has(guild.id);
+
+    // Get guild config from database
+    if (mongoConnected) {
+      try {
+        levelConfigDb = await getGuildConfig(guild.id);
+        if (levelConfigDb && usesDashboardMode) {
+          configSource = "database";
+          databaseEnabled = true; // Config exists AND guild uses Dashboard mode
+        }
+      } catch (e) {
+        console.error("Error fetching level config:", e);
+      }
+    }
+
     let leaderboardData = [];
     if (Level) {
       try {
-        leaderboardData = await Level.find({ guildId: guild.id })
+        const rawLeaderboard = await Level.find({ guildId: guild.id })
           .sort({ totalXP: -1 })
           .limit(100);
+          
+        // Fetch members to ensure they are in cache/get real data
+        const memberIds = rawLeaderboard.map(u => u.userId);
+        const fetchedMembers = await guild.members.fetch({ user: memberIds }).catch(() => new Map());
+          
+        leaderboardData = rawLeaderboard.map(u => {
+          const member = fetchedMembers.get(u.userId) || guild.members.cache.get(u.userId);
+          return {
+            userId: u.userId,
+            totalXP: u.totalXP,
+            level: u.level,
+            username: member ? member.user.username : `User ${u.userId.substring(0, 5)}`,
+            avatar: member ? member.user.displayAvatarURL({ size: 64, forceStatic: true }) : `https://cdn.discordapp.com/embed/avatars/${Math.floor(Math.random() * 6)}.png`,
+          };
+        });
       } catch (e) {
         console.error("Error fetching levels:", e);
       }
     }
 
+    // Get guild roles for role rewards
+    const roles = guild.roles.cache
+      .filter((r) => r.id !== guild.id && !r.managed)
+      .map((r) => ({ id: r.id, name: r.name, color: r.hexColor }))
+      .sort((a, b) => a.name.localeCompare(b.name));
+
+    // Get guild channels for level up messages
+    const channels = guild.channels.cache
+      .filter((c) => c.type === 0)
+      .map((c) => ({ id: c.id, name: c.name }))
+      .sort((a, b) => a.name.localeCompare(b.name));
+
     res.render("levels", {
       guild,
       leaderboard: leaderboardData,
       page: "levels",
       botStats: getBotStats(),
+      databaseEnabled,
+      mongoConnected,
+      configSource,
+      levelConfigDb,
+      roles,
+      channels,
+      canModify,
     });
   });
 
+  // Middleware للتحقق من إمكانية التعديل عبر الداش بورد
+  function canModifySettings(req, res, next) {
+    if (options.Dashboard === false) {
+      return res.status(403).json({ success: false, error: "تم تعطيل التعديل من الداش بورد في ملف الإعدادات الرئيسي للبوت." });
+    }
+    next();
+  }
+
   // API للحصول على بيانات مستخدم
   app.get("/api/:guildId/user/:userId", isAuthenticated, async (req, res) => {
     if (!Level) return res.json({ error: "Level system not available" });
@@ -487,7 +566,7 @@ function dashboard(client, options) {
   });
 
   // API - تحديث القناة الافتراضية
-  app.post("/api/:guildId/logs/channel", isAuthenticated, async (req, res) => {
+  app.post("/api/:guildId/logs/channel", isAuthenticated, canModifySettings, async (req, res) => {
     const logData = getLogConfigData();
     if (!logData.databaseEnabled)
       return res.json({ error: "يجب تفعيل وضع Database لتعديل الإعدادات" });
@@ -510,7 +589,7 @@ function dashboard(client, options) {
   });
 
   // API - تفعيل/تعطيل حدث
-  app.post("/api/:guildId/logs/toggle", isAuthenticated, async (req, res) => {
+  app.post("/api/:guildId/logs/toggle", isAuthenticated, canModifySettings, async (req, res) => {
     const logData = getLogConfigData();
     if (!logData.databaseEnabled)
       return res.json({ error: "يجب تفعيل وضع Database لتعديل الإعدادات" });
@@ -544,7 +623,7 @@ function dashboard(client, options) {
   });
 
   // API - تحديث إعدادات حدث معين
-  app.post("/api/:guildId/logs/event", isAuthenticated, async (req, res) => {
+  app.post("/api/:guildId/logs/event", isAuthenticated, canModifySettings, async (req, res) => {
     const logData = getLogConfigData();
     if (!logData.databaseEnabled)
       return res.json({ error: "يجب تفعيل وضع Database لتعديل الإعدادات" });
@@ -593,7 +672,7 @@ function dashboard(client, options) {
   });
 
   // API - إعادة تعيين إعدادات السجلات
-  app.post("/api/:guildId/logs/reset", isAuthenticated, async (req, res) => {
+  app.post("/api/:guildId/logs/reset", isAuthenticated, canModifySettings, async (req, res) => {
     const logData = getLogConfigData();
     if (!logData.databaseEnabled)
       return res.json({ error: "يجب تفعيل وضع Database لتعديل الإعدادات" });
@@ -787,66 +866,238 @@ function dashboard(client, options) {
 
   // ==================== API للمستويات ====================
   // تحديث مستوى مستخدم
-  app.post("/api/:guildId/level/update", isAuthenticated, async (req, res) => {
+  app.post("/api/:guildId/level/update", isAuthenticated, canModifySettings, async (req, res) => {
     const { userId, xp, level } = req.body;
     const guildId = req.params.guildId;
 
     try {
-      if (Level) {
+      if (!Level) return res.json({ error: "Level system not available" });
+      
+      if (level !== undefined) {
+        // تعيين المستوى مباشرة
+        const config = await getGuildConfig(guildId);
+        const totalXP = xpNeeded(level - 1, config || {});
         await Level.findOneAndUpdate(
-          { guildId, userId },
-          { totalXP: xp, level, $setOnInsert: { text: 0, voice: 0 } },
+          { userId, guildId },
+          { userId, guildId, level, totalXP },
+          { upsert: true, new: true }
+        );
+      } else if (xp !== undefined) {
+        // تعيين XP مباشرة
+        const config = await getGuildConfig(guildId);
+        const newLevel = calculateLevel(xp, config || {});
+        await Level.findOneAndUpdate(
+          { userId, guildId },
+          { userId, guildId, totalXP: xp, level: newLevel },
           { upsert: true, new: true }
         );
-        return res.json({ success: true });
       }
-      res.json({ error: "Level system not available" });
+      return res.json({ success: true });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // تعيين مستوى مستخدم مباشرة
+  app.post("/api/:guildId/level/set", isAuthenticated, canModifySettings, async (req, res) => {
+    const { userId, level } = req.body;
+    const guildId = req.params.guildId;
+
+    try {
+      if (!Level) return res.json({ error: "Level system not available" });
+      const config = await getGuildConfig(guildId);
+      const totalXP = xpNeeded(level - 1, config || {});
+      await Level.findOneAndUpdate(
+        { userId, guildId },
+        { userId, guildId, level, totalXP },
+        { upsert: true, new: true }
+      );
+      return res.json({ success: true });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // تعيين XP مستخدم مباشرة
+  app.post("/api/:guildId/level/setxp", isAuthenticated, canModifySettings, async (req, res) => {
+    const { userId, xp } = req.body;
+    const guildId = req.params.guildId;
+
+    try {
+      if (!Level) return res.json({ error: "Level system not available" });
+      const config = await getGuildConfig(guildId);
+      const level = calculateLevel(xp, config || {});
+      await Level.findOneAndUpdate(
+        { userId, guildId },
+        { userId, guildId, totalXP: xp, level },
+        { upsert: true, new: true }
+      );
+      return res.json({ success: true });
     } catch (e) {
       res.json({ success: false, error: e.message });
     }
   });
 
   // إضافة XP لمستخدم
-  app.post("/api/:guildId/level/add", isAuthenticated, async (req, res) => {
-    const { userId, xp, level } = req.body;
+  app.post("/api/:guildId/level/add", isAuthenticated, canModifySettings, async (req, res) => {
+    const { userId, xp } = req.body;
     const guildId = req.params.guildId;
 
     try {
-      if (Level) {
-        const existing = await Level.findOne({ guildId, userId });
-        if (existing) {
-          existing.totalXP += xp;
-          if (level > 0) existing.level = level;
-          await existing.save();
-        } else {
-          await Level.create({
-            guildId,
-            userId,
-            totalXP: xp,
-            level: level || 0,
-            text: 0,
-            voice: 0,
-          });
-        }
-        return res.json({ success: true });
+      if (!Level) return res.json({ error: "Level system not available" });
+      
+      const config = await getGuildConfig(guildId);
+      const existing = await Level.findOne({ guildId, userId });
+      if (existing) {
+        existing.totalXP += xp;
+        existing.level = calculateLevel(existing.totalXP, config || {});
+        await existing.save();
+      } else {
+        await Level.create({
+          guildId,
+          userId,
+          totalXP: xp,
+          level: calculateLevel(xp, config || {}),
+          text: xp,
+        });
       }
-      res.json({ error: "Level system not available" });
+      return res.json({ success: true });
     } catch (e) {
       res.json({ success: false, error: e.message });
     }
   });
 
-  // إعادة تعيين مستوى مستخدم
-  app.post("/api/:guildId/level/reset", isAuthenticated, async (req, res) => {
+  // إعادة تعيين مستوى مستخدم (استخدام resetUser)
+  app.post("/api/:guildId/level/reset", isAuthenticated, canModifySettings, async (req, res) => {
     const { userId } = req.body;
     const guildId = req.params.guildId;
 
     try {
-      if (Level) {
-        await Level.deleteOne({ guildId, userId });
-        return res.json({ success: true });
+      if (!Level) return res.json({ error: "Level system not available" });
+      await resetUser(userId, guildId);
+      return res.json({ success: true });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // الحصول على ترتيب مستخدم
+  app.get("/api/:guildId/level/rank/:userId", isAuthenticated, async (req, res) => {
+    const { guildId, userId } = req.params;
+
+    try {
+      if (!Level) return res.json({ error: "Level system not available" });
+      const rank = await getUserRank(userId, guildId);
+      const userData = await Level.findOne({ guildId, userId });
+      res.json({ 
+        rank, 
+        level: userData?.level || 0,
+        totalXP: userData?.totalXP || 0,
+        xpForNext: xpNeeded((userData?.level || 0) + 1)
+      });
+    } catch (e) {
+      res.json({ error: e.message });
+    }
+  });
+
+  // ==================== API إعدادات Level System ====================
+  
+  // الحصول على إعدادات السيرفر
+  app.get("/api/:guildId/level/config", isAuthenticated, async (req, res) => {
+    try {
+      const config = await getGuildConfig(req.params.guildId);
+      const usesDashboardMode = client.levelDashboardGuilds && client.levelDashboardGuilds.has(req.params.guildId);
+      res.json({ databaseEnabled: usesDashboardMode, config: config || null });
+    } catch (e) {
+      res.json({ error: e.message });
+    }
+  });
+
+  // إضافة/تعديل Role Reward
+  app.post("/api/:guildId/level/config/role", isAuthenticated, canModifySettings, async (req, res) => {
+    const { level, roleId } = req.body;
+    const guildId = req.params.guildId;
+
+    try {
+      const config = await getGuildConfig(guildId) || {};
+      const roleReward = config.roleReward || {};
+      
+      if (roleId) {
+        roleReward[level] = roleId;
+      } else {
+        delete roleReward[level];
+      }
+      
+      await updateGuildConfig(guildId, { roleReward });
+      res.json({ success: true, roleReward });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // تحديث إعدادات XP
+  app.post("/api/:guildId/level/config/xp", isAuthenticated, canModifySettings, async (req, res) => {
+    const { minXP, maxXP, xpMultiplier, maxLevel, cooldown, leveling } = req.body;
+    const guildId = req.params.guildId;
+
+    try {
+      const updates = {};
+      if (minXP !== undefined) updates.minXP = minXP;
+      if (maxXP !== undefined) updates.maxXP = maxXP;
+      if (xpMultiplier !== undefined) updates.xpMultiplier = xpMultiplier;
+      if (maxLevel !== undefined) updates.maxLevel = maxLevel;
+      if (cooldown !== undefined) updates.cooldown = cooldown;
+      if (leveling !== undefined) updates.leveling = leveling;
+      
+      await updateGuildConfig(guildId, updates);
+      res.json({ success: true });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // إضافة/إزالة قناة من Blacklist
+  app.post("/api/:guildId/level/config/blacklist", isAuthenticated, canModifySettings, async (req, res) => {
+    const { channelId, action } = req.body; // action: "add" | "remove"
+    const guildId = req.params.guildId;
+
+    try {
+      const config = await getGuildConfig(guildId) || {};
+      let blacklistedChannels = config.blacklistedChannels || [];
+      
+      if (action === "add" && !blacklistedChannels.includes(channelId)) {
+        blacklistedChannels.push(channelId);
+      } else if (action === "remove") {
+        blacklistedChannels = blacklistedChannels.filter(id => id !== channelId);
       }
-      res.json({ error: "Level system not available" });
+      
+      await updateGuildConfig(guildId, { blacklistedChannels });
+      res.json({ success: true, blacklistedChannels });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // تفعيل/تعطيل نظام Level للسيرفر
+  app.post("/api/:guildId/level/config/toggle", isAuthenticated, canModifySettings, async (req, res) => {
+    const { disabled } = req.body;
+    const guildId = req.params.guildId;
+
+    try {
+      await updateGuildConfig(guildId, { disabled: !!disabled });
+      res.json({ success: true });
+    } catch (e) {
+      res.json({ success: false, error: e.message });
+    }
+  });
+
+  // إعادة تعيين إعدادات السيرفر
+  app.post("/api/:guildId/level/config/reset", isAuthenticated, canModifySettings, async (req, res) => {
+    const guildId = req.params.guildId;
+
+    try {
+      await deleteGuildConfig(guildId);
+      res.json({ success: true });
     } catch (e) {
       res.json({ success: false, error: e.message });
     }

package/function/function.js

@@ -158,7 +158,7 @@ function CreateRow(components, rowOnly = false) {
     throw new Error("Components should be an array.");
   }
 
-  const actionRows = [];
+  let actionRows = [];
 
   components.forEach((component) => {
     if (!component.type) {
@@ -225,7 +225,7 @@ function CreateRow(components, rowOnly = false) {
           description: item[description]?.slice(0, 100) || undefined,
           emoji: item[emoji] || undefined,
           value: item[value] || `${index}`,
-          default: item.default || false, // جديد
+          default: item.default || false,
         }));
         selectMenu.addOptions(selectOptions);
       }
@@ -235,10 +235,13 @@ function CreateRow(components, rowOnly = false) {
       }
 
       if (defaultValues && Array.isArray(defaultValues)) {
-        let ty , all = [];
+        let ty,
+          all = [];
         if (type === "user") ty = selectMenu.setDefaultUsers(...defaultValues);
-        else if (type === "role") ty = selectMenu.setDefaultRoles(...defaultValues);
-        else if (type === "channel") ty = selectMenu.setDefaultChannels(...defaultValues);
+        else if (type === "role")
+          ty = selectMenu.setDefaultRoles(...defaultValues);
+        else if (type === "channel")
+          ty = selectMenu.setDefaultChannels(...defaultValues);
         for (const val of defaultValues) {
           all.push({ type: ty, id: val });
         }
@@ -248,11 +251,11 @@ function CreateRow(components, rowOnly = false) {
         selectMenu.setDisabled(options.disabled);
       }
 
-
       if (rowOnly) {
-        return selectMenu;
+        actionRows = selectMenu;
+      } else {
+        actionRows.push(new ActionRowBuilder().addComponents(selectMenu));
       }
-      actionRows.push(new ActionRowBuilder().addComponents(selectMenu));
     } else {
       throw new Error("Invalid component format");
     }
@@ -281,10 +284,8 @@ async function CreateModal(options) {
           required,
           value,
         } = component;
-        const input = new TextInputBuilder()
-          .setCustomId(id)
-          .setPlaceholder(placeholder)
-          .setStyle(style);
+        const input = new TextInputBuilder().setCustomId(id).setStyle(style);
+        if (placeholder) input.setPlaceholder(placeholder);
         if (required !== undefined) input.setRequired(required);
         if (minLength) input.setMinLength(minLength);
         if (maxLength) input.setMaxLength(maxLength);
@@ -299,17 +300,30 @@ async function CreateModal(options) {
     } else if (com.type === "menu") {
       const { type, options } = com.components;
 
+      const selectMenu = await CreateRow(
+        [
+          {
+            type: type,
+            options: options,
+          },
+        ],
+        true,
+      );
 
- const selectMenu = await CreateRow([
-  {
-    type: type,
-    options: options
-  }
- ], true)
-
-      const menu = new LabelBuilder()
-        .setLabel( options.mine_label || "Select an option")
-        .setStringSelectMenuComponent(selectMenu);
+      const menu = new LabelBuilder().setLabel(
+        options.mine_label || "Select an option",
+      );
+      if (type === "string") {
+        menu.setStringSelectMenuComponent(selectMenu);
+      } else if (type === "user") {
+        menu.setUserSelectMenuComponent(selectMenu);
+      } else if (type === "role") {
+        menu.setRoleSelectMenuComponent(selectMenu);
+      } else if (type === "channel") {
+        menu.setChannelSelectMenuComponent(selectMenu);
+      }
+      if (options.mine_description)
+        menu.setDescription(options.mine_description);
 
       modal.addLabelComponents(menu);
     } else if (com.type === "file") {
@@ -318,13 +332,13 @@ async function CreateModal(options) {
       const fileUpload = new LabelBuilder().setLabel(label);
       if (description) fileUpload.setDescription(description);
       fileUpload.setFileUploadComponent(
-        new FileUploadBuilder().setCustomId(id)
+        new FileUploadBuilder().setCustomId(id),
       );
 
       modal.addLabelComponents(fileUpload);
-    } else if (com.type === "label") {
-      const { label } = com.components;
-      const text = new TextDisplayBuilder().setContent(label);
+    } else if (com.type === "text") {
+      const { content } = com.components;
+      const text = new TextDisplayBuilder().setContent(content);
 
       modal.addTextDisplayComponents(text);
     }
@@ -353,7 +367,7 @@ async function CreateComponents(type, components) {
       }
     } else if (item.type === "separator") {
       const separator = new SeparatorBuilder().setDivider(
-        item.divider || false
+        item.divider || false,
       );
       if (item.spacing) separator.setSpacing(item.spacing);
 
@@ -389,10 +403,7 @@ async function CreateComponents(type, components) {
         result.push(file);
       }
     } else if (item.type === "button") {
-
-const but = await CreateRow([
-  item.components
-])
+      const but = await CreateRow([item.components]);
       if (type === "container") {
         result.addActionRowComponents(but);
       } else {
@@ -401,13 +412,13 @@ const but = await CreateRow([
     } else if (item.type === "menu") {
       const menu_type = item.components.type;
       const options = item.components.options;
-      
-const menu = await CreateRow([
-{
-  type: menu_type,
-  options: options
-}
-])
+
+      const menu = await CreateRow([
+        {
+          type: menu_type,
+          options: options,
+        },
+      ]);
       if (type === "container") {
         result.addActionRowComponents(menu);
       } else {
@@ -418,7 +429,7 @@ const menu = await CreateRow([
 
       if (item.content) {
         section.addTextDisplayComponents(
-          new TextDisplayBuilder().setContent(item.content)
+          new TextDisplayBuilder().setContent(item.content),
         );
       }