seyfert 1.3.3 → 1.4.0

package/lib/commands/handler.js

@@ -6,6 +6,7 @@ const node_path_1 = require("node:path");
 const common_1 = require("../common");
 const chat_1 = require("./applications/chat");
 const menu_1 = require("./applications/menu");
+const node_fs_1 = require("node:fs");
 class CommandHandler extends common_1.BaseHandler {
     logger;
     client;
@@ -34,8 +35,129 @@ class CommandHandler extends common_1.BaseHandler {
             }
         }
     }
-    async load(commandsDir, client) {
-        const result = (await this.loadFilesK(await this.getFiles(commandsDir))).filter(x => x.file);
+    shouldUploadOption(option, cached) {
+        if (option.description !== cached.description)
+            return true;
+        if (option.type !== cached.type)
+            return true;
+        if (option.required !== cached.required)
+            return true;
+        if (option.name !== cached.name)
+            return true;
+        //TODO: locales
+        switch (option.type) {
+            case v10_1.ApplicationCommandOptionType.String:
+                return (option.min_length !== cached.min_length ||
+                    option.max_length !== cached.max_length);
+            case v10_1.ApplicationCommandOptionType.Channel:
+                {
+                    if (option.channel_types?.length !== cached.channel_types?.length)
+                        return true;
+                    if ('channel_types' in option && 'channel_types' in cached) {
+                        if (!option.channel_types || !cached.channel_types)
+                            return true;
+                        return option.channel_types.some(ct => !cached.channel_types.includes(ct));
+                    }
+                }
+                return;
+            case v10_1.ApplicationCommandOptionType.Subcommand:
+            case v10_1.ApplicationCommandOptionType.SubcommandGroup:
+                if (option.options?.length !==
+                    cached.options?.length) {
+                    return true;
+                }
+                if (option.options &&
+                    cached.options)
+                    for (const i of option.options) {
+                        const cachedOption = cached.options.find(x => x.name === i.name);
+                        if (!cachedOption)
+                            return true;
+                        if (this.shouldUploadOption(i, cachedOption))
+                            return true;
+                    }
+                break;
+            case v10_1.ApplicationCommandOptionType.Integer:
+            case v10_1.ApplicationCommandOptionType.Number:
+                return (option.min_value !== cached.min_value ||
+                    option.max_value !== cached.max_value);
+            case v10_1.ApplicationCommandOptionType.Attachment:
+            case v10_1.ApplicationCommandOptionType.Boolean:
+            case v10_1.ApplicationCommandOptionType.Mentionable:
+            case v10_1.ApplicationCommandOptionType.Role:
+            case v10_1.ApplicationCommandOptionType.User:
+                break;
+        }
+        return false;
+    }
+    async shouldUpload(file) {
+        if (!(await node_fs_1.promises.access(file).then(() => true, () => false))) {
+            await node_fs_1.promises.writeFile(file, JSON.stringify(this.values.map(x => x.toJSON())));
+            return true;
+        }
+        const cachedCommands = JSON.parse((await node_fs_1.promises.readFile(file)).toString());
+        if (cachedCommands.length !== this.values.length)
+            return true;
+        for (const command of this.values.map(x => x.toJSON())) {
+            const cached = cachedCommands.find(x => {
+                if (x.name !== command.name)
+                    return false;
+                if (command.guild_id)
+                    return command.guild_id.every(id => x.guild_id?.includes(id));
+                return true;
+            });
+            if (!cached)
+                return true;
+            if (cached.description !== command.description)
+                return true;
+            if (cached.default_member_permissions !== command.default_member_permissions)
+                return true;
+            if (cached.type !== command.type)
+                return true;
+            if (cached.nsfw !== command.nsfw)
+                return true;
+            if (!!('options' in cached) !== !!('options' in command))
+                return true;
+            if (!!cached.contexts !== !!command.contexts)
+                return true;
+            if (!!cached.integration_types !== !!command.integration_types)
+                return true;
+            //TODO: locales
+            if ('contexts' in command && 'contexts' in cached) {
+                if (command.contexts?.length !== cached.contexts?.length)
+                    return true;
+                if (command.contexts && cached.contexts) {
+                    if (command.contexts.some(ctx => !cached.contexts.includes(ctx)))
+                        return true;
+                }
+            }
+            if ('integration_types' in command && 'integration_types' in cached) {
+                if (command.integration_types?.length !== cached.integration_types?.length)
+                    return true;
+                if (command.integration_types && cached.integration_types) {
+                    if (command.integration_types.some(ctx => !cached.integration_types.includes(ctx)))
+                        return true;
+                }
+            }
+            if ('options' in command && 'options' in cached) {
+                if (command.options.length !== cached.options.length)
+                    return true;
+                for (const option of command.options) {
+                    const cachedOption = cached.options.find(x => x.name === option.name);
+                    if (!cachedOption)
+                        return true;
+                    if (this.shouldUploadOption(option, cachedOption))
+                        return true;
+                }
+            }
+        }
+        return false;
+    }
+    async load(commandsDir, client, instances) {
+        const result = instances?.map(x => {
+            const i = new x();
+            return { name: i.name, file: x, path: i.__filePath ?? '*' };
+        }) ??
+            (await this.loadFilesK(await this.getFiles(commandsDir))).filter(x => x.file);
         this.values = [];
         for (const command of result) {
             let commandInstance;
@@ -45,7 +167,7 @@ class CommandHandler extends common_1.BaseHandler {
                     continue;
             }
             catch (e) {
-                if (e instanceof Error && e.message === 'command.file is not a constructor') {
+                if (e instanceof Error && e.message.includes('is not a constructor')) {
                     this.logger.warn(`${command.path
                         .split(process.cwd())
                         .slice(1)

package/lib/common/bot/watcher.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import type { GatewayDispatchPayload, GatewaySendPayload } from 'discord-api-types/v10';
-import { Worker } from 'node:worker_threads';
 import { ApiHandler } from '../../api';
 import { ShardManager, type ShardManagerOptions } from '../../websocket';
 import { Logger } from '../it/logger';
@@ -9,7 +8,7 @@ import type { MakeRequired } from '../types/util';
  * Represents a watcher class that extends the ShardManager.
  */
 export declare class Watcher extends ShardManager {
-    worker?: Worker;
+    worker?: import('node:worker_threads').Worker;
     logger: Logger;
     rest?: ApiHandler;
     options: MakeRequired<WatcherOptions, 'intents' | 'token' | 'handlePayload' | 'info'>;

package/lib/common/bot/watcher.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Watcher = void 0;
-const chokidar_1 = require("chokidar");
 const node_child_process_1 = require("node:child_process");
-const node_worker_threads_1 = require("node:worker_threads");
 const api_1 = require("../../api");
 const base_1 = require("../../client/base");
 const websocket_1 = require("../../websocket");
 const logger_1 = require("../it/logger");
+const utils_1 = require("../it/utils");
 /**
  * Represents a watcher class that extends the ShardManager.
  */
@@ -43,11 +42,14 @@ class Watcher extends websocket_1.ShardManager {
      * Resets the worker instance.
      */
     resetWorker() {
+        const worker_threads = (0, utils_1.lazyLoadPackage)('node:worker_threads');
+        if (!worker_threads)
+            throw new Error('Cannot use worker_threads');
         if (this.worker) {
             this.worker.terminate();
         }
         this.build();
-        this.worker = new node_worker_threads_1.Worker(this.options.filePath, {
+        this.worker = new worker_threads.Worker(this.options.filePath, {
             argv: this.options.argv,
             workerData: {
                 __USING_WATCHER__: true,
@@ -87,7 +89,10 @@ class Watcher extends websocket_1.ShardManager {
         };
         this.connectQueue.concurrency = this.options.info.session_start_limit.max_concurrency;
         await super.spawnShards();
-        const watcher = (0, chokidar_1.watch)(this.options.srcPath).on('ready', () => {
+        const chokidar = (0, utils_1.lazyLoadPackage)('chokidar');
+        if (!chokidar?.watch)
+            return this.logger.warn('No chokidar installed.');
+        const watcher = chokidar.watch(this.options.srcPath).on('ready', () => {
             this.logger.debug(`Watching ${this.options.srcPath}`);
             watcher.on('all', event => {
                 this.logger.debug(`${event} event detected, building`);

package/lib/common/it/logger.d.ts

@@ -13,7 +13,7 @@ export type LoggerOptions = {
     active?: boolean;
     saveOnFile?: boolean;
 };
-export type CustomCallback = (self: Logger, level: LogLevels, args: unknown[]) => unknown[];
+export type CustomCallback = (self: Logger, level: LogLevels, args: unknown[]) => unknown[] | undefined;
 /**
  * Represents a logger utility for logging messages with various log levels.
  */

package/lib/common/it/logger.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = exports.LogLevels = void 0;
 const node_fs_1 = require("node:fs");
-const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const colors_1 = require("./colors");
 const utils_1 = require("./utils");
@@ -42,11 +41,11 @@ class Logger {
         Logger.__callback = cb;
     }
     static async clearLogs() {
-        for (const i of await (0, promises_1.readdir)((0, node_path_1.join)(process.cwd(), Logger.dirname))) {
-            if (this.streams[i])
-                await new Promise(res => this.streams[i].close(res));
-            await (0, promises_1.unlink)((0, node_path_1.join)(process.cwd(), Logger.dirname, i)).catch(() => { });
-            delete this.streams[i];
+        for (const i of await node_fs_1.promises.readdir((0, node_path_1.join)(process.cwd(), Logger.dirname), { withFileTypes: true })) {
+            if (this.streams[i.name])
+                await new Promise(res => this.streams[i.name].close(res));
+            await node_fs_1.promises.unlink((0, node_path_1.join)(process.cwd(), Logger.dirname, i.name)).catch(() => { });
+            delete this.streams[i.name];
         }
     }
     /**
@@ -112,10 +111,10 @@ class Logger {
         let log;
         if (!Logger.__callback) {
             const color = Logger.colorFunctions.get(level) ?? Logger.noColor;
-            const memoryData = process.memoryUsage();
+            const memoryData = process.memoryUsage?.();
             const date = new Date();
             log = [
-                (0, colors_1.brightBlack)(formatMemoryUsage(memoryData.rss)),
+                (0, colors_1.brightBlack)(formatMemoryUsage(memoryData?.rss ?? 0)),
                 (0, colors_1.bgBrightWhite)((0, colors_1.black)(`[${date.toLocaleDateString()} ${date.toLocaleTimeString()}]`)),
                 color(Logger.prefixes.get(level) ?? 'DEBUG'),
                 this.name ? `${this.name} >` : '>',
@@ -125,6 +124,8 @@ class Logger {
         else {
             log = Logger.__callback(this, level, args);
         }
+        if (!log)
+            return;
         this.__write(log);
         return console.log(...log);
     }

package/lib/common/it/utils.d.ts

@@ -95,3 +95,5 @@ export type OnFailCallback = (error: unknown) => any;
 export declare function fakePromise<T = unknown | Promise<unknown>>(value: T): {
     then<R>(callback: (arg: Awaited<T>) => R): R;
 };
+export declare function lazyLoadPackage<T>(mod: string): T | undefined;
+export declare function isCloudfareWorker(): boolean;

package/lib/common/it/utils.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fakePromise = exports.magicImport = exports.ReplaceRegex = exports.toCamelCase = exports.toSnakeCase = exports.BaseHandler = exports.filterSplit = exports.MergeOptions = exports.isObject = exports.delay = exports.resolveColor = void 0;
-const promises_1 = require("node:fs/promises");
+exports.isCloudfareWorker = exports.lazyLoadPackage = exports.fakePromise = exports.magicImport = exports.ReplaceRegex = exports.toCamelCase = exports.toSnakeCase = exports.BaseHandler = exports.filterSplit = exports.MergeOptions = exports.isObject = exports.delay = exports.resolveColor = void 0;
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const promises_2 = require("node:timers/promises");
 const __1 = require("..");
 /**
  * Resolves the color to a numeric representation.
@@ -39,7 +38,7 @@ exports.resolveColor = resolveColor;
  * @returns A Promise that resolves after the specified time with the provided result.
  */
 function delay(time, result) {
-    return (0, promises_2.setTimeout)(time, result);
+    return new Promise(r => setTimeout(r, time, result));
 }
 exports.delay = delay;
 /**
@@ -115,7 +114,7 @@ class BaseHandler {
      */
     async getFiles(dir) {
         const files = [];
-        for (const i of await (0, promises_1.readdir)(dir, { withFileTypes: true })) {
+        for (const i of await node_fs_1.promises.readdir(dir, { withFileTypes: true })) {
             if (i.isDirectory()) {
                 files.push(...(await this.getFiles((0, node_path_1.join)(dir, i.name))));
             }
@@ -254,3 +253,18 @@ function fakePromise(value) {
     };
 }
 exports.fakePromise = fakePromise;
+function lazyLoadPackage(mod) {
+    try {
+        return require(mod);
+    }
+    catch (e) {
+        console.log(`Cannot import ${mod}`);
+        return;
+    }
+}
+exports.lazyLoadPackage = lazyLoadPackage;
+function isCloudfareWorker() {
+    //@ts-expect-error
+    return process.platform === 'browser';
+}
+exports.isCloudfareWorker = isCloudfareWorker;

package/lib/common/shorters/interaction.js

@@ -15,7 +15,7 @@ class InteractionShorter extends base_1.BaseShorter {
             body: __1.BaseInteraction.transformBodyRequest({
                 type: body.type,
                 data,
-            }),
+            }, this.client),
             files: files ? await (0, __1.resolveFiles)(files) : undefined,
         });
     }
@@ -31,7 +31,7 @@ class InteractionShorter extends base_1.BaseShorter {
             .webhooks(this.client.applicationId)(token)
             .messages(messageId)
             .patch({
-            body: __1.BaseInteraction.transformBody(data),
+            body: __1.BaseInteraction.transformBody(data, this.client),
             files: files ? await (0, __1.resolveFiles)(files) : undefined,
         });
         return new __1.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
@@ -54,7 +54,7 @@ class InteractionShorter extends base_1.BaseShorter {
         const apiMessage = await this.client.proxy
             .webhooks(this.client.applicationId)(token)
             .post({
-            body: __1.BaseInteraction.transformBody(body),
+            body: __1.BaseInteraction.transformBody(body, this.client),
             files: files,
         });
         return new __1.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);

package/lib/common/shorters/messages.js

@@ -7,7 +7,7 @@ const base_1 = require("./base");
 class MessageShorter extends base_1.BaseShorter {
     async write(channelId, { files, ...body }) {
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : [];
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, this.client);
         return this.client.proxy
             .channels(channelId)
             .messages.post({
@@ -25,7 +25,7 @@ class MessageShorter extends base_1.BaseShorter {
             .channels(channelId)
             .messages(messageId)
             .patch({
-            body: structures_1.MessagesMethods.transformMessageBody(body),
+            body: structures_1.MessagesMethods.transformMessageBody(body, this.client),
             files: parsedFiles,
         })
             .then(async (message) => {

package/lib/common/shorters/webhook.js

@@ -67,7 +67,7 @@ class WebhookShorter extends base_1.BaseShorter {
      */
     async writeMessage(webhookId, token, { body: data, ...payload }) {
         const { files, ...body } = data;
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, this.client);
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : [];
         return this.client.proxy
             .webhooks(webhookId)(token)
@@ -84,7 +84,7 @@ class WebhookShorter extends base_1.BaseShorter {
      */
     async editMessage(webhookId, token, { messageId, body: data, ...json }) {
         const { files, ...body } = data;
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, this.client);
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : [];
         return this.client.proxy
             .webhooks(webhookId)(token)

package/lib/components/componentcommand.d.ts

@@ -0,0 +1,21 @@
+import type { ContextComponentCommandInteractionMap, ComponentContext } from './componentcontext';
+import type { RegisteredMiddlewares, UsingClient } from '../commands';
+export declare const InteractionCommandType: {
+    readonly COMPONENT: 0;
+    readonly MODAL: 1;
+};
+export interface ComponentCommand {
+    __filePath?: string;
+}
+export declare abstract class ComponentCommand {
+    type: 0;
+    abstract componentType: keyof ContextComponentCommandInteractionMap;
+    abstract filter(context: ComponentContext<typeof this.componentType>): Promise<boolean> | boolean;
+    abstract run(context: ComponentContext<typeof this.componentType>): any;
+    get cType(): number;
+    onAfterRun?(context: ComponentContext, error: unknown | undefined): any;
+    onRunError?(context: ComponentContext, error: unknown): any;
+    onMiddlewaresError?(context: ComponentContext, error: string): any;
+    onInternalError?(client: UsingClient, error?: unknown): any;
+    middlewares: (keyof RegisteredMiddlewares)[];
+}

package/lib/components/{command.js → componentcommand.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModalCommand = exports.ComponentCommand = exports.InteractionCommandType = void 0;
+exports.ComponentCommand = exports.InteractionCommandType = void 0;
 const v10_1 = require("discord-api-types/v10");
 exports.InteractionCommandType = {
     COMPONENT: 0,
@@ -11,9 +11,6 @@ class ComponentCommand {
     get cType() {
         return v10_1.ComponentType[this.componentType];
     }
+    middlewares = [];
 }
 exports.ComponentCommand = ComponentCommand;
-class ModalCommand {
-    type = exports.InteractionCommandType.MODAL;
-}
-exports.ModalCommand = ModalCommand;

package/lib/components/componentcontext.d.ts

@@ -1,26 +1,25 @@
-import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, ComponentInteraction, Guild, GuildMember, MentionableSelectMenuInteraction, Message, ReturnCache, RoleSelectMenuInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction, WebhookMessage } from '..';
-import type { ExtendContext, UsingClient } from '../commands';
-import { BaseContext } from '../commands/basecontex';
-import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, When } from '../common';
-export interface ComponentContext<Type extends keyof ComponentCommandInteractionMap> extends BaseContext, ExtendContext {
+import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, ComponentCommand, Guild, GuildMember, MentionableSelectMenuInteraction, Message, ReturnCache, RoleSelectMenuInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction, WebhookMessage } from '..';
+import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
+import { BaseContext } from '../commands/basecontext';
+import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+export interface ComponentContext<Type extends keyof ContextComponentCommandInteractionMap = keyof ContextComponentCommandInteractionMap> extends BaseContext, ExtendContext {
 }
 /**
  * Represents a context for interacting with components in a Discord bot.
  * @template Type - The type of component interaction.
  */
-export declare class ComponentContext<Type extends keyof ComponentCommandInteractionMap> extends BaseContext {
+export declare class ComponentContext<Type extends keyof ContextComponentCommandInteractionMap, M extends keyof RegisteredMiddlewares = never> extends BaseContext {
     readonly client: UsingClient;
-    interaction: ComponentCommandInteractionMap[Type] | ComponentInteraction;
+    interaction: ContextComponentCommandInteractionMap[Type];
     /**
      * Creates a new instance of the ComponentContext class.
      * @param client - The UsingClient instance.
      * @param interaction - The component interaction object.
      */
-    constructor(client: UsingClient, interaction: ComponentCommandInteractionMap[Type] | ComponentInteraction);
-    /**
-     * Gets the proxy object.
-     */
-    get proxy(): import("..").APIRoutes;
+    constructor(client: UsingClient, interaction: ContextComponentCommandInteractionMap[Type]);
+    command?: ComponentCommand;
+    metadata: CommandMetadata<UnionToTuple<M>>;
+    globalMetadata: GlobalMetadata;
     /**
      * Gets the language object for the interaction's locale.
      */
@@ -63,6 +62,7 @@ export declare class ComponentContext<Type extends keyof ComponentCommandInterac
      * @returns A promise that resolves when the response is deleted.
      */
     deleteResponse(): Promise<void | undefined>;
+    modal(body: ModalCreateBodyRequest): Promise<void>;
     /**
      * Gets the channel of the interaction.
      * @param mode - The mode to fetch the channel.
@@ -100,13 +100,17 @@ export declare class ComponentContext<Type extends keyof ComponentCommandInterac
      * Gets the member of the interaction.
      */
     get member(): import("..").InteractionGuildMember | undefined;
-    isComponent(): this is ComponentContext<keyof ComponentCommandInteractionMap>;
+    isComponent(): this is ComponentContext<keyof ContextComponentCommandInteractionMap>;
+    isButton(): this is ComponentContext<'Button'>;
+    isChannelSelectMenu(): this is ComponentContext<'ChannelSelect'>;
+    isRoleSelectMenu(): this is ComponentContext<'RoleSelect'>;
+    isMentionableSelectMenu(): this is ComponentContext<'MentionableSelect'>;
+    isUserSelectMenu(): this is ComponentContext<'UserSelect'>;
+    isStringSelectMenu(): this is ComponentContext<'StringSelect'>;
 }
-export interface ComponentCommandInteractionMap {
-    ActionRow: never;
+export interface ContextComponentCommandInteractionMap {
     Button: ButtonInteraction;
     StringSelect: StringSelectMenuInteraction;
-    TextInput: never;
     UserSelect: UserSelectMenuInteraction;
     RoleSelect: RoleSelectMenuInteraction;
     MentionableSelect: MentionableSelectMenuInteraction;

package/lib/components/componentcontext.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentContext = void 0;
 const v10_1 = require("discord-api-types/v10");
-const basecontex_1 = require("../commands/basecontex");
+const basecontext_1 = require("../commands/basecontext");
 /**
  * Represents a context for interacting with components in a Discord bot.
  * @template Type - The type of component interaction.
  */
-class ComponentContext extends basecontex_1.BaseContext {
+class ComponentContext extends basecontext_1.BaseContext {
     client;
     interaction;
     /**
@@ -20,17 +20,14 @@ class ComponentContext extends basecontex_1.BaseContext {
         this.client = client;
         this.interaction = interaction;
     }
-    /**
-     * Gets the proxy object.
-     */
-    get proxy() {
-        return this.client.proxy;
-    }
+    command;
+    metadata = {};
+    globalMetadata = {};
     /**
      * Gets the language object for the interaction's locale.
      */
     get t() {
-        return this.client.langs.get(this.interaction?.locale ?? this.client.langs?.defaultLang ?? 'en-US');
+        return this.client.t(this.interaction?.locale ?? this.client.langs?.defaultLang ?? 'en-US');
     }
     /**
      * Gets the custom ID of the interaction.
@@ -82,6 +79,9 @@ class ComponentContext extends basecontex_1.BaseContext {
     deleteResponse() {
         return this.interaction.deleteResponse();
     }
+    modal(body) {
+        return this.interaction.modal(body);
+    }
     channel(mode = 'cache') {
         if (this.interaction?.channel && mode === 'cache')
             return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
@@ -134,5 +134,23 @@ class ComponentContext extends basecontex_1.BaseContext {
     isComponent() {
         return true;
     }
+    isButton() {
+        return this.interaction.data.componentType === v10_1.ComponentType.Button;
+    }
+    isChannelSelectMenu() {
+        return this.interaction.componentType === v10_1.ComponentType.ChannelSelect;
+    }
+    isRoleSelectMenu() {
+        return this.interaction.componentType === v10_1.ComponentType.RoleSelect;
+    }
+    isMentionableSelectMenu() {
+        return this.interaction.componentType === v10_1.ComponentType.MentionableSelect;
+    }
+    isUserSelectMenu() {
+        return this.interaction.componentType === v10_1.ComponentType.UserSelect;
+    }
+    isStringSelectMenu() {
+        return this.interaction.componentType === v10_1.ComponentType.StringSelect;
+    }
 }
 exports.ComponentContext = ComponentContext;

package/lib/components/handler.d.ts

@@ -1,10 +1,13 @@
 /// <reference types="node" />
 import type { ComponentCallback, ListenerOptions, ModalSubmitCallback } from '../builders/types';
 import { LimitedCollection } from '../collection';
-import type { UsingClient } from '../commands';
+import { type UsingClient } from '../commands';
 import { BaseHandler, type Logger, type OnFailCallback } from '../common';
 import type { ComponentInteraction, ModalSubmitInteraction, StringSelectMenuInteraction } from '../structures';
-import { ComponentCommand, ModalCommand } from './command';
+import { ComponentCommand } from './componentcommand';
+import type { ComponentContext } from './componentcontext';
+import { ModalCommand } from './modalcommand';
+import type { ModalContext } from './modalcontext';
 type COMPONENTS = {
     components: {
         match: string | string[] | RegExp;
@@ -35,11 +38,13 @@ export declare class ComponentHandler extends BaseHandler {
     onModalSubmit(interaction: ModalSubmitInteraction): any;
     deleteValue(id: string, reason?: string): void;
     onMessageDelete(id: string): void;
-    load(componentsDir: string): Promise<void>;
+    load(componentsDir: string, instances?: {
+        new (): ModalCommand | ComponentCommand;
+    }[]): Promise<void>;
     reload(path: string): Promise<any>;
     reloadAll(): Promise<void>;
-    executeComponent(interaction: ComponentInteraction): Promise<void>;
-    executeModal(interaction: ModalSubmitInteraction): Promise<void>;
+    executeComponent(context: ComponentContext): Promise<any>;
+    executeModal(context: ModalContext): Promise<any>;
     setHandlers({ callback }: {
         callback: ComponentHandler['callback'];
     }): void;