djs-builder 0.6.401 → 0.7.0

package/function/giveaway.js

@@ -9,6 +9,7 @@ const giveawaySchema = new Schema({
   hoster: { type: String, required: true },
   endEmbed: { type: Object, required: true },
   winnerCount: { type: Number, default: 1 },
+  prize: { type: String, required: true },
   winners: Array,
   paused: { type: Boolean, default: false },
   pausedTime: Array,
@@ -19,6 +20,7 @@ const giveawaySchema = new Schema({
     enum: ["reaction", "button"],
     default: "reaction",
   },
+  requiredRoles: { type: [String], default: [] },
 
   users: { type: [String], default: [] },
 });
@@ -32,6 +34,7 @@ async function Gstart({
   endTime: endTime,
   winers: winnerCount,
   channelId: channelId,
+  prize: prize,
   embed: {
     custom: Scustom = false,
     title: Stitle = false,
@@ -53,13 +56,15 @@ async function Gstart({
     emoji: emoji = false,
     label: label = false,
     style: style = false,
-    id : id = false
+    id: id = false,
   },
+  requirements: { requiredRoles: requiredRoles = [] } = {},
 }) {
   if (!winnerCount) winnerCount = 1;
   if (!endTime) return { error: "End time is required." };
   if (!channelId) return { error: "Channel ID is required." };
   if (!context) return { error: "Context is required." };
+  if (!prize) return { error: "Prize is required." };
 
   if (type === "reaction" && !emoji) return { error: "Emoji is not required." };
 
@@ -91,11 +96,20 @@ async function Gstart({
     if (Sthumbnail) embed.setThumbnail(Sthumbnail);
   }
 
+  let requirementsText = "";
+  if (requiredRoles.length > 0) {
+    requirementsText = `\n- Required Roles: ${requiredRoles
+      .map((r) => `<@&${r}>`)
+      .join(", ")}`;
+  }
+
   embed.addFields({
     name: "🎉 Giveaway",
-    value: `- Winer(s) : ${winnerCount}\n- Time : <t:${Math.floor(
+    value: `- Prize: ${prize}\n- Winner(s) : ${winnerCount}\n- Time : <t:${Math.floor(
       endTime / 1000
-    )}:R>\n- Hosted By : ${context.user ? context.user : context.author}`,
+    )}:R>\n- Hosted By : ${
+      context.user ? context.user : context.author
+    }${requirementsText}`,
     inline: true,
   });
 
@@ -124,7 +138,7 @@ async function Gstart({
 
     end_embed.addFields({
       name: "🎉 Giveaway",
-      value: `- Winer(s): ${winnerCount}\n- Time : <t:${Math.floor(
+      value: `- Prize: ${prize}\n- Winner(s): ${winnerCount}\n- Time : <t:${Math.floor(
         endTime / 1000
       )}:R>\n- Hosted By : ${context.user ? context.user : context.author}`,
       inline: true,
@@ -136,6 +150,7 @@ async function Gstart({
       messageId: message.id,
       hoster: context.user ? context.user.id : context.author.id,
       endTime: endTime,
+      prize: prize,
       endType: false,
       paused: false,
       pausedTime: [],
@@ -145,6 +160,7 @@ async function Gstart({
       reaction: type,
       endEmbed: end_embed.toJSON(),
       users: [],
+      requiredRoles: requiredRoles,
     });
 
     if (type === "reaction") message.react(emoji);
@@ -293,6 +309,7 @@ async function Glist(type) {
 
   const list = giveaways.map((g) => {
     return {
+      prize: g.prize,
       messageId: g.messageId,
       guildId: g.guildId,
       channelId: g.channelId,
@@ -328,7 +345,7 @@ async function Gpause(client, messageId) {
 
   message.embeds[0].data.fields.find(
     (f) => f.name === "🎉 Giveaway"
-  ).value = `- Winer(s): ${g.winnerCount}\n- Time : Pause ⏸️\n- Hosted By : <@${g.hoster}>`;
+  ).value = `- Winner(s): ${g.winnerCount}\n- Time : Pause ⏸️\n- Hosted By : <@${g.hoster}>`;
 
   await message.edit({ embeds: [message.embeds[0]] });
   await giveaway.findOneAndUpdate(
@@ -343,7 +360,7 @@ async function Gresume(client, messageId) {
   const g = await giveaway.findOne({ messageId });
   if (!g) return { error: "❌ Giveaway Data Not Found" };
 
-  if (g.paused === true) return { error: "❌ Giveaway Already Paused" };
+  if (g.paused === false) return { error: "❌ Giveaway Already Paused" };
   if (g.ended === true) return { error: "❌ Giveaway Already Ended" };
 
   const guild = await client.guilds.cache.get(g.guildId);
@@ -356,7 +373,7 @@ async function Gresume(client, messageId) {
 
   message.embeds[0].data.fields.find(
     (f) => f.name === "🎉 Giveaway"
-  ).value = `- Winer(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
+  ).value = `- Winner(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
     time / 1000
   )}:R>\n- Hosted By : <@${g.hoster}>`;
 
@@ -386,13 +403,32 @@ async function Gdelete(messageId) {
 }
 
 ////////////////////////////////////* Giveaway Add User
-async function GaddUser(messageId, userId) {
+async function GaddUser(messageId, userId, guild) {
   const g = await giveaway.findOne({ messageId });
   if (!g) return { error: "❌ Giveaway Data Not Found" };
 
+  if (g.ended) return { error: "❌ Giveaway Already Ended" };
+
   const all_users = g.users || [];
   if (all_users.includes(userId)) return { error: "❌ User Already Joined" };
 
+  if (g.requiredRoles && g.requiredRoles.length > 0) {
+    if (!guild) return { error: "❌ Guild object is required to check roles." };
+    const member = await guild.members.fetch(userId).catch(() => null);
+    if (!member) return { error: "❌ Member not found in guild." };
+
+    const hasRole = g.requiredRoles.some((roleId) =>
+      member.roles.cache.has(roleId)
+    );
+    if (!hasRole) {
+      return {
+        error: `❌ You need one of the following roles to join: ${g.requiredRoles
+          .map((r) => `<@&${r}>`)
+          .join(", ")}`,
+      };
+    }
+  }
+
   if (!all_users.includes(userId)) {
     all_users.push(userId);
     await giveaway.findOneAndUpdate({ messageId }, { users: all_users });
@@ -434,7 +470,7 @@ async function GaddTime(messageId, client, time) {
 
   message.embeds[0].data.fields.find(
     (f) => f.name === "🎉 Giveaway"
-  ).value = `- Winer(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
+  ).value = `- Winner(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
     finel_time / 1000
   )}:R>\n- Hosted By : <@${g.hoster}>`;
 
@@ -466,7 +502,7 @@ async function GremoveTime(messageId, client, time) {
 
   message.embeds[0].data.fields.find(
     (f) => f.name === "🎉 Giveaway"
-  ).value = `- Winer(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
+  ).value = `- Winner(s): ${g.winnerCount}\n- Time : <t:${Math.floor(
     finel_time / 1000
   )}:R>\n- Hosted By : <@${g.hoster}>`;
 
@@ -487,6 +523,7 @@ async function Gdata(messageId) {
 }
 
 module.exports = {
+  giveaway,
   Gstart,
   Gcheck,
   Greroll,

package/handler/starter.js

@@ -150,7 +150,13 @@ async function starter(client, options) {
   const events = options.events || null;
   const anticrash = options.anticrash || null;
   const terminal = options.terminal || null;
+  const dashboard = options.dashboard || null;
 
+  //////////////////////////////////////////? Dashboard Loader ////////////////////////////////////////////////////////
+  if (dashboard) {
+    await dashboard(client, dashboard);
+  }
+  //////////////////////////////////////////! terminal info !////////////////////////////////////////////////////////
   if (terminal) {
     console.log("🚀 Bot is starting...");
   }
@@ -260,12 +266,13 @@ async function starter(client, options) {
     if (command.guildOnly && !message.guild) return;
     if (command.dmOnly && message.guild) return;
     if (command.devOnly && message.author.id !== client.owner.id) return;
-    if (
-      command.ownerOnly &&
-      message.guild &&
-      message.author.id !== (await message.guild.fetchOwner()).id
-    )
-      return;
+    if (command.ownerOnly) {
+      if (
+        message.guild &&
+        message.author.id !== (await message.guild.fetchOwner()).id
+      )
+        return;
+    }
 
     if (
       command.Permissions &&
@@ -274,11 +281,13 @@ async function starter(client, options) {
     )
       return;
 
-
-          if(command.Blacklist) {
-
-      const userBlacklisted = await isBlacklisted(message.guild ? message.guild.id : null, 'user', message.author.id);
-      if(userBlacklisted) {
+    if (command.Blacklist) {
+      const userBlacklisted = await isBlacklisted(
+        message.guild ? message.guild.id : null,
+        "user",
+        message.author.id
+      );
+      if (userBlacklisted) {
         return message.reply({
           content: "`❌` You are blacklisted from using bot commands.",
           flags: 64,
@@ -287,23 +296,33 @@ async function starter(client, options) {
 
       let roleBlacklist = null;
       for (const [id, role] of message.member.roles.cache) {
-        const isBlocked = await isBlacklisted(message.guild ? message.guild.id : null, 'role', id);
+        const isBlocked = await isBlacklisted(
+          message.guild ? message.guild.id : null,
+          "role",
+          id
+        );
         if (isBlocked) {
           roleBlacklist = isBlocked;
           break;
         }
       }
-      
-      if(roleBlacklist) {
+
+      if (roleBlacklist) {
         const role = message.guild.roles.cache.get(roleBlacklist.id);
         return message.reply({
-          content: `\`❌\` The role **${role ? role.name : 'Unknown'}** is blacklisted from using bot commands.`,
+          content: `\`❌\` The role **${
+            role ? role.name : "Unknown"
+          }** is blacklisted from using bot commands.`,
           flags: 64,
         });
       }
 
-      const channelBlacklist = await isBlacklisted(message.guild ? message.guild.id : null, 'channel', message.channel.id);
-      if(channelBlacklist) {
+      const channelBlacklist = await isBlacklisted(
+        message.guild ? message.guild.id : null,
+        "channel",
+        message.channel.id
+      );
+      if (channelBlacklist) {
         return message.reply({
           content: "`❌` This channel is blacklisted from using bot commands.",
           flags: 64,
@@ -346,15 +365,15 @@ async function starter(client, options) {
       if (cooldown.type) return interaction.reply(cooldown.text);
     }
 
-    if (
-      command.ownerOnly &&
-      interaction.guild &&
-      interaction.user.id !== (await interaction.guild.fetchOwner()).id
-    ) {
-      return interaction.reply({
-        content: "`❌` This command is restricted to the server owner only!",
-        flags: 64,
-      });
+    if (command.ownerOnly) {
+      if (
+        interaction.guild &&
+        interaction.user.id !== (await interaction.guild.fetchOwner()).id
+      )
+        return interaction.reply({
+          content: "`❌` This command is restricted to the server owner only!",
+          flags: 64,
+        });
     }
 
     if (command.devOnly && interaction.user.id !== client.owner.id) {
@@ -386,15 +405,19 @@ async function starter(client, options) {
       )
     ) {
       return interaction.reply({
-        content: "`❌` You do not have enough permissions to execute this command.",
+        content:
+          "`❌` You do not have enough permissions to execute this command.",
         flags: 64,
       });
     }
 
-    if(command.Blacklist) {
-
-      const userBlacklisted = await isBlacklisted(interaction.guild ? interaction.guild.id : null, 'user', interaction.user.id);
-      if(userBlacklisted) {
+    if (command.Blacklist) {
+      const userBlacklisted = await isBlacklisted(
+        interaction.guild ? interaction.guild.id : null,
+        "user",
+        interaction.user.id
+      );
+      if (userBlacklisted) {
         return interaction.reply({
           content: "`❌` You are blacklisted from using bot commands.",
           flags: 64,
@@ -403,23 +426,33 @@ async function starter(client, options) {
 
       let roleBlacklist = null;
       for (const [id, role] of interaction.member.roles.cache) {
-        const isBlocked = await isBlacklisted(interaction.guild ? interaction.guild.id : null, 'role', id);
+        const isBlocked = await isBlacklisted(
+          interaction.guild ? interaction.guild.id : null,
+          "role",
+          id
+        );
         if (isBlocked) {
           roleBlacklist = isBlocked;
           break;
         }
       }
 
-      if(roleBlacklist) {
+      if (roleBlacklist) {
         const role = interaction.guild.roles.cache.get(roleBlacklist.id);
         return interaction.reply({
-          content: `\`❌\` The role **${role ? role.name : 'Unknown'}** is blacklisted from using bot commands.`,
+          content: `\`❌\` The role **${
+            role ? role.name : "Unknown"
+          }** is blacklisted from using bot commands.`,
           flags: 64,
         });
       }
 
-      const channelBlacklist = await isBlacklisted(interaction.guild ? interaction.guild.id : null, 'channel', interaction.channel.id);
-      if(channelBlacklist) {
+      const channelBlacklist = await isBlacklisted(
+        interaction.guild ? interaction.guild.id : null,
+        "channel",
+        interaction.channel.id
+      );
+      if (channelBlacklist) {
         return interaction.reply({
           content: "`❌` This channel is blacklisted from using bot commands.",
           flags: 64,
@@ -483,12 +516,13 @@ async function starter(client, options) {
 const { Wait, CreateBar, CreateRow, GetUser } = require("../function/function");
 const { Level, addXP, UserLevel, leaderboard } = require("../function/level");
 const { log } = require("../function/log");
+const { dashboard } = require("../function/dash");
 const {
   Blacklist,
   isBlacklisted,
   addToBlacklist,
   removeFromBlacklist,
-  getBlacklist
+  getBlacklist,
 } = require("../function/blacklist");
 const {
   giveaway,
@@ -510,6 +544,7 @@ module.exports = {
   Level,
   giveaway,
   starter,
+  dashboard,
   reload,
   log,
   Wait,
@@ -535,5 +570,5 @@ module.exports = {
   isBlacklisted,
   addToBlacklist,
   removeFromBlacklist,
-  getBlacklist
+  getBlacklist,
 };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "djs-builder",
-  "version": "0.6.401",
-  "note": "🎉 Package Update! 🥏\n\n- 📚 Documentation: Added full guide for Giveaway System & Hot Reloading.\n- 🐛 Bug Fixes: Fixed critical issue in Giveaway winner selection.\n\n🔗 Learn more on [NPM](https://www.npmjs.com/package/djs-builder)",
-  "description": "🎉 Package Update! 🥏",
+  "version": "0.7.0",
+  "note": "🎉 Package Update! 🥏\n\n- 🌐 NEW: Dashboard System - Modern web-based control panel!\n  • Discord OAuth2 Login\n  • Server Management\n  • Level System Control\n  • Giveaway Management\n  • Blacklist Management\n- � Documentation: Full Dashboard guide added to README.\n- ✨ Standalone Usage: Use Dashboard with or without Starter!\n\n🔗 Learn more on [NPM](https://www.npmjs.com/package/djs-builder)",
+  "description": "🎉 NEW: Dashboard System - Web Control Panel! 🌐",
   "main": "handler/starter.js",
   "dependencies": {
     "axios": "^1.11.0",
@@ -10,6 +10,11 @@
     "cli-table3": "^0.6.5",
     "discord-inviter": "^0.9.3",
     "discord.js": "^14.21.0",
-    "mongoose": "^8.18.0"
+    "mongoose": "^8.18.0",
+    "express": "^4.18.2",
+    "express-session": "^1.17.3",
+    "passport": "^0.7.0",
+    "passport-discord": "^0.1.4",
+    "ejs": "^3.1.9"
   }
 }

package/views/404.ejs

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="ar" dir="rtl">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>404 - الصفحة غير موجودة</title>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/remixicon@3.5.0/fonts/remixicon.css" rel="stylesheet">
+  <style>
+    :root { --bg-primary: #0f0f0f; --bg-secondary: #1a1a1a; --bg-card: #242424; --accent: #5865F2; --accent-hover: #4752C4; --text-primary: #fff; --text-secondary: #b9bbbe; --text-muted: #72767d; --border: #2f2f2f; --radius: 12px; --radius-sm: 8px; }
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+    body { font-family: 'Inter', sans-serif; background: var(--bg-primary); color: var(--text-primary); min-height: 100vh; display: flex; align-items: center; justify-content: center; }
+    .error-container { text-align: center; padding: 40px; max-width: 500px; }
+    .error-code { font-size: 120px; font-weight: 700; color: var(--accent); line-height: 1; margin-bottom: 16px; text-shadow: 0 0 60px rgba(88, 101, 242, 0.3); }
+    .error-icon { font-size: 64px; color: var(--text-muted); margin-bottom: 24px; }
+    .error-title { font-size: 28px; font-weight: 600; margin-bottom: 12px; }
+    .error-desc { font-size: 16px; color: var(--text-secondary); margin-bottom: 32px; line-height: 1.6; }
+    .btn { display: inline-flex; align-items: center; gap: 8px; padding: 12px 24px; border-radius: var(--radius-sm); font-weight: 500; font-size: 15px; transition: all 0.2s ease; text-decoration: none; }
+    .btn-primary { background: var(--accent); color: white; }
+    .btn-primary:hover { background: var(--accent-hover); transform: translateY(-2px); }
+    .btn-secondary { background: var(--bg-card); color: var(--text-primary); border: 1px solid var(--border); margin-right: 12px; }
+    .btn-secondary:hover { background: var(--bg-secondary); }
+    .buttons { display: flex; justify-content: center; gap: 12px; flex-wrap: wrap; }
+    @keyframes float { 0%, 100% { transform: translateY(0); } 50% { transform: translateY(-10px); } }
+    .error-icon { animation: float 3s ease-in-out infinite; }
+  </style>
+</head>
+<body>
+  <div class="error-container">
+    <div class="error-code">404</div>
+    <i class="ri-compass-discover-line error-icon"></i>
+    <h1 class="error-title">الصفحة غير موجودة</h1>
+    <p class="error-desc">عذراً، الصفحة التي تبحث عنها غير موجودة أو تم نقلها. تأكد من صحة الرابط أو عد للصفحة الرئيسية.</p>
+    <div class="buttons">
+      <a href="/" class="btn btn-primary"><i class="ri-home-line"></i> الصفحة الرئيسية</a>
+      <a href="/dashboard" class="btn btn-secondary"><i class="ri-dashboard-line"></i> لوحة التحكم</a>
+    </div>
+  </div>
+</body>
+</html>