trivious 1.3.7 → 1.3.9

package/dist/index.js

@@ -1,5 +1,5 @@
 import 'util';
-import { Collection, SlashCommandSubcommandBuilder, Client, REST, Routes, SlashCommandBuilder, ContextMenuCommandBuilder, InteractionContextType, ButtonInteraction, ModalSubmitInteraction } from 'discord.js';
+import { Collection, SlashCommandSubcommandBuilder, Client, REST, Routes, ContextMenuCommandBuilder, SlashCommandBuilder, InteractionContextType, ButtonInteraction, ModalSubmitInteraction } from 'discord.js';
 export { ClientEvents, Collection } from 'discord.js';
 import { existsSync, promises } from 'fs';
 import path, { dirname, join, resolve } from 'path';
@@ -543,14 +543,12 @@ async function exists(path2) {
 function hasPermission(client, options) {
   const { permission, user, member } = options;
   if (user) {
-    if (permission === 5 /* BOT_OWNER */) {
-      return !(user.id === "424764032667484171");
-    }
+    if (permission === 5 /* BOT_OWNER */) return user.id === "424764032667484171";
     return true;
   }
   if (member) {
     const memberPermission = getPermissionLevel(client, member);
-    return permission > memberPermission;
+    return memberPermission >= permission;
   }
   return false;
 }
@@ -953,6 +951,94 @@ var TriviousClient = class extends Client {
     return this._options.rolePermissions ?? {};
   }
 };
+var ContextMenuCommand = class extends Command {
+  /**
+   * Base command handler.
+   *
+   * @public
+   * @async
+   * @param {TriviousClient} client
+   * @param {ContextMenuCommandInteraction} interaction
+   * @returns {*}
+   */
+  async execute(client, interaction) {
+    const { run, metadata } = this;
+    const memberHasPermission = await this.validateGuildPermission(
+      client,
+      interaction,
+      metadata.permission,
+      false
+    );
+    if (memberHasPermission) await run(client, interaction);
+  }
+};
+var ContextMenuBuilder = class extends ContextMenuCommandBuilder {
+  _active = true;
+  _ownerOnly = false;
+  _permission = 0 /* USER */;
+  _ephemeralReply = false;
+  /**
+   * Set the command as disabled.
+   *
+   * @public
+   * @returns {this}
+   */
+  disable() {
+    this._active = false;
+    return this;
+  }
+  /**
+   * Set the command as owner only.
+   *
+   * @public
+   * @returns {this}
+   */
+  setOwnerOnly() {
+    this._permission = 5 /* BOT_OWNER */;
+    this._ownerOnly = true;
+    return this;
+  }
+  /**
+   * Set the permission level required to run the command.
+   *
+   * @public
+   * @param {PermissionLevel} permission
+   * @returns {this}
+   */
+  setPermission(permission) {
+    this._permission = permission;
+    return this;
+  }
+  /**
+   * Set the interaction as ephemeral.
+   *
+   * @public
+   * @returns {this}
+   */
+  setEphemeralReply() {
+    this._ephemeralReply = true;
+    return this;
+  }
+  /**
+   * Build the builder
+   *
+   * @public
+   * @returns {{ data: ContextMenuBuilder; metadata: ContextMenuMetadata; }}
+   */
+  build() {
+    return {
+      data: this,
+      metadata: {
+        active: this._active,
+        ownerOnly: this._ownerOnly,
+        permission: this._permission,
+        ephemeralReply: this._ephemeralReply
+      }
+    };
+  }
+};
+
+// src/core/commands/command.base.ts
 var Command = class {
   /**
    * Returns whether the command is a SlashCommand.
@@ -962,7 +1048,7 @@ var Command = class {
    * @returns {this is SlashCommand}
    */
   isSlashCommand() {
-    return this.data instanceof SlashCommandBuilder;
+    return this.data instanceof SlashCommandBuilder && this instanceof SlashCommand;
   }
   /**
    * Returns whether the command is a ContextMenuCommand.
@@ -972,7 +1058,7 @@ var Command = class {
    * @returns {this is ContextMenuCommand}
    */
   isContextMenuCommand() {
-    return this.data instanceof ContextMenuCommandBuilder;
+    return this.data instanceof ContextMenuCommandBuilder && this instanceof ContextMenuCommand;
   }
   /**
    * Returns JSON of the command builder.
@@ -1025,6 +1111,48 @@ var Command = class {
     return memberHasPermission;
   }
 };
+var SlashCommand = class extends Command {
+  /**
+   * General handler for the command and its subcommand, if applicable.
+   *
+   * @public
+   * @async
+   * @param {TriviousClient} client
+   * @param {ChatInputCommandInteraction} interaction
+   * @returns {*}
+   */
+  async execute(client, interaction) {
+    const { run, reply, metadata } = this;
+    const { options } = interaction;
+    if (run) {
+      const memberHasPermission2 = await this.validateGuildPermission(
+        client,
+        interaction,
+        metadata.permission,
+        false
+      );
+      if (memberHasPermission2) await run(client, interaction);
+    }
+    const subcommands = metadata.subcommands;
+    if (subcommands.size <= 0) return;
+    const subcommand = metadata.subcommands.find(
+      (subcmd) => subcmd.data.name === options.getSubcommand()
+    );
+    if (!subcommand) {
+      await reply(interaction, {
+        content: "Ran subcommand is outdated or does not have a handler!"
+      });
+      return;
+    }
+    const memberHasPermission = await this.validateGuildPermission(
+      client,
+      interaction,
+      subcommand.metadata.permission
+    );
+    if (!memberHasPermission) return;
+    await subcommand.execute(client, interaction);
+  }
+};
 var CommandBuilder = class extends SlashCommandBuilder {
   _active = true;
   _guildOnly = false;
@@ -1190,92 +1318,6 @@ var Subcommand = class {
     await interaction.reply(newOptions);
   }
 };
