Merge pull request #172 from ghostdevv/tweaks

Author: ghostdevv

packages/jellycommands/src/commands/resolve.ts

@@ -13,16 +13,17 @@ export const resolveCommands = async (
         if (!(command instanceof BaseCommand))
             throw new Error(`Found invalid item "${command}" in options.commands`);
 
-        commands.add(command);
+        // Don't load disabled commands
+        if (!command.options.disabled) {
+            commands.add(command);
+        }
     });
 
     const globalCommands: GlobalCommands = new Set();
     const guildCommands: GuildCommands = new Map();
 
     for (const command of commands) {
         if (command.options.disabled) {
-            // commands is a Set and doesn't have a convenient filter function
-            // so delete the disabled commands in this loop
             commands.delete(command);
             continue;
         }

packages/jellycommands/src/commands/respond.ts

@@ -32,12 +32,15 @@ export async function respond(data: CommandReponseData): Promise<void> {
     const options = command.options;
 
     // If autocomplete interaction, run options.autocomplete
-    if (interaction.isAutocomplete())
-        /** @todo Duck you typescript */
-        return void (command as unknown as Command).autocomplete?.({
-            interaction,
-            client,
-        });
+    if (interaction.isAutocomplete()) {
+        if (command instanceof Command)
+            await command.autocomplete?.({
+                interaction,
+                client,
+            });
+
+        return;
+    }
 
     // If defer, defer
     if (options.defer)

packages/jellycommands/src/events/register.ts

@@ -12,11 +12,17 @@ export const registerEvents = async (
         if (!(event instanceof Event))
             throw new Error(`Found invalid item "${event}" in options.events`);
 
-        events.add(event);
+        // Don't load disabled events
+        if (!event.options.disabled) {
+            events.add(event);
+        }
     });
 
     for (const event of events) {
-        if (event.options.disabled) continue;
+        if (event.options.disabled) {
+            events.delete(event);
+            continue;
+        }
 
         const cb = async (...ctx: any[]) => {
             try {