add loop, and add categories to all commands

commands/ai/chat.js

@@ -12,6 +12,8 @@ module.exports = {
         .setDescription("Your message to the AI")
         .setRequired(true)
     ),
+  category: "AI",
+
   async execute(interaction) {
     await interaction.deferReply(); // Defer initial response
 

commands/core/help.js

@@ -8,6 +8,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("help")
     .setDescription("Lists all available commands"),
+  category: "Core",
 
   async execute(interaction, client) {
     try {
@@ -16,16 +17,19 @@ module.exports = {
       );
 
       const serverName = interaction.guild.name;
-      const generalCommands = [];
-      const modCommands = [];
 
-      // Categorize commands
+      // Group commands by category
+      const categories = {};
       client.commands.forEach((command) => {
+        const category = command.category || "Uncategorized"; // Default to "Uncategorized"
+        if (!categories[category]) {
+          categories[category] = [];
+        }
+
         const commandLine = `/${command.data.name} - ${command.data.description}`;
-        if (!command.isModOnly) {
+        // Check if command is mod-only and user has permissions
-          generalCommands.push(commandLine);
+        if (!command.isModOnly || (command.isModOnly && isMod)) {
-        } else if (isMod) {
+          categories[category].push(commandLine);
-          modCommands.push(`${commandLine} (Mods only)`);
         }
       });
 
@@ -43,47 +47,37 @@ module.exports = {
 
       // Function to split commands into fields under 1024 characters
       const addCommandFields = (embed, commands, title) => {
+        if (commands.length === 0) return;
+
         let commandChunk = "";
         let chunkCount = 1;
 
         commands.forEach((command) => {
-          // Check if adding this command will exceed the 1024 character limit
+          if ((commandChunk + command + "\n").length > 1024) {
-          if ((commandChunk + command).length > 1024) {
-            // Add current chunk as a new field
             embed.addFields({
               name: `${title} (Part ${chunkCount})`,
               value: commandChunk,
             });
-            commandChunk = ""; // Reset chunk for new field
+            commandChunk = "";
             chunkCount += 1;
           }
-          // Append command to the current chunk
           commandChunk += command + "\n";
         });
 
-        // Add any remaining commands in the last chunk
         if (commandChunk) {
           embed.addFields({
-            name: `${title} (Part ${chunkCount})`,
+            name: chunkCount > 1 ? `${title} (Part ${chunkCount})` : title,
             value: commandChunk,
           });
         }
       };
 
-      // Add general commands in fields
+      // Add commands for each category
-      if (generalCommands.length > 0) {
+      for (const [categoryName, commands] of Object.entries(categories)) {
-        addCommandFields(helpEmbed, generalCommands, "General Commands");
+        addCommandFields(helpEmbed, commands, `${categoryName} Commands`);
       }
 
-      // Add mod-only commands in fields, if user is a mod
+      await interaction.reply({ embeds: [helpEmbed] });
-      if (isMod && modCommands.length > 0) {
-        addCommandFields(helpEmbed, modCommands, "Mod-Only Commands");
-      }
-
-      // Send the single embed
-      await interaction.reply({
-        embeds: [helpEmbed],
-      });
     } catch (error) {
       console.error("Error executing the help command:", error);
       await interaction.reply({

commands/core/invite.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("invite")
     .setDescription("Provides an invite link to add the bot to your server."),
+  category: "Core",
 
   async execute(interaction, client) {
     try {

commands/core/ping.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("ping")
     .setDescription("Replies with Pong! and bot latency"),
+  category: "Core",
 
   async execute(interaction, client) {
     try {

commands/core/uptime.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("uptime")
     .setDescription("Shows how long the bot has been running"),
+  category: "Core",
 
   async execute(interaction, client) {
     try {

commands/economy/balance.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("balance")
     .setDescription("Check your balance."),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/daily.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("daily")
     .setDescription("Claim your daily reward and start a streak!"),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/inventory.js

@@ -6,6 +6,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("inventory")
     .setDescription("View your inventory with item rarity"),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/sell.js

@@ -12,6 +12,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("sell")
     .setDescription("Sell an item from your inventory."),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/shop.js

@@ -13,6 +13,7 @@ module.exports = {
         .setDescription("The item you want to buy (use item name)")
         .setRequired(false)
     ),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/trade.js

@@ -31,6 +31,7 @@ module.exports = {
         .setDescription("Amount of coins to trade")
         .setRequired(false)
     ),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/economy/work.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("work")
     .setDescription("Work to earn coins and experience random events!"),
+  category: "Economy",
 
   async execute(interaction) {
     const { user, guild } = interaction;

commands/events/createEvent.js

@@ -60,6 +60,8 @@ module.exports = {
           { name: "Monthly", value: "monthly" }
         )
     ),
+  category: "Events",
+
   async execute(interaction) {
     const name = interaction.options.getString("name");
     const description = interaction.options.getString("description");

commands/events/editEvent.js

@@ -55,6 +55,7 @@ module.exports = {
           { name: "Monthly", value: "monthly" }
         )
     ),
+  category: "Events",
 
   async execute(interaction) {
     const name = interaction.options.getString("name");

commands/events/joinEvent.js

@@ -13,6 +13,7 @@ module.exports = {
         .setDescription("Name of the event to join")
         .setRequired(true)
     ),
+  category: "Events",
 
   async execute(interaction) {
     const eventName = interaction.options.getString("event_name");

commands/events/leaveEvent.js

@@ -12,6 +12,7 @@ module.exports = {
         .setDescription("Name of the event to leave")
         .setRequired(true)
     ),
+  category: "Events",
 
   async execute(interaction) {
     const eventName = interaction.options.getString("event_name");

commands/events/listEvents.js

@@ -6,6 +6,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("listevents")
     .setDescription("List all upcoming events."),
+  category: "Events",
 
   async execute(interaction) {
     const { user } = interaction;

commands/fun/bored.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("bored")
     .setDescription("Get a random activity to do."),
+  category: "Fun",
 
   async execute(interaction) {
     try {

commands/fun/purr.js

@@ -49,6 +49,7 @@ module.exports = {
         )
         .setRequired(false)
     ),
+  category: "Fun",
 
   async execute(interaction) {
     const category = interaction.options.getString("category");

commands/fun/randomfact.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("randomfact")
     .setDescription("Get a random fun fact"),
+  category: "Fun",
 
   async execute(interaction) {
     try {

commands/fun/uwu.js

@@ -11,6 +11,8 @@ module.exports = {
         .setDescription("The text to uwufy")
         .setRequired(true)
     ),
+  category: "Fun",
+
   async execute(interaction) {
     const inputText = interaction.options.getString("text");
 

commands/games/coin-flip.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("coinflip")
     .setDescription("Flip a coin!"),
+  category: "Games",
 
   async execute(interaction) {
     const result = Math.random() < 0.5 ? "Heads" : "Tails";

commands/games/dice-roll.js

@@ -12,6 +12,7 @@ module.exports = {
         .setMinValue(2)
         .setMaxValue(100)
     ),
+  category: "Games",
 
   async execute(interaction) {
     const sides = interaction.options.getInteger("sides") || 6;

commands/games/rock-paper-scissors.js

@@ -15,6 +15,7 @@ module.exports = {
           { name: "Scissors", value: "scissors" }
         )
     ),
+  category: "Games",
 
   async execute(interaction) {
     const userChoice = interaction.options.getString("choice");

commands/games/scramble.js

@@ -102,6 +102,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("scramble")
     .setDescription("Play a word scramble game"),
+  category: "Games",
 
   async execute(interaction) {
     const userId = interaction.user.id;

commands/games/spyfall.js

@@ -13,6 +13,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("spyfall")
     .setDescription("Start a game of Spyfall."),
+  category: "Games",
 
   async execute(interaction) {
     const guildId = interaction.guild.id;

commands/games/stopspyfall.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("stopspyfall")
     .setDescription("Stop the current Spyfall game in this server."),
+  category: "Games",
 
   async execute(interaction) {
     try {

commands/games/trivia.js

@@ -293,6 +293,7 @@ module.exports = {
           }))
         )
     ),
+  category: "Games",
 
   async execute(interaction, client) {
     const userId = interaction.user.id;

commands/general/dictionary.js

@@ -26,6 +26,8 @@ module.exports = {
         .setDescription("Whether the response should be ephemeral")
         .setRequired(false)
     ),
+  category: "General",
+
   async execute(interaction) {
     const word = interaction.options.getString("word").toLowerCase();
     const isEphemeral = interaction.options.getBoolean("ephemeral") || false;

commands/general/thisDayInHistory.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("thisdayinhistory")
     .setDescription("Shows historical events that happened on this day."),
+  category: "General",
 
   async execute(interaction) {
     try {

commands/general/urbanDictionary.js

@@ -12,6 +12,8 @@ module.exports = {
         .setDescription("The term to look up")
         .setRequired(true)
     ),
+  category: "General",
+
   async execute(interaction, client) {
     const term = interaction.options.getString("term").toLowerCase();
     const guild = interaction.guild;

commands/general/wordassociation.js

@@ -83,6 +83,7 @@ module.exports = {
         .setDescription("The word to find associations for")
         .setRequired(true)
     ),
+  category: "General",
 
   async execute(interaction) {
     const word = interaction.options.getString("word");

commands/information/botinfo.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("botinfo")
     .setDescription("Displays information about the bot"),
+  category: "Information",
 
   async execute(interaction, client) {
     try {

commands/information/serverinfo.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("serverinfo")
     .setDescription("Displays information about the server"),
+  category: "Information",
 
   async execute(interaction) {
     try {

commands/minecraft/whitelist.js

@@ -12,6 +12,7 @@ module.exports = {
         .setRequired(true)
     ),
   isModOnly: true,
+  category: "Minecraft",
 
   async execute(interaction) {
     const username = interaction.options.getString("username");

commands/moderation/Servers.js

@@ -9,6 +9,7 @@ module.exports = {
     .setName("servers")
     .setDescription("Displays a list of servers the bot is currently in"),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/moderation/actionItems.js

@@ -15,6 +15,7 @@ module.exports = {
         )
         .setRequired(true)
     ),
+  category: "Moderation",
 
   async execute(interaction) {
     const serverSettings = await ServerSettings.findOne({

commands/moderation/ban.js

@@ -19,6 +19,7 @@ module.exports = {
         .setRequired(true)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     let replySent = false;

commands/moderation/clearLeaderboard.js

@@ -6,6 +6,7 @@ module.exports = {
     .setName("clearleaderboard")
     .setDescription("Clears all entries in the trivia leaderboard"),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/moderation/kick.js

@@ -22,6 +22,7 @@ module.exports = {
         .setRequired(true)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/moderation/purge.js

@@ -27,6 +27,7 @@ module.exports = {
         .setMaxValue(100)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/moderation/serverSettings.js

@@ -11,6 +11,7 @@ module.exports = {
     .setDescription("Displays the current server settings"),
 
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     let replySent = false;

commands/moderation/setup.js

@@ -51,6 +51,7 @@ module.exports = {
         )
         .setRequired(false)
     ),
+  category: "Moderation",
 
   async execute(interaction) {
     // Check if the user has admin permissions

commands/moderation/timeout.js

@@ -28,6 +28,7 @@ module.exports = {
         .setRequired(true)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     let replySent = false;

commands/moderation/userinfo.js

@@ -15,6 +15,7 @@ module.exports = {
         .setRequired(false)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/moderation/warn.js

@@ -22,6 +22,7 @@ module.exports = {
         .setRequired(true)
     ),
   isModOnly: true,
+  category: "Moderation",
 
   async execute(interaction) {
     try {

commands/music/loop.js

@@ -0,0 +1,71 @@
+const { SlashCommandBuilder, EmbedBuilder } = require("discord.js");
+
+module.exports = {
+  data: new SlashCommandBuilder()
+    .setName("loop")
+    .setDescription("Loop the current song or entire queue")
+    .addStringOption((option) =>
+      option
+        .setName("mode")
+        .setDescription("Loop mode")
+        .setRequired(true)
+        .addChoices(
+          { name: "Track (Current Song)", value: "track" },
+          { name: "Queue (All Songs)", value: "queue" },
+          { name: "Off (Disable Loop)", value: "off" }
+        )
+    ),
+  category: "Music",
+
+  async execute(interaction, client) {
+    await interaction.deferReply();
+
+    const queue = client.distube.getQueue(interaction.guildId);
+    const mode = interaction.options.getString("mode");
+
+    if (!queue || !queue.songs.length) {
+      return interaction.followUp("❌ There is no music playing!");
+    }
+
+    try {
+      let modeValue;
+      let modeText;
+
+      switch (mode) {
+        case "track":
+          modeValue = 1;
+          modeText = "🔂 Track Loop";
+          break;
+        case "queue":
+          modeValue = 2;
+          modeText = "🔁 Queue Loop";
+          break;
+        case "off":
+          modeValue = 0;
+          modeText = "▶️ Loop Disabled";
+          break;
+        default:
+          modeValue = 0;
+          modeText = "▶️ Loop Disabled";
+      }
+
+      await queue.setRepeatMode(modeValue);
+
+      const embed = new EmbedBuilder()
+        .setColor("#0099ff")
+        .setTitle("🔁 Loop Mode Updated")
+        .setDescription(
+          `**${modeText}**\n\nCurrent song: **${queue.songs[0].name}**`
+        )
+        .setFooter({ text: `Requested by ${interaction.user.tag}` })
+        .setTimestamp();
+
+      await interaction.followUp({ embeds: [embed] });
+    } catch (error) {
+      console.error("Error setting loop mode:", error);
+      await interaction.followUp(
+        "❌ Failed to set loop mode. Please try again."
+      );
+    }
+  },
+};

commands/music/lyrics.js

@@ -13,6 +13,8 @@ module.exports = {
         .setDescription("Song name to search lyrics for (optional)")
         .setRequired(false)
     ),
+  category: "Music",
+
   async execute(interaction, client) {
     await interaction.deferReply();
 

commands/music/nowplaying.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("nowplaying")
     .setDescription("Shows information about the current song"),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
 

commands/music/pause.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("pause")
     .setDescription("Pauses the current song"),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
 

commands/music/play.js

@@ -10,6 +10,8 @@ module.exports = {
         .setDescription("Song name or URL")
         .setRequired(true)
     ),
+  category: "Music",
+
   async execute(interaction, client) {
     await interaction.deferReply();
     const query = interaction.options.getString("query");

commands/music/queue.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("queue")
     .setDescription("Shows the current music queue."),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
     if (!queue || queue.songs.length === 0) {

commands/music/resume.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("resume")
     .setDescription("Resumes the paused song"),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
 

commands/music/shuffle.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("shuffle")
     .setDescription("Shuffles the current queue"),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
 

commands/music/skip.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("skip")
     .setDescription("Skips the current song."),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
     if (!queue) return interaction.reply("❌ No songs in queue!");

commands/music/stop.js

@@ -4,6 +4,8 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("stop")
     .setDescription("Stops the music and clears the queue."),
+  category: "Music",
+
   async execute(interaction, client) {
     const queue = client.distube.getQueue(interaction.guildId);
     if (!queue) return interaction.reply("❌ No music is playing!");

commands/music/volume.js

@@ -12,6 +12,8 @@ module.exports = {
         .setMinValue(1)
         .setMaxValue(100)
     ),
+  category: "Music",
+
   async execute(interaction, client) {
     const volume = interaction.options.getInteger("level");
     const queue = client.distube.getQueue(interaction.guildId);

commands/stats/cs2.js

@@ -11,6 +11,7 @@ module.exports = {
         .setDescription("The Steam ID to fetch stats for.")
         .setRequired(true)
     ),
+  category: "Stats",
 
   async execute(interaction) {
     const steamId = interaction.options.getString("steam_id");

commands/stats/tft.js

@@ -13,6 +13,7 @@ module.exports = {
         )
         .setRequired(true)
     ),
+  category: "Stats",
 
   async execute(interaction) {
     const username = interaction.options.getString("username");

commands/stats/valorant.js

@@ -41,6 +41,8 @@ module.exports = {
         .setDescription("Include roles stats?")
         .setRequired(false)
     ),
+  category: "Stats",
+
   async execute(interaction) {
     // Immediately defer the reply
     await interaction.deferReply();

commands/utils/leaderboard.js

@@ -5,6 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("leaderboard")
     .setDescription("Displays the trivia leaderboard"),
+  category: "Utils",
 
   async execute(interaction, client) {
     const guild = interaction.guild;

commands/utils/stats.js

@@ -4,6 +4,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName("stats")
     .setDescription("Displays server statistics."),
+  category: "Utils",
 
   async execute(interaction) {
     try {

commands/verification/code.js

@@ -12,6 +12,7 @@ module.exports = {
         .setDescription("Your verification code")
         .setRequired(true)
     ),
+  category: "Verification",
 
   async execute(interaction, client) {
     // Fetch server settings from the database

commands/verification/verify.js

@@ -21,6 +21,7 @@ module.exports = {
         .setDescription("Your DCU email address")
         .setRequired(true)
     ),
+  category: "Verification",
 
   async execute(interaction, client) {
     // Fetch the server settings from the database using guild ID

index.js

@@ -46,7 +46,7 @@ client.distube
       `✅ Added: **${song.name}** - \`${song.formattedDuration}\``
     );
   })
-  .on("error", (channel, error) => {
+  .on("error", (queue, error) => {
     console.error("DisTube error:", error);
     queue.textChannel.send("❌ An error occurred: " + error.message);
   })