vimcord 1.0.49 → 1.0.51

package/dist/index.cjs

@@ -82,6 +82,7 @@ __export(index_exports, {
   createMongoPlugin: () => createMongoPlugin,
   createMongoSchema: () => createMongoSchema,
   createPrefixCommandConfig: () => createPrefixCommandConfig,
+  createRandomId: () => createRandomId,
   createSlashCommandConfig: () => createSlashCommandConfig,
   createStaffConfig: () => createStaffConfig,
   createToolsConfig: () => createToolsConfig,
@@ -316,6 +317,7 @@ 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);
@@ -330,11 +332,16 @@ var BaseCommandBuilder = class {
       if (!await this.checkConditions(config, ...args)) {
         return await config.onConditionsNotMet?.(...args);
       }
-      await config.beforeExecute?.(...args);
+      await config.beforeExecute?.({ cancel: () => cancel = true }, ...args);
+      if (cancel) return;
       if (config.logExecution !== false) {
-        const cmdName = this.options.name || this.builder?.name || "Unknown";
+        const optionsWithName = this.options;
+        const builderWithName = this;
+        const cmdName = optionsWithName.name ?? builderWithName.builder?.name ?? "Unknown";
         const location = ctx.guild ? `${ctx.guild.name} (${ctx.guild.id})` : "Direct Messages";
-        client.logger.commandExecuted(cmdName, ctx.user.username, location);
+        if (client.logger) {
+          client.logger.commandExecuted(cmdName, ctx.user.username, location);
+        }
       }
       const result = await config.execute?.(...args);
       await config.afterExecute?.(result, ...args);
@@ -562,9 +569,7 @@ var Logger = class {
   extend(extras) {
     for (const [key, fn] of Object.entries(extras)) {
       if (typeof fn === "function") {
-        this[key] = function(...args) {
-          return fn.call(this, ...args);
-        };
+        this[key] = (...args) => fn.call(this, ...args);
       }
     }
     return this;
@@ -934,12 +939,14 @@ var contextCommandHandler = new EventBuilder({
     if (!command) {
       const content = `**${interaction.commandName}** is not a registered context command.`;
       if (interaction.replied || interaction.deferred) {
-        return interaction.followUp({ content, flags: "Ephemeral" });
+        await interaction.followUp({ content, flags: "Ephemeral" });
+      } else {
+        await interaction.reply({ content, flags: "Ephemeral" });
       }
-      return interaction.reply({ content, flags: "Ephemeral" });
+      return;
     }
     try {
-      return await command.run(client, client, interaction);
+      await command.run(client, client, interaction);
     } catch (err) {
       await client.error.handleCommandError(err, interaction.guild, interaction);
     }
@@ -998,12 +1005,14 @@ var slashCommandHandler = new EventBuilder({
     if (!command) {
       const content = `**/\`${interaction.commandName}\`** is not a registered command.`;
       if (interaction.replied || interaction.deferred) {
-        return interaction.followUp({ content, flags: "Ephemeral" });
+        await interaction.followUp({ content, flags: "Ephemeral" });
+      } else {
+        await interaction.reply({ content, flags: "Ephemeral" });
       }
-      return interaction.reply({ content, flags: "Ephemeral" });
+      return;
     }
     try {
-      return await command.run(client, client, interaction);
+      await command.run(client, client, interaction);
     } catch (err) {
       await client.error.handleCommandError(err, interaction.guild, interaction);
     }
@@ -1787,7 +1796,7 @@ var VimcordErrorHandler = class {
 var import_chalk2 = __toESM(require("chalk"));
 
 // package.json
-var version = "1.0.48";
+var version = "1.0.51";
 
 // src/client/vimcord.logger.ts
 var clientLoggerFactory = (client) => new Logger({ prefixEmoji: "\u26A1", prefix: `vimcord (i${client.clientId})` }).extend({
@@ -1863,9 +1872,11 @@ 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: getPackageJson()?.version ?? "1.0.0",
+  version: version2,
   devMode: getDevMode(),
   verbose: false,
   enableCLI: false,
@@ -2189,11 +2200,16 @@ 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)];
@@ -2201,23 +2217,21 @@ var CommandManager = class {
   async registerGlobal(options = {}) {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      console.error(`[CommandManager] \u2716 Failed to register app commands globally: REST is not initialized`);
+      this.logger.error("Failed to register app commands globally: REST is not initialized");
       return;
     }
     const commands = this.getAllAppCommands(options).map((cmd) => cmd.builder.toJSON());
     if (!commands.length) {
-      console.log("[CommandManager] No commands to register globally");
+      this.logger.info("No commands to register globally");
       return;
     }
-    console.log(
-      `[CommandManager] Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} globally...`
-    );
+    this.logger.info(`Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} globally...`);
     try {
       await client.rest.put(import_discord8.Routes.applicationCommands(client.user.id), { body: commands });
-      console.log(`[CommandManager] \u2714 Registered app ${commands.length === 1 ? "command" : "commands"} globally`);
+      this.logger.success(`Registered app ${commands.length === 1 ? "command" : "commands"} globally`);
     } catch (err) {
-      console.error(
-        `[CommandManager] \u2716 Failed to register app ${commands.length === 1 ? "command" : "commands"} globally`,
+      this.logger.error(
+        `Failed to register app ${commands.length === 1 ? "command" : "commands"} globally`,
         err
       );
     }
@@ -2225,60 +2239,66 @@ var CommandManager = class {
   async unregisterGlobal() {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      console.error(`[CommandManager] \u2716 Failed to remove app commands globally: REST is not initialized`);
+      this.logger.error("Failed to remove app commands globally: REST is not initialized");
       return;
     }
     try {
       await client.rest.put(import_discord8.Routes.applicationCommands(client.user.id), { body: [] });
-      console.log(`[CommandManager] \u2714 Removed app commands globally`);
+      this.logger.success("Removed app commands globally");
     } catch (err) {
-      console.error(`[CommandManager] \u2716 Failed to remove app commands globally`, err);
+      this.logger.error("Failed to remove app commands globally", err);
     }
   }
   async registerGuild(options = {}) {
     const client = await Vimcord.getReadyInstance(this.client.clientId);
     if (!client.rest) {
-      console.error(`[CommandManager] \u2716 Failed to register app commands by guild: REST is not initialized`);
+      this.logger.error("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) {
-      console.log("[CommandManager] No commands to register by guild");
+      this.logger.info("No commands to register by guild");
       return;
     }
     const guildIds = options.guilds || client.guilds.cache.map((g) => g.id);
-    console.log(
-      `[CommandManager] Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} for ${guildIds.length} guilds...`
+    this.logger.info(
+      `Registering (${commands.length}) ${commands.length === 1 ? "command" : "commands"} for ${guildIds.length} guilds...`
     );
     await Promise.all(
-      guildIds.map(
-        (guildId) => client.rest.put(import_discord8.Routes.applicationGuildCommands(client.user.id, guildId), { body: commands }).then(() => {
+      guildIds.map(async (guildId) => {
+        try {
+          await client.rest.put(import_discord8.Routes.applicationGuildCommands(client.user.id, guildId), { body: commands });
           const gName = client.guilds.cache.get(guildId)?.name || "n/a";
-          console.log(
-            `[CommandManager] \u2714 Set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`
+          this.logger.success(
+            `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";
-          console.log(
-            `[CommandManager] \u2716 Failed to set app ${commands.length === 1 ? "command" : "commands"} in guild: ${guildId} (${gName})`,
+          this.logger.error(
+            `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) {
-      console.error(`[CommandManager] \u2716 Failed to register app commands by guild: REST is not initialized`);
+      this.logger.error("Failed to unregister app commands by guild: REST is not initialized");
       return;
     }
     const guildIds = options.guilds || client.guilds.cache.map((g) => g.id);
-    console.log(`[CommandManager] Unregistering commands from ${guildIds.length} guilds...`);
+    this.logger.info(`Unregistering commands from ${guildIds.length} guilds...`);
     await Promise.all(
-      guildIds.map(
-        (guildId) => client.rest.put(import_discord8.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))
-      )
+      guildIds.map(async (guildId) => {
+        try {
+          await client.rest.put(import_discord8.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);
+        }
+      })
     );
   }
 };
@@ -2786,8 +2806,8 @@ var Vimcord = class _Vimcord extends import_discord11.Client {
     return this.config.app.version;
   }
   // prettier-ignore
-  set $version(version2) {
-    this.config.app.version = version2;
+  set $version(version3) {
+    this.config.app.version = version3;
   }
   /** Current dev mode state */
   // prettier-ignore
@@ -3559,49 +3579,77 @@ var BetterContainer = class {
 
 // src/tools/BetterModal.ts
 var import_discord13 = require("discord.js");
-var import_qznt7 = require("qznt");
-var BetterModal = class {
-  id;
-  options;
-  modal;
+var DEFAULT_CONFIG = {
+  timeout: 6e4
+};
+function createRandomId() {
+  return `v-${Math.random().toString(36).split(".")[1]}`;
+}
+var BetterModal = class _BetterModal {
+  customId;
   components = /* @__PURE__ */ new Map();
-  config;
-  constructor(options = {}) {
-    this.id = options.id || this.createModalId();
-    this.options = options;
-    this.modal = new import_discord13.ModalBuilder().setCustomId(this.id);
-    this.config = options.config || globalToolsConfig;
-    if (options.title) {
-      this.setTitle(options.title);
-    }
-    if (options.components?.length) {
-      this.addComponents(...options.components);
-    }
+  labelComponents = [];
+  modal;
+  constructor(options) {
+    this.customId = options?.customId ?? createRandomId();
+    this.modal = new import_discord13.ModalBuilder().setCustomId(this.customId);
+    if (options?.title) this.setTitle(options.title);
+    if (options?.components?.length) this.addComponents(...options.components);
   }
-  createModalId() {
-    return `modal:${import_qznt7.$.rnd.str(10, "alpha", { casing: "mixed" })}-${Date.now()}`;
+  validateComponentLength() {
+    if ((this.components.size ?? 0) >= 25) {
+      throw new Error("[BetterModal] Modal can only have 25 components");
+    }
   }
   createComponentId() {
-    return `modal-component:${this.id}-${import_qznt7.$.rnd.str(4, "alpha", { casing: "mixed" })}-${Date.now().toString().slice(-4)}`;
+    return `${this.customId}:${createRandomId()}`;
   }
-  validateComponentLength() {
-    if (this.components.size >= 5) throw new Error("Modal can only have 5 components");
-  }
-  toJSON() {
-    return this.modal.toJSON();
+  createLabelComponent(data) {
+    const component = new import_discord13.LabelBuilder().setLabel(data.label);
+    if (data.description) component.setDescription(data.description);
+    return component;
   }
   build() {
-    this.modal.setLabelComponents(Array.from(this.components.values()));
+    if (!this.modal.data.title) throw new Error("[BetterModal] Modal must have a title");
+    this.modal.setLabelComponents(this.labelComponents);
     return this.modal;
   }
+  clone() {
+    return new _BetterModal({
+      customId: this.customId,
+      title: this.modal.data.title,
+      components: Array.from(this.components.values())
+    });
+  }
+  toJSON() {
+    return this.build().toJSON();
+  }
+  /**
+   * Sets the title of the modal.
+   * @param title The title of the modal.
+   */
   setTitle(title) {
     this.modal.setTitle(title);
     return this;
   }
+  /** Sets components for the modal. */
+  setComponents(...components) {
+    this.components.clear();
+    this.labelComponents = [];
+    this.addComponents(...components);
+    return this;
+  }
+  /** Adds components to the modal. */
   addComponents(...components) {
     for (const component of components) {
       if ("textInput" in component) {
         this.addTextInput(component.textInput);
+      } else if ("checkbox" in component) {
+        this.addCheckbox(component.checkbox);
+      } else if ("checkboxGroup" in component) {
+        this.addCheckboxGroup(component.checkboxGroup);
+      } else if ("radioGroup" in component) {
+        this.addRadioGroup(component.radioGroup);
       } else if ("stringSelect" in component) {
         this.addStringSelect(component.stringSelect);
       } else if ("channelSelect" in component) {
@@ -3618,112 +3666,144 @@ var BetterModal = class {
     }
     return this;
   }
-  setComponents(...components) {
-    this.modal.spliceLabelComponents(0, this.modal.components.length);
-    this.addComponents(...components);
-    return this;
-  }
   addTextInput(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const textInputComponent = new import_discord13.TextInputBuilder(rest).setCustomId(custom_id);
-    if (!rest.style) textInputComponent.setStyle(import_discord13.TextInputStyle.Short);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setTextInputComponent(textInputComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const textInput = new import_discord13.TextInputBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setTextInputComponent(textInput);
+    this.components.set(customId, { textInput: data });
+    this.labelComponents.push(label);
     return this;
   }
   addStringSelect(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const stringSelectComponent = new import_discord13.StringSelectMenuBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setStringSelectMenuComponent(stringSelectComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const select = new import_discord13.StringSelectMenuBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setStringSelectMenuComponent(select);
+    this.components.set(customId, { stringSelect: data });
+    this.labelComponents.push(label);
+    return this;
+  }
+  addCheckbox(data) {
+    this.validateComponentLength();
+    const customId = data.custom_id ?? this.createComponentId();
+    const checkbox = new import_discord13.CheckboxBuilder({ ...data, custom_id: customId });
+    const label = this.createLabelComponent(data);
+    label.setCheckboxComponent(checkbox);
+    this.components.set(customId, { checkbox: data });
+    this.labelComponents.push(label);
+    return this;
+  }
+  addCheckboxGroup(data) {
+    this.validateComponentLength();
+    const customId = data.custom_id ?? this.createComponentId();
+    const checkboxGroup = new import_discord13.CheckboxGroupBuilder({ ...data, custom_id: customId });
+    const label = this.createLabelComponent(data);
+    label.setCheckboxGroupComponent(checkboxGroup);
+    this.components.set(customId, { checkboxGroup: data });
+    this.labelComponents.push(label);
+    return this;
+  }
+  addRadioGroup(data) {
+    this.validateComponentLength();
+    const customId = data.custom_id ?? this.createComponentId();
+    const radioGroup = new import_discord13.RadioGroupBuilder({ ...data, custom_id: customId });
+    const label = this.createLabelComponent(data);
+    label.setRadioGroupComponent(radioGroup);
+    this.components.set(customId, { radioGroup: data });
+    this.labelComponents.push(label);
     return this;
   }
   addChannelSelect(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const channelSelectComponent = new import_discord13.ChannelSelectMenuBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setChannelSelectMenuComponent(channelSelectComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const channelSelect = new import_discord13.ChannelSelectMenuBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setChannelSelectMenuComponent(channelSelect);
+    this.components.set(customId, { channelSelect: data });
+    this.labelComponents.push(label);
     return this;
   }
   addUserSelect(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const userSelectComponent = new import_discord13.UserSelectMenuBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setUserSelectMenuComponent(userSelectComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const userSelect = new import_discord13.UserSelectMenuBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setUserSelectMenuComponent(userSelect);
+    this.components.set(customId, { userSelect: data });
+    this.labelComponents.push(label);
     return this;
   }
   addRoleSelect(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const roleSelectComponent = new import_discord13.RoleSelectMenuBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setRoleSelectMenuComponent(roleSelectComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const roleSelect = new import_discord13.RoleSelectMenuBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setRoleSelectMenuComponent(roleSelect);
+    this.components.set(customId, { roleSelect: data });
+    this.labelComponents.push(label);
     return this;
   }
   addMentionableSelect(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const mentionableSelectComponent = new import_discord13.MentionableSelectMenuBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setMentionableSelectMenuComponent(mentionableSelectComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.customId ?? this.createComponentId();
+    const mentionableSelect = new import_discord13.MentionableSelectMenuBuilder({ ...data, customId });
+    const label = this.createLabelComponent(data);
+    label.setMentionableSelectMenuComponent(mentionableSelect);
+    this.components.set(customId, { mentionableSelect: data });
+    this.labelComponents.push(label);
     return this;
   }
   addFileUpload(data) {
     this.validateComponentLength();
-    let { label, description, custom_id, ...rest } = data;
-    custom_id ||= this.createComponentId();
-    const fileUploadComponent = new import_discord13.FileUploadBuilder(rest).setCustomId(custom_id);
-    const labelComponent = new import_discord13.LabelBuilder().setLabel(label).setFileUploadComponent(fileUploadComponent);
-    if (description) labelComponent.setDescription(description);
-    this.components.set(custom_id, labelComponent);
+    const customId = data.custom_id ?? this.createComponentId();
+    const fileUpload = new import_discord13.FileUploadBuilder({ ...data, custom_id: customId });
+    const label = this.createLabelComponent(data);
+    label.setFileUploadComponent(fileUpload);
+    this.components.set(customId, { fileUpload: data });
+    this.labelComponents.push(label);
     return this;
   }
   /**
-   * Shows the modal via interaction.
-   * @param interaction The interaction used to show the modal
+   * Shows the modal to the user via interaction.
+   * @param interaction The command interaction to show the modal with.
+   * @param options Modal options.
    */
-  async show(interaction) {
-    if (!("showModal" in interaction)) throw new Error("Interaction does not support showing modals");
-    if (!this.modal.data.title) throw new Error("Modal must have a title");
-    this.build();
-    await interaction.showModal(this.modal).catch((err) => {
-      console.error("Modal failed to send", err);
-    });
+  async show(interaction, options) {
+    if (!interaction) throw new Error("[BetterModal] Interaction is null or undefined");
+    const modal = this.build();
+    await interaction.showModal(modal, options);
+  }
+  /**
+   * Shows the modal and waits for it to be submitted.
+   * @param interaction The interaction to show the modal with.
+   * @param options Modal submission options.
+   */
+  async showAndAwait(interaction, options) {
+    await this.show(interaction);
+    return this.awaitSubmit(interaction, options);
   }
   /**
-   * Waits for the modal to be submitted and returns the component data.
-   * @param interaction The interaction used to show the modal
-   * @param options Options */
+   * Waits for this modal to be submitted, returning a helper utility object.
+   * @param interaction The interaction to show the modal with.
+   * @param options Modal submission options.
+   */
   async awaitSubmit(interaction, options) {
-    if (!("showModal" in interaction)) throw new Error("Interaction does not support showing modals");
+    if (!interaction) throw new Error("[BetterModal] Interaction is null or undefined");
+    const timeout = options?.timeout ?? DEFAULT_CONFIG.timeout;
     try {
       const modalSubmit = await interaction.awaitModalSubmit({
-        filter: (i) => i.customId === this.id,
-        time: options?.timeout ?? this.config.timeouts.modalSubmit,
-        ...options
+        filter: (i) => i.customId === this.customId,
+        time: timeout
       });
-      if (options?.autoDefer) {
+      if (options?.deferUpdate) {
         await modalSubmit.deferUpdate();
       }
       const fields = /* @__PURE__ */ new Map();
       const values = [];
-      for (const [customId] of this.components) {
+      for (const customId of this.components.keys()) {
         let value = null;
         try {
           value = modalSubmit.fields.getTextInputValue(customId);
@@ -3740,31 +3820,17 @@ var BetterModal = class {
         values.push(value);
       }
       return {
-        getField(customId, required) {
-          const value = fields.get(customId);
-          if (required && value === void 0) {
-            throw new Error(`ModalSubmitResult: Field ${customId} is required but was not found`);
-          }
-          return value;
-        },
         values,
         interaction: modalSubmit,
+        getField: (customId) => fields.get(customId),
         reply: (options2) => dynaSend(modalSubmit, options2),
-        deferUpdate: async (options2) => await modalSubmit.deferUpdate(options2),
-        followUp: async (options2) => await modalSubmit.followUp(options2)
+        followUp: async (options2) => dynaSend(modalSubmit, options2),
+        deferUpdate: () => modalSubmit.deferUpdate()
       };
-    } catch (error) {
+    } catch {
       return null;
     }
   }
-  /**
-   * Shows the modal and waits for the modal to be submitted, returning the component data.
-   * @param interaction The interaction used to show the modal
-   * @param options Options */
-  async showAndAwait(interaction, options) {
-    await this.show(interaction);
-    return this.awaitSubmit(interaction, options);
-  }
 };
 
 // src/tools/Paginator.ts
@@ -3989,7 +4055,7 @@ var Paginator = class {
         if (disabledNavRow.components.length > 0) {
           newComponents.push(disabledNavRow);
         }
-        await this.data.message.edit({ components: newComponents }).catch(Boolean);
+        await this.data.message.edit({ components: newComponents });
         if (this.options.useReactions) {
           await this.nav_removeFromMessage();
         }
@@ -4000,7 +4066,7 @@ var Paginator = class {
         }
         break;
       case 2 /* DeleteMessage */:
-        await this.data.message.delete().catch(Boolean);
+        await this.data.message.delete();
         break;
       case 3 /* DoNothing */:
         break;
@@ -4010,16 +4076,16 @@ var Paginator = class {
   async nav_removeFromMessage() {
     if (!this.data.message?.editable) return;
     if (this.options.useReactions) {
-      await this.data.message.reactions.removeAll().catch(Boolean);
+      await this.data.message.reactions.removeAll();
     } else {
       const newComponents = this.data.message.components.filter((c) => c.type !== import_discord14.ComponentType.Container);
-      await this.data.message.edit({ components: newComponents }).catch(Boolean);
+      await this.data.message.edit({ components: newComponents });
     }
   }
   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).catch(Boolean);
+      await this.data.message.react(r.id);
     }
   }
   async collect_components() {
@@ -4054,7 +4120,7 @@ var Paginator = class {
         }
         switch (i.customId) {
           case "ssm_chapterSelect":
-            await i.deferUpdate().catch(Boolean);
+            await i.deferUpdate();
             const chapterIndex = this.chapters.findIndex(
               (c) => c.id === i.values[0]
             );
@@ -4062,25 +4128,25 @@ var Paginator = class {
             await this.refresh();
             break;
           case "btn_first":
-            await i.deferUpdate().catch(Boolean);
+            await i.deferUpdate();
             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().catch(Boolean);
+            await i.deferUpdate();
             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().catch(Boolean);
+            await i.deferUpdate();
             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().catch(Boolean);
+            await i.deferUpdate();
             this.callEventStack("last", this.data.page.current, this.data.page.index);
             await this.setPage(
               this.data.page.index.chapter,
@@ -4478,6 +4544,7 @@ async function prompt(handler, options, sendOptions) {
   createMongoPlugin,
   createMongoSchema,
   createPrefixCommandConfig,
+  createRandomId,
   createSlashCommandConfig,
   createStaffConfig,
   createToolsConfig,