seyfert 1.1.1 → 1.2.1

package/lib/client/base.d.ts

@@ -4,12 +4,13 @@ import { Cache } from '../cache';
 import type { Command, ContextMenuCommand, RegisteredMiddlewares } from '../commands';
 import type { InferWithPrefix, MiddlewareContext } from '../commands/applications/shared';
 import { type CommandHandlerLike } from '../commands/handler';
-import { ChannelShorter, EmojiShorter, GuildShorter, Logger, MemberShorter, MessageShorter, ReactionShorter, RoleShorter, TemplateShorter, UsersShorter, WebhookShorter, type LocaleString, type MakeRequired } from '../common';
+import { ChannelShorter, EmojiShorter, GuildShorter, Logger, MemberShorter, MessageShorter, ReactionShorter, RoleShorter, TemplateShorter, UsersShorter, WebhookShorter, type MakeRequired } from '../common';
+import type { LocaleString } from 'discord-api-types/rest/v10';
 import type { DeepPartial, IntentStrings, OmitInsert, When } from '../common/types/util';
 import type { ComponentCommand, ModalCommand } from '../components';
 import { type ComponentHandlerLike } from '../components/handler';
 import { type LangsHandlerLike } from '../langs/handler';
-import type { ChatInputCommandInteraction, Message, MessageCommandInteraction, UserCommandInteraction } from '../structures';
+import type { ChatInputCommandInteraction, ComponentInteraction, Message, MessageCommandInteraction, UserCommandInteraction } from '../structures';
 export declare class BaseClient {
     rest: ApiHandler;
     cache: Cache;
@@ -64,7 +65,7 @@ export declare class BaseClient {
     }>;
 }
 export interface BaseClientOptions {
-    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | When<InferWithPrefix, Message, never>) => {};
+    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ComponentInteraction | When<InferWithPrefix, Message, never>) => {};
     globalMiddlewares?: readonly (keyof RegisteredMiddlewares)[];
 }
 export interface StartOptions {

package/lib/client/client.d.ts

@@ -1,5 +1,6 @@
+import { type GatewayDispatchPayload, type GatewayPresenceUpdateData } from 'discord-api-types/v10';
 import type { ClientEvent, Command, CommandContext, EventHandlerLike, Message, SubCommand } from '..';
-import { type DeepPartial, type GatewayDispatchPayload, type GatewayPresenceUpdateData, type If } from '../common';
+import type { DeepPartial, If } from '../common';
 import { ClientUser } from '../structures';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
 import { MemberUpdateHandler } from '../websocket/discord/events/memberUpdate';

package/lib/client/client.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
+const v10_1 = require("discord-api-types/v10");
 const node_worker_threads_1 = require("node:worker_threads");
-const common_1 = require("../common");
 const events_1 = require("../events");
 const structures_1 = require("../structures");
 const websocket_1 = require("../websocket");
@@ -139,7 +139,7 @@ class Client extends base_1.BaseClient {
                         this.applicationId = packet.d.application.id;
                         this.me = new structures_1.ClientUser(this, packet.d.user, packet.d.application);
                         if (!this.__handleGuilds?.size ||
-                            !((this.gateway.options.intents & common_1.GatewayIntentBits.Guilds) === common_1.GatewayIntentBits.Guilds)) {
+                            !((this.gateway.options.intents & v10_1.GatewayIntentBits.Guilds) === v10_1.GatewayIntentBits.Guilds)) {
                             if ([...this.gateway.values()].every(shard => shard.data.session_id)) {
                                 await this.events?.runEvent('BOT_READY', this, this.me, -1);
                             }

package/lib/client/httpclient.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
+import { type APIInteraction } from 'discord-api-types/v10';
 import type { HttpRequest, HttpResponse } from 'uWebSockets.js';
-import type { APIInteraction, DeepPartial } from '../common';
+import type { DeepPartial } from '../common';
 import type { BaseClientOptions, StartOptions } from './base';
 import { BaseClient } from './base';
 export declare class HttpClient extends BaseClient {

package/lib/client/httpclient.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
+const v10_1 = require("discord-api-types/v10");
 const magic_bytes_js_1 = require("magic-bytes.js");
 const api_1 = require("../api");
 const utils_1 = require("../api/utils/utils");
-const common_1 = require("../common");
 const base_1 = require("./base");
 const oninteractioncreate_1 = require("./oninteractioncreate");
 let UWS;
@@ -104,49 +104,51 @@ class HttpClient extends base_1.BaseClient {
         }
         else {
             switch (rawBody.type) {
-                case common_1.InteractionType.Ping:
+                case v10_1.InteractionType.Ping:
                     this.debugger?.debug('Ping interaction received, responding.');
                     res
                         .writeHeader('Content-Type', 'application/json')
-                        .end(JSON.stringify({ type: common_1.InteractionResponseType.Pong }));
+                        .end(JSON.stringify({ type: v10_1.InteractionResponseType.Pong }));
                     break;
                 default:
                     await (0, oninteractioncreate_1.onInteractionCreate)(this, rawBody, -1, async ({ body, files }) => {
-                        let response;
-                        const headers = {};
-                        if (files) {
-                            response = new FormData();
-                            for (const [index, file] of files.entries()) {
-                                const fileKey = file.key ?? `files[${index}]`;
-                                if ((0, utils_1.isBufferLike)(file.data)) {
-                                    let contentType = file.contentType;
-                                    if (!contentType) {
-                                        const [parsedType] = (0, magic_bytes_js_1.filetypeinfo)(file.data);
-                                        if (parsedType) {
-                                            contentType =
-                                                api_1.OverwrittenMimeTypes[parsedType.mime] ??
-                                                    parsedType.mime ??
-                                                    'application/octet-stream';
+                        res.cork(() => {
+                            let response;
+                            const headers = {};
+                            if (files) {
+                                response = new FormData();
+                                for (const [index, file] of files.entries()) {
+                                    const fileKey = file.key ?? `files[${index}]`;
+                                    if ((0, utils_1.isBufferLike)(file.data)) {
+                                        let contentType = file.contentType;
+                                        if (!contentType) {
+                                            const [parsedType] = (0, magic_bytes_js_1.filetypeinfo)(file.data);
+                                            if (parsedType) {
+                                                contentType =
+                                                    api_1.OverwrittenMimeTypes[parsedType.mime] ??
+                                                        parsedType.mime ??
+                                                        'application/octet-stream';
+                                            }
                                         }
+                                        response.append(fileKey, new Blob([file.data], { type: contentType }), file.name);
+                                    }
+                                    else {
+                                        response.append(fileKey, new Blob([`${file.data}`], { type: file.contentType }), file.name);
                                     }
-                                    response.append(fileKey, new Blob([file.data], { type: contentType }), file.name);
                                 }
-                                else {
-                                    response.append(fileKey, new Blob([`${file.data}`], { type: file.contentType }), file.name);
+                                if (body) {
+                                    response.append('payload_json', JSON.stringify(body));
                                 }
                             }
-                            if (body) {
-                                response.append('payload_json', JSON.stringify(body));
+                            else {
+                                response = body ?? {};
+                                headers['Content-Type'] = 'application/json';
+                            }
+                            for (const i in headers) {
+                                res.writeHeader(i, headers[i]);
                             }
-                        }
-                        else {
-                            response = body ?? {};
-                            headers['Content-Type'] = 'application/json';
-                        }
-                        for (const i in headers) {
-                            res.writeHeader(i, headers[i]);
-                        }
-                        return res.end(JSON.stringify(response));
+                            return res.end(JSON.stringify(response));
+                        });
                     });
                     break;
             }

package/lib/client/oninteractioncreate.js

@@ -10,12 +10,12 @@ async function onInteractionCreate(self, body, shardId, __reply) {
         case v10_1.InteractionType.ApplicationCommandAutocomplete:
             {
                 const parentCommand = self.commands?.values.find(x => {
-                    if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
-                        return false;
+                    if (body.data.guild_id) {
+                        return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
                     }
                     return x.name === body.data.name;
                 });
-                const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.data.guild_id, body.data.resolved);
+                const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
                 const interaction = new structures_1.AutocompleteInteraction(self, body, __reply);
                 const command = optionsResolver.getAutocomplete();
                 // idc, is a YOU problem
@@ -48,8 +48,8 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     case v10_1.ApplicationCommandType.User:
                         {
                             const command = self.commands?.values.find(x => {
-                                if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
-                                    return false;
+                                if (body.data.guild_id) {
+                                    return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
                                 }
                                 return x.name === body.data.name;
                             });
@@ -62,7 +62,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                             Object.assign(context, extendContext);
                             try {
                                 if (command.botPermissions && interaction.appPermissions) {
-                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values(command.botPermissions));
+                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values([command.botPermissions]));
                                     if (permissions.length) {
                                         return command.onPermissionsFail?.(context, interaction.appPermissions.keys(permissions));
                                     }
@@ -102,14 +102,13 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                         break;
                     case v10_1.ApplicationCommandType.ChatInput:
                         {
-                            const packetData = body.data;
                             const parentCommand = self.commands?.values.find(x => {
-                                if (x.guild_id && !x.guild_id.includes(packetData.guild_id ?? '')) {
-                                    return false;
+                                if (body.data.guild_id) {
+                                    return x.guild_id?.includes(body.data.guild_id) && x.name === body.data.name;
                                 }
-                                return x.name === packetData.name;
+                                return x.name === body.data.name;
                             });
-                            const optionsResolver = new commands_1.OptionResolver(self, packetData.options ?? [], parentCommand, packetData.guild_id, packetData.resolved);
+                            const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
                             const interaction = structures_1.BaseInteraction.from(self, body, __reply);
                             const command = optionsResolver.getCommand();
                             if (!command?.run)
@@ -119,7 +118,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                             Object.assign(context, extendContext);
                             try {
                                 if (command.botPermissions && interaction.appPermissions) {
-                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values(command.botPermissions));
+                                    const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values([command.botPermissions]));
                                     if (permissions.length) {
                                         return command.onPermissionsFail?.(context, interaction.appPermissions.keys(permissions));
                                     }

package/lib/client/onmessagecreate.js

@@ -53,8 +53,7 @@ async function onMessageCreate(self, rawMessage, shardId) {
         return;
     if (!command.run)
         return self.logger.warn(`${fullCommandName} command does not have 'run' callback`);
-    if ([__1.InteractionContextTypes.BOT_DM, __1.InteractionContextTypes.PRIVATE_CHANNEL].some(i => command.contexts?.includes(i)) &&
-        !message.guildId)
+    if (!command.contexts?.includes(__1.InteractionContextTypes.BOT_DM) && !message.guildId)
         return;
     if (command.guild_id && !command.guild_id?.includes(message.guildId))
         return;
@@ -78,7 +77,7 @@ async function onMessageCreate(self, rawMessage, shardId) {
             if (!meMember)
                 return; //enable member cache and "Guilds" intent, lol
             const appPermissions = await meMember.fetchPermissions();
-            const permissions = appPermissions.missings(...appPermissions.values(command.botPermissions));
+            const permissions = appPermissions.missings(...appPermissions.values([command.botPermissions]));
             if (permissions.length) {
                 return command.onPermissionsFail?.(context, appPermissions.keys(permissions));
             }

package/lib/client/workerclient.d.ts

@@ -3,9 +3,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+import { type GatewayDispatchPayload } from 'discord-api-types/v10';
+import { Logger } from '..';
 import type { Cache } from '../cache';
-import type { GatewayDispatchPayload, When } from '../common';
-import { Logger, type DeepPartial } from '../common';
+import { type DeepPartial, type When } from '../common';
 import { type EventHandlerLike } from '../events';
 import { ClientUser } from '../structures';
 import { Shard, type ShardManagerOptions } from '../websocket';

package/lib/client/workerclient.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateShardInfo = exports.WorkerClient = void 0;
+const v10_1 = require("discord-api-types/v10");
 const node_crypto_1 = require("node:crypto");
 const node_worker_threads_1 = require("node:worker_threads");
 const __1 = require("..");
@@ -27,7 +28,7 @@ try {
 catch { }
 class WorkerClient extends base_1.BaseClient {
     __handleGuilds = new Set();
-    logger = new common_1.Logger({
+    logger = new __1.Logger({
         name: `[Worker #${workerData.workerId}]`,
     });
     events = new events_1.EventHandler(this.logger);
@@ -51,7 +52,7 @@ class WorkerClient extends base_1.BaseClient {
             },
         });
         if (workerData.debug) {
-            this.debugger = new common_1.Logger({
+            this.debugger = new __1.Logger({
                 name: `[Worker #${workerData.workerId}]`,
                 logLevel: common_1.LogLevels.Debug,
             });
@@ -298,7 +299,7 @@ class WorkerClient extends base_1.BaseClient {
                             this.applicationId = packet.d.application.id;
                             this.me = new structures_1.ClientUser(this, packet.d.user, packet.d.application);
                             if (!this.__handleGuilds?.size ||
-                                !((workerData.intents & common_1.GatewayIntentBits.Guilds) === common_1.GatewayIntentBits.Guilds)) {
+                                !((workerData.intents & v10_1.GatewayIntentBits.Guilds) === v10_1.GatewayIntentBits.Guilds)) {
                                 if ([...this.shards.values()].every(shard => shard.data.session_id)) {
                                     this.postMessage({
                                         type: 'WORKER_READY',

package/lib/commands/applications/chat.d.ts

@@ -1,7 +1,7 @@
-import type { SeyfertNumberOption, SeyfertStringOption } from '../..';
+import { type APIApplicationCommandBasicOption, type APIApplicationCommandOption, ApplicationCommandOptionType, ApplicationCommandType, type LocaleString } from 'discord-api-types/v10';
+import type { PermissionStrings, SeyfertNumberOption, SeyfertStringOption } from '../..';
 import type { Attachment } from '../../builders';
-import type { APIApplicationCommandBasicOption, APIApplicationCommandOption, FlatObjectKeys, LocaleString, PermissionStrings } from '../../common';
-import { ApplicationCommandOptionType, ApplicationCommandType } from '../../common';
+import { type FlatObjectKeys } from '../../common';
 import type { AllChannels, AutocompleteInteraction, GuildRole, InteractionGuildMember, User } from '../../structures';
 import type { Groups, IntegrationTypes, InteractionContextTypes, RegisteredMiddlewares } from '../decorators';
 import type { CommandContext } from './chatcontext';

package/lib/commands/applications/chat.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubCommand = exports.Command = void 0;
+const v10_1 = require("discord-api-types/v10");
 const common_1 = require("../../common");
 class BaseCommand {
     middlewares = [];
@@ -136,7 +137,7 @@ class BaseCommand {
     }
 }
 class Command extends BaseCommand {
-    type = common_1.ApplicationCommandType.ChatInput;
+    type = v10_1.ApplicationCommandType.ChatInput;
     groups;
     toJSON() {
         const options = [];
@@ -148,7 +149,7 @@ class Command extends BaseCommand {
             if (i.group) {
                 if (!options.find(x => x.name === i.group)) {
                     options.push({
-                        type: common_1.ApplicationCommandOptionType.SubcommandGroup,
+                        type: v10_1.ApplicationCommandOptionType.SubcommandGroup,
                         name: i.group,
                         description: this.groups[i.group].defaultDescription,
                         description_localizations: Object.fromEntries(this.groups?.[i.group].description ?? []),
@@ -185,7 +186,7 @@ class Command extends BaseCommand {
 }
 exports.Command = Command;
 class SubCommand extends BaseCommand {
-    type = common_1.ApplicationCommandOptionType.Subcommand;
+    type = v10_1.ApplicationCommandOptionType.Subcommand;
     group;
     toJSON() {
         return {

package/lib/commands/applications/chatcontext.d.ts

@@ -1,14 +1,15 @@
-import { MenuCommandContext, User, type AllChannels, type Guild, type InferWithPrefix, type MessageCommandInteraction, type ReturnCache, type UserCommandInteraction, type WebhookMessage } from '../..';
-import { type If, type UnionToTuple, type When } from '../../common';
+import type { AllChannels, Guild, InferWithPrefix, ReturnCache, WebhookMessage } from '../..';
+import type { If, UnionToTuple, When } from '../../common';
 import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest } from '../../common/types/write';
 import { Message, type ChatInputCommandInteraction, type GuildMember, type InteractionGuildMember } from '../../structures';
+import { BaseContext } from '../basecontex';
 import type { RegisteredMiddlewares } from '../decorators';
 import type { OptionResolver } from '../optionresolver';
 import type { Command, ContextOptions, OptionsRecord, SubCommand } from './chat';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, UsingClient } from './shared';
-export interface CommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends ExtendContext {
+export interface CommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends BaseContext, ExtendContext {
 }
-export declare class CommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> {
+export declare class CommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends BaseContext {
     readonly client: UsingClient;
     readonly resolver: OptionResolver;
     readonly shardId: number;
@@ -39,10 +40,6 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     guild(mode?: 'cache'): ReturnCache<Guild<'cached'> | undefined>;
     get guildId(): string | undefined;
     get channelId(): string;
-    get author(): User;
+    get author(): import("../..").User;
     get member(): If<InferWithPrefix, GuildMember | InteractionGuildMember | undefined, InteractionGuildMember | undefined>;
-    isChat(): this is CommandContext;
-    isMenu(): this is MenuCommandContext<any>;
-    isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
-    isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
 }

package/lib/commands/applications/chatcontext.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandContext = void 0;
-const __1 = require("../..");
-const common_1 = require("../../common");
+const v10_1 = require("discord-api-types/v10");
 const structures_1 = require("../../structures");
-class CommandContext {
+const basecontex_1 = require("../basecontex");
+class CommandContext extends basecontex_1.BaseContext {
     client;
     resolver;
     shardId;
@@ -13,6 +13,7 @@ class CommandContext {
     interaction;
     messageResponse;
     constructor(client, data, resolver, shardId, command) {
+        super(client);
         this.client = client;
         this.resolver = resolver;
         this.shardId = shardId;
@@ -31,7 +32,7 @@ class CommandContext {
         return this.client.proxy;
     }
     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');
     }
     get fullCommandName() {
         return this.resolver.fullCommandName;
@@ -44,7 +45,7 @@ class CommandContext {
     }
     async deferReply(ephemeral = false) {
         if (this.interaction)
-            return this.interaction.deferReply(ephemeral ? common_1.MessageFlags.Ephemeral : undefined);
+            return this.interaction.deferReply(ephemeral ? v10_1.MessageFlags.Ephemeral : undefined);
         const options = this.client.options?.commands;
         return (this.messageResponse = await this.message[options?.reply?.(this) ? 'reply' : 'write'](options?.deferReplyResponse?.(this) ?? { content: 'Thinking...' }));
     }
@@ -121,17 +122,5 @@ class CommandContext {
     get member() {
         return this.interaction?.member || this.message?.member;
     }
-    isChat() {
-        return this instanceof CommandContext;
-    }
-    isMenu() {
-        return this instanceof __1.MenuCommandContext;
-    }
-    isMenuUser() {
-        return this instanceof __1.MenuCommandContext && this.target instanceof __1.User;
-    }
-    isMenuMessage() {
-        return this instanceof __1.MenuCommandContext && this.target instanceof structures_1.Message;
-    }
 }
 exports.CommandContext = CommandContext;

package/lib/commands/applications/menu.d.ts

@@ -1,4 +1,5 @@
-import { type ApplicationCommandType, type LocaleString, type PermissionStrings } from '../../common';
+import type { ApplicationCommandType, LocaleString } from 'discord-api-types/v10';
+import { type PermissionStrings } from '../../common';
 import type { IntegrationTypes, InteractionContextTypes, RegisteredMiddlewares } from '../decorators';
 import type { MenuCommandContext } from './menucontext';
 import type { UsingClient } from './shared';

package/lib/commands/applications/menucontext.d.ts

@@ -1,12 +1,13 @@
-import { CommandContext, type ContextMenuCommand, type ReturnCache, type WebhookMessage } from '../..';
-import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type UnionToTuple, type When } from '../../common';
+import type { ContextMenuCommand, ReturnCache, WebhookMessage } from '../..';
+import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type UnionToTuple, type When, type ModalCreateBodyRequest } from '../../common';
 import { Message, User, type AllChannels, type Guild, type GuildMember, type MessageCommandInteraction, type UserCommandInteraction } from '../../structures';
+import { BaseContext } from '../basecontex';
 import type { RegisteredMiddlewares } from '../decorators';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, UsingClient } from './shared';
 export type InteractionTarget<T> = T extends MessageCommandInteraction ? Message : User;
-export interface MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends ExtendContext {
+export interface MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends BaseContext, ExtendContext {
 }
-export declare class MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> {
+export declare class MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends BaseContext {
     readonly client: UsingClient;
     readonly interaction: T;
     readonly shardId: number;
@@ -14,14 +15,13 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     constructor(client: UsingClient, interaction: T, shardId: number, command: ContextMenuCommand);
     metadata: CommandMetadata<UnionToTuple<M>>;
     globalMetadata: GlobalMetadata;
-    get proxy(): import("../..").APIRoutes;
     get target(): InteractionTarget<T>;
     get t(): import("../..").__InternalParseLocale<import("./shared").DefaultLocale> & {
         get(locale?: string | undefined): import("./shared").DefaultLocale;
     };
     get fullCommandName(): string;
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage, void | WebhookMessage>>;
-    get modal(): ((body: import("../../common").ModalCreateBodyRequest) => Promise<void>) | ((body: import("../../common").ModalCreateBodyRequest) => Promise<void>);
+    modal(body: ModalCreateBodyRequest): Promise<void>;
     deferReply(ephemeral?: boolean): Promise<void>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
     deleteResponse(): Promise<void | undefined>;
@@ -37,8 +37,4 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     get channelId(): string;
     get author(): User;
     get member(): import("../..").InteractionGuildMember | undefined;
-    isChat(): this is CommandContext;
-    isMenu(): this is MenuCommandContext<any>;
-    isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
-    isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
 }

package/lib/commands/applications/menucontext.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuCommandContext = void 0;
-const __1 = require("../..");
+const v10_1 = require("discord-api-types/v10");
 const common_1 = require("../../common");
 const structures_1 = require("../../structures");
-class MenuCommandContext {
+const basecontex_1 = require("../basecontex");
+class MenuCommandContext extends basecontex_1.BaseContext {
     client;
     interaction;
     shardId;
     command;
     constructor(client, interaction, shardId, command) {
+        super(client);
         this.client = client;
         this.interaction = interaction;
         this.shardId = shardId;
@@ -17,17 +19,14 @@ class MenuCommandContext {
     }
     metadata = {};
     globalMetadata = {};
-    get proxy() {
-        return this.client.proxy;
-    }
     // biome-ignore lint/suspicious/useGetterReturn: default don't exist.
     get target() {
         switch (this.interaction.data.type) {
-            case common_1.ApplicationCommandType.Message: {
+            case v10_1.ApplicationCommandType.Message: {
                 const data = this.interaction.data.resolved.messages[this.interaction.data.targetId];
                 return new structures_1.Message(this.client, (0, common_1.toSnakeCase)(data));
             }
-            case common_1.ApplicationCommandType.User: {
+            case v10_1.ApplicationCommandType.User: {
                 const data = this.interaction.data.resolved.users[this.interaction.data.targetId];
                 return new structures_1.User(this.client, (0, common_1.toSnakeCase)(data));
             }
@@ -42,11 +41,11 @@ class MenuCommandContext {
     write(body, fetchReply) {
         return this.interaction.write(body, fetchReply);
     }
-    get modal() {
-        return this.interaction.modal;
+    modal(body) {
+        return this.interaction.modal(body);
     }
     deferReply(ephemeral = false) {
-        return this.interaction.deferReply(ephemeral ? common_1.MessageFlags.Ephemeral : undefined);
+        return this.interaction.deferReply(ephemeral ? v10_1.MessageFlags.Ephemeral : undefined);
     }
     editResponse(body) {
         return this.interaction.editResponse(body);
@@ -97,17 +96,5 @@ class MenuCommandContext {
     get member() {
         return this.interaction.member;
     }
-    isChat() {
-        return this instanceof __1.CommandContext;
-    }
-    isMenu() {
-        return this instanceof MenuCommandContext;
-    }
-    isMenuUser() {
-        return this instanceof MenuCommandContext && this.target instanceof structures_1.User;
-    }
-    isMenuMessage() {
-        return this instanceof MenuCommandContext && this.target instanceof structures_1.Message;
-    }
 }
 exports.MenuCommandContext = MenuCommandContext;

package/lib/commands/basecontex.d.ts

@@ -0,0 +1,15 @@
+import type { ComponentCommandInteractionMap, ComponentContext } from '../components/componentcontext';
+import { type MessageCommandInteraction, type UserCommandInteraction } from '../structures';
+import type { CommandContext } from './applications/chatcontext';
+import type { MenuCommandContext } from './applications/menucontext';
+import type { UsingClient } from './applications/shared';
+export declare class BaseContext {
+    readonly client: UsingClient;
+    constructor(client: UsingClient);
+    get proxy(): import("..").APIRoutes;
+    isChat(): this is CommandContext;
+    isMenu(): this is MenuCommandContext<UserCommandInteraction | MessageCommandInteraction>;
+    isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
+    isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
+    isComponent(): this is ComponentContext<keyof ComponentCommandInteractionMap>;
+}

package/lib/commands/basecontex.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseContext = void 0;
+const v10_1 = require("discord-api-types/v10");
+const structures_1 = require("../structures");
+class BaseContext {
+    client;
+    constructor(client) {
+        this.client = client;
+    }
+    get proxy() {
+        return this.client.proxy;
+    }
+    isChat() {
+        //@ts-expect-error
+        return this.message || this.interaction.type === v10_1.ApplicationCommandType.ChatInput;
+    }
+    isMenu() {
+        return this.isMenuUser() || this.isMenuMessage();
+    }
+    isMenuUser() {
+        //@ts-expect-error
+        return this.target instanceof structures_1.User;
+    }
+    isMenuMessage() {
+        //@ts-expect-error
+        return this.target instanceof structures_1.Message;
+    }
+    isComponent() {
+        //@ts-expect-error
+        return this.interaction.type === v10_1.InteractionType.MessageComponent;
+    }
+}
+exports.BaseContext = BaseContext;

package/lib/commands/decorators.d.ts

@@ -1,4 +1,5 @@
-import { ApplicationCommandType, type FlatObjectKeys, type LocaleString, type PermissionStrings } from '../common';
+import { ApplicationCommandType, type LocaleString } from 'discord-api-types/v10';
+import type { FlatObjectKeys, PermissionStrings } from '../common';
 import type { CommandOption, OptionsRecord, SubCommand } from './applications/chat';
 import type { DefaultLocale, MiddlewareContext } from './applications/shared';
 export interface RegisteredMiddlewares {