trivious 1.3.22 → 1.3.24

package/dist/index.d.cts

@@ -650,6 +650,12 @@ interface TriviousClientOptions extends ClientOptions {
      * @type {Record<string, PermissionLevel>}
      */
     rolePermissions?: Record<string, PermissionLevel>;
+    /**
+     * Discord user Ids of the bot owner(s)
+     *
+     * @type {string[]}
+     */
+    botOwnerIds?: string[];
 }
 
 /**
@@ -746,6 +752,14 @@ declare class ModuleRegistry extends BaseRegistry<Module> {
  */
 declare class EventRegistry extends BaseRegistry<Event> {
     protected items: Collection<string, Event<keyof ClientEvents>>;
+    /**
+     * Load all preset events, can be overridden by user-provided events.
+     *
+     * @async
+     * @protected
+     * @returns {Promise<this>}
+     */
+    protected loadPresetEvents(): Promise<this>;
     /**
      * Load all events.
      *
@@ -926,7 +940,7 @@ declare class TriviousClient extends Client {
      * @private
      * @type {TriviousClientOptions}
      */
-    private _options;
+    readonly _options: TriviousClientOptions;
     /**
      * Creates an instance of TriviousClient.
      *

package/dist/index.d.ts

@@ -650,6 +650,12 @@ interface TriviousClientOptions extends ClientOptions {
      * @type {Record<string, PermissionLevel>}
      */
     rolePermissions?: Record<string, PermissionLevel>;
+    /**
+     * Discord user Ids of the bot owner(s)
+     *
+     * @type {string[]}
+     */
+    botOwnerIds?: string[];
 }
 
 /**
@@ -746,6 +752,14 @@ declare class ModuleRegistry extends BaseRegistry<Module> {
  */
 declare class EventRegistry extends BaseRegistry<Event> {
     protected items: Collection<string, Event<keyof ClientEvents>>;
+    /**
+     * Load all preset events, can be overridden by user-provided events.
+     *
+     * @async
+     * @protected
+     * @returns {Promise<this>}
+     */
+    protected loadPresetEvents(): Promise<this>;
     /**
      * Load all events.
      *
@@ -926,7 +940,7 @@ declare class TriviousClient extends Client {
      * @private
      * @type {TriviousClientOptions}
      */
-    private _options;
+    readonly _options: TriviousClientOptions;
     /**
      * Creates an instance of TriviousClient.
      *

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, SlashCommandBuilder, ContextMenuCommandBuilder, InteractionContextType } from 'discord.js';
 import { existsSync, promises } from 'fs';
 import path, { dirname, join, resolve } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -488,16 +488,16 @@ var getPermissionLevel = (client, member) => {
 
 // src/shared/utility/functions.ts
 var __filename$1 = fileURLToPath(import.meta.url);
-var __dirname$1 = dirname(__filename$1);
+var __dirname2 = dirname(__filename$1);
 var getPackageRoot = () => {
-  let dir = __dirname$1;
+  let dir = __dirname2;
   while (dir !== dirname(dir)) {
     if (existsSync(join(dir, "package.json")) || existsSync(join(dir, "node_modules"))) {
       return dir;
     }
     dir = dirname(dir);
   }
-  return __dirname$1;
+  return __dirname2;
 };
 var FRAMEWORK_PACKAGE_ROOT = getPackageRoot();
 function getCorePath(options) {
@@ -541,10 +541,9 @@ async function exists(path2) {
 }
 function hasPermission(client, options) {
   const { permission, user, member } = options;
-  if (user) {
-    if (permission === 5 /* BOT_OWNER */) return user.id === "424764032667484171";
-    return true;
-  }
+  if (permission === 5 /* BOT_OWNER */ && client._options.botOwnerIds)
+    return user ? client._options.botOwnerIds.includes(user.id) : member ? client._options.botOwnerIds.includes(member.id) : false;
+  if (user) return true;
   if (member) {
     const memberPermission = getPermissionLevel(client, member);
     return memberPermission >= permission;
@@ -697,69 +696,28 @@ var ComponentRegistry = class extends BaseRegistry {
     return this;
   }
 };
-var interactionCreate_default = {
-  name: "interactionCreate",
-  execute: async (client, interaction) => {
-    if (interaction.isChatInputCommand() || interaction.isContextMenuCommand()) {
-      const { commandName } = interaction;
-      const registeredCommands = client.registries.commands.get();
-      const command = registeredCommands.get(commandName);
-      if (!command) {
-        await interaction.reply({
-          content: `Command is outdated, inactive or does not have a handler!`,
-          flags: ["Ephemeral"]
-        });
-        return;
-      }
-      const requiredPermission = command.metadata.permission;
-      const hasPermission2 = await command.validateGuildPermission(
-        client,
-        interaction,
-        requiredPermission
-      );
-      if (!hasPermission2) return;
-      if (!("execute" in command)) {
-        await command.reply(interaction, { content: "Command does not have a way to execute! Ensure the command is a SlashCommand or ContextMenuCommand!" });
-        return;
-      }
-      await command.reply(interaction, { content: "Processing command..." });
-      if (interaction.isChatInputCommand() && command.isSlashCommand()) {
-        await command.execute(client, interaction);
-      } else if (interaction.isContextMenuCommand() && command.isContextMenuCommand()) {
-        await command.execute(client, interaction);
-      }
-    } else if (interaction.isMessageComponent() || interaction.isModalSubmit()) {
-      const { componentType, tags, data } = deconstructCustomId(interaction.customId);
-      if (componentType === "button" /* Button */ && !(interaction instanceof ButtonInteraction))
-        return;
-      if (componentType === "modal" /* Modal */ && !(interaction instanceof ModalSubmitInteraction))
-        return;
-      if (tags.includes("awaited")) return;
-      const registeredComponents = client.registries.components.get();
-      const component = registeredComponents.get(data);
-      if (!component) {
-        await interaction.reply({
-          content: `Command is outdated, inactive or does not have a handler!`,
-          flags: ["Ephemeral"]
-        });
-        return;
-      }
-      const requiredPermission = component.metadata.permission;
-      const hasPermission2 = await component.validateGuildPermission(
-        client,
-        interaction,
-        requiredPermission
-      );
-      if (!hasPermission2) return;
-      if (!interaction.isModalSubmit()) await interaction.deferUpdate();
-      await component.execute(client, interaction);
-    }
-  }
-};
-
-// src/core/registry/event.registry.ts
 var EventRegistry = class extends BaseRegistry {
   items = new Collection();
+  /**
+   * Load all preset events, can be overridden by user-provided events.
+   *
+   * @async
+   * @protected
+   * @returns {Promise<this>}
+   */
+  async loadPresetEvents() {
+    const directory = join(__dirname, "../events");
+    const entries = await promises.readdir(directory, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join(directory, entry.name);
+      if (!entry.isFile() || !entry.name.endsWith(".js")) continue;
+      const event = await this.importFile(fullPath);
+      if (!event) continue;
+      if (this.items.has(event.name)) continue;
+      this.items.set(event.name, event);
+    }
+    return this;
+  }
   /**
    * Load all events.
    *
@@ -782,7 +740,7 @@ var EventRegistry = class extends BaseRegistry {
         this.items.set(event.name, event);
       }
     }
-    this.items.set(interactionCreate_default.name, interactionCreate_default);
+    await this.loadPresetEvents();
     return this;
   }
   /**