Merge pull request #66 from clienterrverse/es6-rewrite

prifix command

src/commands/misc/disableping.js → src/commands/admin/disableping.js

@@ -26,6 +26,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'Admin',
 
    run: async (client, interaction) => {
       try {

src/commands/misc/jointoCreate.js → src/commands/admin/jointoCreate.js

@@ -60,6 +60,7 @@ export default {
       PermissionFlagsBits.ManageChannels,
       PermissionFlagsBits.ManageRoles,
    ],
+   category: 'Admin',
 
    run: async (client, interaction) => {
       const subcommand = interaction.options.getSubcommand();

src/commands/misc/purge.js → src/commands/admin/purge.js

@@ -29,6 +29,8 @@ export default {
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'Admin',
+   prefix: true,
 
    run: async (client, interaction) => {
       const amount = interaction.options.getInteger('amount');

src/commands/misc/welcome.js → src/commands/admin/welcome.js

@@ -51,6 +51,7 @@ export default {
    userPermissions: [PermissionsBitField.ADMINISTRATOR],
    botPermissions: [PermissionsBitField.ManageRoles],
    cooldown: 5,
+   category: 'Admin',
 
    run: async (client, interaction) => {
       await interaction.deferReply({ ephemeral: true });

src/commands/developer/createitem.js

@@ -48,6 +48,8 @@ export default {
       .toJSON(),
    userPermissions: [],
    botPermissions: [],
+   category: 'Devloper',
+
    cooldown: 10,
    nsfwMode: false,
    testMode: false,

src/commands/developer/delitem.js

@@ -17,6 +17,7 @@ export default {
       .toJSON(),
    userPermissions: [],
    botPermissions: [],
+   category: 'Devloper',
    cooldown: 10,
    nsfwMode: false,
    testMode: false,

src/commands/developer/dm.js

@@ -64,6 +64,7 @@ export default {
    nwfwMode: false,
    testMode: false,
    devOnly: true,
+   category: 'Devloper',
 
    run: async (client, interaction) => {
       const subcommand = interaction.options.getSubcommand();

src/commands/developer/eco.js

@@ -104,6 +104,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: true,
+   category: 'Devloper',
 
    run: async (client, interaction) => {
       const subcommand = interaction.options.getSubcommand();

src/commands/developer/servers.js

@@ -74,6 +74,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: true,
+   category: 'Devloper',
 
    run: async (client, interaction) => {
       await interaction.deferReply({ ephemeral: true });

src/commands/developer/setPrefix.js

@@ -0,0 +1,107 @@
+import { UserPrefix } from '../../schemas/prefix.js';
+import { EmbedBuilder, SlashCommandBuilder } from 'discord.js';
+
+const DISALLOWED_PREFIXES = [
+   '/',
+   '\\',
+   '@',
+   '#',
+   '$',
+   '&',
+   '(',
+   ')',
+   '{',
+   '}',
+   '[',
+   ']',
+];
+
+export default {
+   data: new SlashCommandBuilder()
+      .setName('setprefix')
+      .setDescription('Set a prefix for a user or remove it (dev only)')
+      .addUserOption((option) =>
+         option
+            .setName('user')
+            .setDescription('The user to set the prefix for')
+            .setRequired(true)
+      )
+      .addStringOption((option) =>
+         option
+            .setName('prefix')
+            .setDescription('The new prefix to set (use "noprefix" to remove)')
+            .setRequired(true)
+      ),
+   userPermissions: [],
+   botPermissions: [],
+   category: 'Misc',
+   cooldown: 5,
+   nsfwMode: false,
+   testMode: false,
+   devOnly: true,
+   category: 'Devloper',
+
+   run: async (client, interaction) => {
+      try {
+         const targetUser = interaction.options.getUser('user');
+         const newPrefix = interaction.options.getString('prefix');
+
+         if (!targetUser) {
+            return interaction.reply({
+               content: 'Please provide a valid user.',
+               ephemeral: true,
+            });
+         }
+
+         await updatePrefix(interaction, targetUser, newPrefix);
+      } catch (error) {
+         console.error('Error in setprefix command:', error);
+         await interaction.reply({
+            content:
+               'An error occurred while processing the command. Please try again later.',
+            ephemeral: true,
+         });
+      }
+   },
+};
+
+async function updatePrefix(interaction, targetUser, newPrefix) {
+   if (DISALLOWED_PREFIXES.includes(newPrefix) && newPrefix !== 'noprefix') {
+      return interaction.reply({
+         content: `The prefix "${newPrefix}" is not allowed as it may conflict with Discord or bot functionality.`,
+         ephemeral: true,
+      });
+   }
+
+   const finalPrefix = newPrefix === 'noprefix' ? '' : newPrefix;
+   let updateData;
+   let responseMessage;
+
+   if (newPrefix === 'noprefix') {
+      updateData = { exemptFromPrefix: true, prefix: '' };
+      responseMessage = `Prefix for ${targetUser.tag} has been removed and they are now exempt from using a prefix.`;
+   } else {
+      updateData = { exemptFromPrefix: false, prefix: finalPrefix };
+      responseMessage = `Prefix for ${targetUser.tag} has been updated to \`${finalPrefix}\`.`;
+   }
+
+   try {
+      await UserPrefix.findOneAndUpdate(
+         { userId: targetUser.id },
+         { $set: { ...updateData, userId: targetUser.id } },
+         { upsert: true, new: true, runValidators: true }
+      );
+
+      await interaction.reply({
+         content: responseMessage,
+         ephemeral: true,
+      });
+   } catch (error) {
+      console.error('Error updating prefix:', error);
+      await interaction.reply({
+         content:
+            'An error occurred while updating the prefix. Please try again later.',
+         ephemeral: true,
+      });
+   }
+}

src/commands/economy/balance.js

@@ -15,6 +15,7 @@ export default {
    testMode: false,
    devOnly: false,
    dmAllowed: true,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/bank.js

@@ -13,6 +13,7 @@ export default {
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       try {

src/commands/economy/beg.js

@@ -14,6 +14,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/coinflip.js

@@ -36,6 +36,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/crime.js

@@ -11,6 +11,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/daily.js

@@ -14,6 +14,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/deposit.js

@@ -22,6 +22,7 @@ export default {
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/hourly.js

@@ -12,6 +12,7 @@ export default {
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/inventory.js

@@ -12,6 +12,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/items.js

@@ -15,6 +15,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       // Fetch all items from the database

src/commands/economy/leaderboard.js

@@ -15,6 +15,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       // Defer the interaction

src/commands/economy/shop.js

@@ -21,6 +21,8 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
+
    run: async (client, interaction) => {
       try {
          const items = await Item.find().lean();

src/commands/economy/slots.js

@@ -21,6 +21,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/weekly.js

@@ -14,6 +14,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/economy/withdraw.js

@@ -24,6 +24,7 @@ export default {
    nsfwMode: false,
    testMode: false,
    devOnly: false,
+   category: 'economy',
 
    run: async (client, interaction) => {
       const userId = interaction.user.id;

src/commands/image/cat.js

@@ -12,9 +12,11 @@ export default {
       .setDescription('send random cat img')
 
       .toJSON(),
+   category: 'Image',
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   prefix: true,
 
    userPermissionsBitField: [],
    bot: [],

src/commands/image/dog.js

@@ -11,9 +11,11 @@ export default {
       .setName('dog')
       .setDescription('send random dog image')
       .toJSON(),
+   category: 'Image',
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   prefix: true,
 
    userPermissionsBitField: [],
    bot: [],

src/commands/image/magik.js

@@ -32,6 +32,7 @@ export default {
    cooldown: 10,
    nsfwMode: false,
    testMode: false,
+   category: 'Image',
    devOnly: false,
    userPermissionsBitField: [],
    bot: [],

src/commands/misc/avatar.js

@@ -19,11 +19,13 @@ export default {
 
    userPermissions: [],
    botPermissions: [],
+   category: 'Misc',
    cooldown: 5,
    deleted: false,
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   prefix: true,
 
    run: async (client, interaction) => {
       try {

src/commands/misc/fact.js

@@ -14,10 +14,13 @@ export default {
 
    userPermissionsBitField: [],
    bot: [],
+   category: 'Misc',
    cooldown: 19, // Cooldown of 5 seconds
    nwfwMode: false,
    testMode: false,
    devOnly: false,
+   prefix: true,
+
    run: async (client, interaction) => {
       try {
          const res = await axios.get(

src/commands/misc/guild.js

@@ -21,6 +21,7 @@ export default {
    cooldown: 5,
    userPermissionsBitField: [],
    bot: [],
+   category: 'Misc',
 
    run: async (client, interaction) => {
       if (interaction.options.getSubcommand() === 'join') {