vimcord 1.0.52 → 1.0.54

package/dist/index.js

@@ -204,7 +204,6 @@ var BaseCommandBuilder = class {
   async run(client, ...args) {
     const config = this.resolveConfig(client);
     const ctx = this.extractContext(args);
-    let cancel = false;
     try {
       if (!config.enabled) {
         return await config.onUsedWhenDisabled?.(...args);
@@ -219,16 +218,11 @@ var BaseCommandBuilder = class {
       if (!await this.checkConditions(config, ...args)) {
         return await config.onConditionsNotMet?.(...args);
       }
-      await config.beforeExecute?.({ cancel: () => cancel = true }, ...args);
-      if (cancel) return;
+      await config.beforeExecute?.(...args);
       if (config.logExecution !== false) {
-        const optionsWithName = this.options;
-        const builderWithName = this;
-        const cmdName = optionsWithName.name ?? builderWithName.builder?.name ?? "Unknown";
+        const cmdName = this.options.name || this.builder?.name || "Unknown";
         const location = ctx.guild ? `${ctx.guild.name} (${ctx.guild.id})` : "Direct Messages";
-        if (client.logger) {
-          client.logger.commandExecuted(cmdName, ctx.user.username, location);
-        }
+        client.logger.commandExecuted(cmdName, ctx.user.username, location);
       }
       const result = await config.execute?.(...args);
       await config.afterExecute?.(result, ...args);
@@ -456,7 +450,9 @@ var Logger = class {
   extend(extras) {
     for (const [key, fn] of Object.entries(extras)) {
       if (typeof fn === "function") {
-        this[key] = (...args) => fn.call(this, ...args);
+        this[key] = function(...args) {
+          return fn.call(this, ...args);
+        };
       }
     }
     return this;
@@ -826,14 +822,12 @@ var contextCommandHandler = new EventBuilder({
     if (!command) {
       const content = `**${interaction.commandName}** is not a registered context command.`;
       if (interaction.replied || interaction.deferred) {
-        await interaction.followUp({ content, flags: "Ephemeral" });
-      } else {
-        await interaction.reply({ content, flags: "Ephemeral" });
+        return interaction.followUp({ content, flags: "Ephemeral" });
       }
-      return;
+      return interaction.reply({ content, flags: "Ephemeral" });
     }
     try {
-      await command.run(client, client, interaction);
+      return await command.run(client, client, interaction);
     } catch (err) {
       await client.error.handleCommandError(err, interaction.guild, interaction);
     }
@@ -892,14 +886,12 @@ var slashCommandHandler = new EventBuilder({
     if (!command) {
       const content = `**/\`${interaction.commandName}\`** is not a registered command.`;
       if (interaction.replied || interaction.deferred) {
-        await interaction.followUp({ content, flags: "Ephemeral" });
-      } else {
-        await interaction.reply({ content, flags: "Ephemeral" });
+        return interaction.followUp({ content, flags: "Ephemeral" });
       }
-      return;
+      return interaction.reply({ content, flags: "Ephemeral" });
     }
     try {
-      await command.run(client, client, interaction);
+      return await command.run(client, client, interaction);
     } catch (err) {
       await client.error.handleCommandError(err, interaction.guild, interaction);
     }
@@ -1701,7 +1693,7 @@ var VimcordErrorHandler = class {
 import chalk2 from "chalk";
 
 // package.json
-var version = "1.0.51";
+var version = "1.0.54";
 
 // src/client/vimcord.logger.ts
 var clientLoggerFactory = (client) => new Logger({ prefixEmoji: "\u26A1", prefix: `vimcord (i${client.clientId})` }).extend({
@@ -1777,11 +1769,9 @@ function getDevMode() {
 }
 
 // src/configs/app.config.ts
-var packageJson = getPackageJson();
-var version2 = typeof packageJson.version === "string" ? packageJson.version : "1.0.0";
 var defaultConfig = {
   name: "Discord Bot",
-  version: version2,
+  version: getPackageJson()?.version ?? "1.0.0",
   devMode: getDevMode(),
   verbose: false,
   enableCLI: false,
@@ -2105,16 +2095,11 @@ var CommandManager = class {
   slash;
   prefix;
   context;
-  logger;
   constructor(client) {
     this.client = client;
     this.slash = new SlashCommandManager(client);
     this.prefix = new PrefixCommandManager(client);
     this.context = new ContextCommandManager(client);
-    this.logger = new Logger({
-      prefixEmoji: "\u26A1",
-      prefix: `vimcord (i${client.clientId}) [CommandManager]`
-    });
   }
   getAllAppCommands(options = {}) {
     return [...this.slash.getAll(options), ...this.context.getAll(options)];
@@ -2122,21 +2107,23 @@ var CommandManager = class {
   async registerGlobal(options = {}) {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      this.logger.error("Failed to register app commands globally: REST is not initialized");
+      console.error(`[CommandManager] \u2716 Failed to register app commands globally: REST is not initialized`);
       return;
     }
     const commands = this.getAllAppCommands(options).map((cmd) => cmd.builder.toJSON());
     if (!commands.length) {
-      this.logger.info("No commands to register globally");
+      console.log("[CommandManager] No commands to register globally");
       return;
     }
-    this.logger.info(`Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} globally...`);
+    console.log(
+      `[CommandManager] Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} globally...`
+    );
     try {
       await client.rest.put(Routes.applicationCommands(client.user.id), { body: commands });
-      this.logger.success(`Registered app ${commands.length === 1 ? "command" : "commands"} globally`);
+      console.log(`[CommandManager] \u2714 Registered app ${commands.length === 1 ? "command" : "commands"} globally`);
     } catch (err) {
-      this.logger.error(
-        `Failed to register app ${commands.length === 1 ? "command" : "commands"} globally`,
+      console.error(
+        `[CommandManager] \u2716 Failed to register app ${commands.length === 1 ? "command" : "commands"} globally`,
         err
       );
     }
@@ -2144,66 +2131,60 @@ var CommandManager = class {
   async unregisterGlobal() {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      this.logger.error("Failed to remove app commands globally: REST is not initialized");
+      console.error(`[CommandManager] \u2716 Failed to remove app commands globally: REST is not initialized`);
       return;
     }
     try {
       await client.rest.put(Routes.applicationCommands(client.user.id), { body: [] });
-      this.logger.success("Removed app commands globally");
+      console.log(`[CommandManager] \u2714 Removed app commands globally`);
     } catch (err) {
-      this.logger.error("Failed to remove app commands globally", err);
+      console.error(`[CommandManager] \u2716 Failed to remove app commands globally`, err);
     }
   }
   async registerGuild(options = {}) {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      this.logger.error("Failed to register app commands by guild: REST is not initialized");
+      console.error(`[CommandManager] \u2716 Failed to register app commands by guild: REST is not initialized`);
       return;
     }
     const commands = this.getAllAppCommands(options).map((cmd) => cmd.builder.toJSON());
     if (!commands.length) {
-      this.logger.info("No commands to register by guild");
+      console.log("[CommandManager] No commands to register by guild");
       return;
     }
     const guildIds = options.guilds || client.guilds.cache.map((g) => g.id);
-    this.logger.info(
-      `Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} for ${guildIds.length} guilds...`
+    console.log(
+      `[CommandManager] Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} for ${guildIds.length} guilds...`
     );
     await Promise.all(
-      guildIds.map(async (guildId) => {
-        try {
-          await client.rest.put(Routes.applicationGuildCommands(client.user.id, guildId), { body: commands });
+      guildIds.map(
+        (guildId) => client.rest.put(Routes.applicationGuildCommands(client.user.id, guildId), { body: commands }).then(() => {
           const gName = client.guilds.cache.get(guildId)?.name || "n/a";
-          this.logger.success(
-            `Set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`
+          console.log(
+            `[CommandManager] \u2714 Set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`
           );
-        } catch (err) {
+        }).catch((err) => {
           const gName = client.guilds.cache.get(guildId)?.name || "n/a";
-          this.logger.error(
-            `Failed to set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`,
+          console.log(
+            `[CommandManager] \u2716 Failed to set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`,
             err
           );
-        }
-      })
+        })
+      )
     );
   }
   async unregisterGuild(options = {}) {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      this.logger.error("Failed to unregister app commands by guild: REST is not initialized");
+      console.error(`[CommandManager] \u2716 Failed to register app commands by guild: REST is not initialized`);
       return;
     }
     const guildIds = options.guilds || client.guilds.cache.map((g) => g.id);
-    this.logger.info(`Unregistering commands from ${guildIds.length} guilds...`);
+    console.log(`[CommandManager] Unregistering commands from ${guildIds.length} guilds...`);
     await Promise.all(
-      guildIds.map(async (guildId) => {
-        try {
-          await client.rest.put(Routes.applicationGuildCommands(client.user.id, guildId), { body: [] });
-          this.logger.success(`Removed app commands in guild: ${guildId}`);
-        } catch (err) {
-          this.logger.error(`Failed to remove app commands in guild: ${guildId}`, err);
-        }
-      })
+      guildIds.map(
+        (guildId) => client.rest.put(Routes.applicationGuildCommands(client.user.id, guildId), { body: [] }).then(() => console.log(`[CommandManager] \u2714 Removed app commands in guild: ${guildId}`)).catch((err) => console.log(`[CommandManager] \u2716 Failed to remove app commands in guild: ${guildId}`, err))
+      )
     );
   }
 };
@@ -2711,8 +2692,8 @@ var Vimcord = class _Vimcord extends Client2 {
     return this.config.app.version;
   }
   // prettier-ignore
-  set $version(version3) {
-    this.config.app.version = version3;
+  set $version(version2) {
+    this.config.app.version = version2;
   }
   /** Current dev mode state */
   // prettier-ignore
@@ -3501,6 +3482,7 @@ import {
   RoleSelectMenuBuilder,
   StringSelectMenuBuilder,
   TextInputBuilder,
+  TextInputStyle,
   UserSelectMenuBuilder
 } from "discord.js";
 var DEFAULT_CONFIG = {
@@ -3593,7 +3575,8 @@ var BetterModal = class _BetterModal {
   addTextInput(data) {
     this.validateComponentLength();
     const customId = data.customId ?? this.createComponentId();
-    const textInput = new TextInputBuilder({ ...data, customId });
+    const { label: _, ...textInputData } = data;
+    const textInput = new TextInputBuilder({ style: TextInputStyle.Short, required: false, ...textInputData, customId });
     const label = this.createLabelComponent(data);
     label.setTextInputComponent(textInput);
     this.components.set(customId, { textInput: data });
@@ -3988,7 +3971,7 @@ var Paginator = class {
         if (disabledNavRow.components.length > 0) {
           newComponents.push(disabledNavRow);
         }
-        await this.data.message.edit({ components: newComponents });
+        await this.data.message.edit({ components: newComponents }).catch(Boolean);
         if (this.options.useReactions) {
           await this.nav_removeFromMessage();
         }
@@ -3999,7 +3982,7 @@ var Paginator = class {
         }
         break;
       case 2 /* DeleteMessage */:
-        await this.data.message.delete();
+        await this.data.message.delete().catch(Boolean);
         break;
       case 3 /* DoNothing */:
         break;
@@ -4009,16 +3992,16 @@ var Paginator = class {
   async nav_removeFromMessage() {
     if (!this.data.message?.editable) return;
     if (this.options.useReactions) {
-      await this.data.message.reactions.removeAll();
+      await this.data.message.reactions.removeAll().catch(Boolean);
     } else {
       const newComponents = this.data.message.components.filter((c) => c.type !== ComponentType2.Container);
-      await this.data.message.edit({ components: newComponents });
+      await this.data.message.edit({ components: newComponents }).catch(Boolean);
     }
   }
   async nav_addReactions() {
     if (!this.data.message || !this.options.useReactions || !this.data.navigation.reactions.length) return;
     for (const r of this.data.navigation.reactions) {
-      await this.data.message.react(r.id);
+      await this.data.message.react(r.id).catch(Boolean);
     }
   }
   async collect_components() {
@@ -4053,7 +4036,7 @@ var Paginator = class {
         }
         switch (i.customId) {
           case "ssm_chapterSelect":
-            await i.deferUpdate();
+            await i.deferUpdate().catch(Boolean);
             const chapterIndex = this.chapters.findIndex(
               (c) => c.id === i.values[0]
             );
@@ -4061,25 +4044,25 @@ var Paginator = class {
             await this.refresh();
             break;
           case "btn_first":
-            await i.deferUpdate();
+            await i.deferUpdate().catch(Boolean);
             this.callEventStack("first", this.data.page.current, this.data.page.index);
             await this.setPage(this.data.page.index.chapter, 0);
             await this.refresh();
             break;
           case "btn_back":
-            await i.deferUpdate();
+            await i.deferUpdate().catch(Boolean);
             this.callEventStack("back", this.data.page.current, this.data.page.index);
             await this.setPage(this.data.page.index.chapter, this.data.page.index.nested - 1);
             await this.refresh();
             break;
           case "btn_next":
-            await i.deferUpdate();
+            await i.deferUpdate().catch(Boolean);
             this.callEventStack("next", this.data.page.current, this.data.page.index);
             await this.setPage(this.data.page.index.chapter, this.data.page.index.nested + 1);
             await this.refresh();
             break;
           case "btn_last":
-            await i.deferUpdate();
+            await i.deferUpdate().catch(Boolean);
             this.callEventStack("last", this.data.page.current, this.data.page.index);
             await this.setPage(
               this.data.page.index.chapter,