-var ContextMenuCommand = class extends Command {
-  /**
-   * Base command handler.
-   *
-   * @public
-   * @async
-   * @param {TriviousClient} client
-   * @param {ContextMenuCommandInteraction} interaction
-   * @returns {*}
-   */
-  async execute(client, interaction) {
-    const { run, metadata } = this;
-    const memberHasPermission = await this.validateGuildPermission(
-      client,
-      interaction,
-      metadata.permission,
-      false
-    );
-    if (memberHasPermission) await run(client, interaction);
-  }
-};
-var ContextMenuBuilder = class extends ContextMenuCommandBuilder {
-  _active = true;
-  _ownerOnly = false;
-  _permission = 0 /* USER */;
-  _ephemeralReply = false;
-  /**
-   * Set the command as disabled.
-   *
-   * @public
-   * @returns {this}
-   */
-  disable() {
-    this._active = false;
-    return this;
-  }
-  /**
-   * Set the command as owner only.
-   *
-   * @public
-   * @returns {this}
-   */
-  setOwnerOnly() {
-    this._permission = 5 /* BOT_OWNER */;
-    this._ownerOnly = true;
-    return this;
-  }
-  /**
-   * Set the permission level required to run the command.
-   *
-   * @public
-   * @param {PermissionLevel} permission
-   * @returns {this}
-   */
-  setPermission(permission) {
-    this._permission = permission;
-    return this;
-  }
-  /**
-   * Set the interaction as ephemeral.
-   *
-   * @public
-   * @returns {this}
-   */
-  setEphemeralReply() {
-    this._ephemeralReply = true;
-    return this;
-  }
-  /**
-   * Build the builder
-   *
-   * @public
-   * @returns {{ data: ContextMenuBuilder; metadata: ContextMenuMetadata; }}
-   */
-  build() {
-    return {
-      data: this,
-      metadata: {
-        active: this._active,
-        ownerOnly: this._ownerOnly,
-        permission: this._permission,
-        ephemeralReply: this._ephemeralReply
-      }
-    };
-  }
-};
 
 // src/core/components/component.base.ts
 var ComponentBuilder = class {
@@ -1378,6 +1420,6 @@ var Component = class {
   }
 };
 
-export { BaseRegistry, Command, CommandBuilder, CommandRegistry, Component, ComponentBuilder, ComponentRegistry, ComponentType, ContextMenuBuilder, ContextMenuCommand, PermissionLevel, Subcommand, SubcommandBuilder, TriviousClient, deconstructCustomId, getPermissionLevel };
+export { BaseRegistry, Command, CommandBuilder, CommandRegistry, Component, ComponentBuilder, ComponentRegistry, ComponentType, ContextMenuBuilder, ContextMenuCommand, PermissionLevel, SlashCommand, Subcommand, SubcommandBuilder, TriviousClient, deconstructCustomId, getPermissionLevel };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map