seyfert 0.1.0 → 1.0.1

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

@@ -1,9 +1,12 @@
-import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type ModalCreateBodyRequest, type UnionToTuple } from '../../common';
-import { Message, User, type MessageCommandInteraction, type UserCommandInteraction } from '../../structures';
+import { CommandContext, type ReturnCache, type WebhookMessage } from '../..';
+import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type UnionToTuple, type When } from '../../common';
+import { Message, User, type AllChannels, type Guild, type GuildMember, type MessageCommandInteraction, type UserCommandInteraction } from '../../structures';
 import type { RegisteredMiddlewares } from '../decorators';
-import type { CommandMetadata, DefaultLocale, ExtendContext, GlobalMetadata, UsingClient } from './shared';
+import type { CommandMetadata, ExtendContext, GlobalMetadata, UsingClient } from './shared';
 export type InteractionTarget<T> = T extends MessageCommandInteraction ? Message : User;
-export declare class MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> implements ExtendContext {
+export interface MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends ExtendContext {
+}
+export declare class MenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> {
     readonly client: UsingClient;
     readonly interaction: T;
     readonly shardId: number;
@@ -12,14 +15,28 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     globalMetadata: GlobalMetadata;
     get proxy(): import("../..").APIRoutes;
     get target(): InteractionTarget<T>;
-    get t(): DefaultLocale;
-    write(body: InteractionCreateBodyRequest): Promise<void>;
-    modal(body: ModalCreateBodyRequest): Promise<void>;
+    get t(): import("../..").__InternalParseLocale<import("./shared").DefaultLocale> & {
+        get(locale?: string | undefined): import("./shared").DefaultLocale;
+    };
+    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>);
     deferReply(ephemeral?: boolean): Promise<void>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
     deleteResponse(): Promise<void>;
-    editOrReply(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest): Promise<void>;
-    fetchResponse(): Promise<import("../../structures").WebhookMessage | undefined>;
+    editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
+    fetchResponse(): Promise<WebhookMessage | undefined>;
+    channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;
+    channel(mode?: 'cache'): ReturnCache<AllChannels>;
+    me(mode?: 'rest' | 'flow'): Promise<GuildMember>;
+    me(mode?: 'cache'): ReturnCache<GuildMember | undefined>;
+    guild(mode?: 'rest' | 'flow'): Promise<Guild<'cached' | 'api'> | undefined>;
+    guild(mode?: 'cache'): ReturnCache<Guild<'cached'> | undefined>;
+    get guildId(): string | undefined;
+    get channelId(): string;
     get author(): User;
-    get member(): import("../../structures").InteractionGuildMember | undefined;
+    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,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuCommandContext = void 0;
+const __1 = require("../..");
 const common_1 = require("../../common");
 const structures_1 = require("../../structures");
 class MenuCommandContext {
@@ -17,7 +18,7 @@ class MenuCommandContext {
     get proxy() {
         return this.client.proxy;
     }
-    // biome-ignore lint/suspicious/useGetterReturn: bugged
+    // biome-ignore lint/suspicious/useGetterReturn: default don't exist.
     get target() {
         switch (this.interaction.data.type) {
             case common_1.ApplicationCommandType.Message: {
@@ -33,11 +34,11 @@ class MenuCommandContext {
     get t() {
         return this.client.langs.get(this.interaction.locale);
     }
-    write(body) {
-        return this.interaction.write(body);
+    write(body, fetchReply) {
+        return this.interaction.write(body, fetchReply);
     }
-    modal(body) {
-        return this.interaction.modal(body);
+    get modal() {
+        return this.interaction.modal;
     }
     deferReply(ephemeral = false) {
         return this.interaction.deferReply(ephemeral ? common_1.MessageFlags.Ephemeral : undefined);
@@ -48,17 +49,60 @@ class MenuCommandContext {
     deleteResponse() {
         return this.interaction.deleteResponse();
     }
-    editOrReply(body) {
-        return this.interaction.editOrReply(body);
+    editOrReply(body, fetchReply) {
+        return this.interaction.editOrReply(body, fetchReply);
     }
     fetchResponse() {
         return this.interaction.fetchResponse();
     }
+    channel(mode = 'cache') {
+        if (this.interaction?.channel && mode === 'cache')
+            return this.client.cache.adapter.isAsync ? Promise.resolve(this.interaction.channel) : this.interaction.channel;
+        return this.client.channels.fetch(this.channelId, mode === 'rest');
+    }
+    me(mode = 'cache') {
+        if (!this.guildId)
+            return mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve();
+        switch (mode) {
+            case 'cache':
+                return this.client.cache.members?.get(this.client.botId, this.guildId);
+            default:
+                return this.client.members.fetch(this.guildId, this.client.botId, mode === 'rest');
+        }
+    }
+    guild(mode = 'cache') {
+        if (!this.guildId)
+            return (mode === 'cache' ? (this.client.cache.adapter.isAsync ? Promise.resolve() : undefined) : Promise.resolve());
+        switch (mode) {
+            case 'cache':
+                return this.client.cache.guilds?.get(this.guildId);
+            default:
+                return this.client.guilds.fetch(this.guildId, mode === 'rest');
+        }
+    }
+    get guildId() {
+        return this.interaction.guildId;
+    }
+    get channelId() {
+        return this.interaction.channelId;
+    }
     get author() {
         return this.interaction.user;
     }
     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/applications/options.d.ts

@@ -1,9 +1,10 @@
 import { ApplicationCommandOptionType, type APIApplicationCommandOptionChoice, type ChannelType } from 'discord-api-types/v10';
-import type { AutocompleteCallback, OnAutocompleteErrorCallback, ReturnOptionsTypes, __TypesWrapper } from '..';
+import type { AutocompleteCallback, MenuCommandContext, OnAutocompleteErrorCallback, ReturnOptionsTypes, __TypesWrapper } from '..';
+import type { MessageCommandInteraction, UserCommandInteraction } from '../../structures';
 import type { CommandContext } from './chatcontext';
 import type { MiddlewareContext } from './shared';
-type SeyfertBasicOption<T extends keyof __TypesWrapper, D = {}> = __TypesWrapper[T] & D;
-type SeyfertStringOption = SeyfertBasicOption<'String'> & {
+export type SeyfertBasicOption<T extends keyof __TypesWrapper, D = {}> = __TypesWrapper[T] & D;
+export type SeyfertStringOption = SeyfertBasicOption<'String'> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
     choices?: readonly {
@@ -13,28 +14,28 @@ type SeyfertStringOption = SeyfertBasicOption<'String'> & {
     min_length?: number;
     max_length?: number;
 };
-type SeyfertIntegerOption = SeyfertBasicOption<'Integer'> & {
+export type SeyfertIntegerOption = SeyfertBasicOption<'Integer'> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
     choices?: APIApplicationCommandOptionChoice<ReturnOptionsTypes[ApplicationCommandOptionType.Integer]>[];
     min_value?: number;
     max_value?: number;
 };
-type SeyfertBooleanOption = SeyfertBasicOption<'Boolean'>;
-type SeyfertUserOption = SeyfertBasicOption<'User'>;
-type SeyfertChannelOption = SeyfertBasicOption<'Channel'> & {
+export type SeyfertBooleanOption = SeyfertBasicOption<'Boolean'>;
+export type SeyfertUserOption = SeyfertBasicOption<'User'>;
+export type SeyfertChannelOption = SeyfertBasicOption<'Channel'> & {
     channel_types?: ChannelType[];
 };
-type SeyfertRoleOption = SeyfertBasicOption<'Role'>;
-type SeyfertMentionableOption = SeyfertBasicOption<'Mentionable'>;
-type SeyfertNumberOption = SeyfertBasicOption<'Number'> & {
+export type SeyfertRoleOption = SeyfertBasicOption<'Role'>;
+export type SeyfertMentionableOption = SeyfertBasicOption<'Mentionable'>;
+export type SeyfertNumberOption = SeyfertBasicOption<'Number'> & {
     autocomplete?: AutocompleteCallback;
     onAutocompleteError?: OnAutocompleteErrorCallback;
     choices?: APIApplicationCommandOptionChoice<ReturnOptionsTypes[ApplicationCommandOptionType.Number]>[];
     min_value?: number;
     max_value?: number;
 };
-type SeyfertAttachmentOption = SeyfertBasicOption<'Attachment'>;
+export type SeyfertAttachmentOption = SeyfertBasicOption<'Attachment'>;
 export declare function createStringOption<T extends SeyfertStringOption = SeyfertStringOption>(data: T): T & {
     readonly type: ApplicationCommandOptionType.String;
 };
@@ -62,6 +63,5 @@ export declare function createNumberOption<T extends SeyfertNumberOption = Seyfe
 export declare function createAttachmentOption<T extends SeyfertAttachmentOption = SeyfertAttachmentOption>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Attachment;
 };
-export type ParseMiddlewareType<T> = T extends MiddlewareContext<any, CommandContext> ? T : MiddlewareContext<T, CommandContext>;
+export type ParseMiddlewareType<T> = T extends MiddlewareContext<any, CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>>> ? T : MiddlewareContext<T, CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>>>;
 export declare function createMiddleware<T = ParseMiddlewareType<unknown>>(data: ParseMiddlewareType<T>): ParseMiddlewareType<T>;
-export {};

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

@@ -1,9 +1,12 @@
 import type { BaseClient } from '../../client/base';
 import type { RegisteredMiddlewares } from '../decorators';
 export type OKFunction<T> = (value: T) => void;
-export type StopFunction = (error: Error) => void;
+export type StopFunction = (error: string) => void;
 export type NextFunction<T = unknown> = (data: T) => void;
 export type PassFunction = () => void;
+export type InferWithPrefix = InternalOptions extends {
+    withPrefix: infer P;
+} ? P : false;
 export interface GlobalMetadata {
 }
 export interface DefaultLocale {
@@ -13,6 +16,8 @@ export interface ExtendContext {
 export interface UsingClient extends BaseClient {
 }
 export type ParseClient<T extends BaseClient> = T;
+export interface InternalOptions {
+}
 export type MiddlewareContext<T = any, C = any> = (context: {
     context: C;
     next: NextFunction<T>;
@@ -31,5 +36,5 @@ export type OnOptionsReturnObject = Record<string, {
     value: unknown;
 } | {
     failed: true;
-    value: Error;
+    value: string;
 }>;

package/lib/commands/decorators.d.ts

@@ -1,12 +1,12 @@
-import { ApplicationCommandType, type LocaleString, type PermissionStrings } from '../common';
+import { ApplicationCommandType, type FlatObjectKeys, type LocaleString, type PermissionStrings } from '../common';
 import type { CommandOption, OptionsRecord, SubCommand } from './applications/chat';
-import type { MiddlewareContext } from './applications/shared';
+import type { DefaultLocale, MiddlewareContext } from './applications/shared';
 export interface RegisteredMiddlewares {
 }
 type DeclareOptions = {
     name: string;
     description: string;
-    permissions?: PermissionStrings | bigint;
+    botPermissions?: PermissionStrings | bigint;
     defaultPermissions?: PermissionStrings | bigint;
     guildId?: string[];
     dm?: boolean;
@@ -14,7 +14,7 @@ type DeclareOptions = {
 } | (Omit<{
     name: string;
     description: string;
-    permissions?: PermissionStrings | bigint;
+    botPermissions?: PermissionStrings | bigint;
     defaultPermissions?: PermissionStrings | bigint;
     guildId?: string[];
     dm?: boolean;
@@ -35,23 +35,23 @@ export declare function Locales({ name: names, description: descriptions, }: {
         } | undefined;
     };
 } & T;
-export declare function LocalesT(name: string, description: string): <T extends new (...args: any[]) => {}>(target: T) => {
+export declare function LocalesT(name?: FlatObjectKeys<DefaultLocale>, description?: FlatObjectKeys<DefaultLocale>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         __t: {
-            name: string;
-            description: string;
+            name: undefined;
+            description: undefined;
         };
     };
 } & T;
 export declare function GroupsT(groups: Record<string, {
-    name: string;
-    description: string;
+    name?: FlatObjectKeys<DefaultLocale>;
+    description?: FlatObjectKeys<DefaultLocale>;
     defaultDescription: string;
 }>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         __tGroups: Record<string, {
-            name: string;
-            description: string;
+            name?: undefined;
+            description?: undefined;
             defaultDescription: string;
         }>;
     };
@@ -95,13 +95,13 @@ export declare function Middlewares(cbs: readonly (keyof RegisteredMiddlewares)[
 export declare function Declare(declare: DeclareOptions): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         name: string;
-        dm: boolean;
         nsfw: boolean | undefined;
-        guild_id: string[] | undefined;
         default_member_permissions: string | bigint | undefined;
-        permissions: bigint | undefined;
+        botPermissions: bigint | undefined;
+        dm?: boolean | undefined;
         description: string;
         type: ApplicationCommandType;
+        guild_id?: string[] | undefined;
     };
 } & T;
 export {};

package/lib/commands/decorators.js

@@ -61,23 +61,27 @@ exports.Middlewares = Middlewares;
 function Declare(declare) {
     return (target) => class extends target {
         name = declare.name;
-        dm = !!declare.dm;
         nsfw = declare.nsfw;
-        guild_id = declare.guildId;
         default_member_permissions = Array.isArray(declare.defaultPermissions)
             ? declare.defaultPermissions?.reduce((acc, prev) => acc | common_1.PermissionFlagsBits[prev], BigInt(0)).toString()
             : declare.defaultPermissions;
-        permissions = Array.isArray(declare.permissions)
-            ? declare.permissions?.reduce((acc, prev) => acc | common_1.PermissionFlagsBits[prev], BigInt(0))
-            : declare.permissions;
+        botPermissions = Array.isArray(declare.botPermissions)
+            ? declare.botPermissions?.reduce((acc, prev) => acc | common_1.PermissionFlagsBits[prev], BigInt(0))
+            : declare.botPermissions;
+        dm;
         description = '';
         type = common_1.ApplicationCommandType.ChatInput;
+        guild_id;
         constructor(...args) {
             super(...args);
             if ('description' in declare)
                 this.description = declare.description;
             if ('type' in declare)
                 this.type = declare.type;
+            if ('dm' in declare)
+                this.dm = !!declare.dm;
+            if ('guildId' in declare)
+                this.guild_id = declare.guildId;
             // check if all properties are valid
         }
     };

package/lib/commands/handler.d.ts

@@ -5,9 +5,10 @@ import { Command } from './applications/chat';
 import { ContextMenuCommand } from './applications/menu';
 export declare class CommandHandler extends BaseHandler {
     protected logger: Logger;
+    protected client: BaseClient;
     values: (Command | ContextMenuCommand)[];
     protected filter: (path: string) => boolean;
-    constructor(logger: Logger);
+    constructor(logger: Logger, client: BaseClient);
     reload(resolve: string | Command): Promise<void>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
     load(commandsDir: string, client: BaseClient): Promise<(Command | ContextMenuCommand)[]>;

package/lib/commands/handler.js

@@ -7,11 +7,13 @@ const chat_1 = require("./applications/chat");
 const menu_1 = require("./applications/menu");
 class CommandHandler extends common_1.BaseHandler {
     logger;
+    client;
     values = [];
-    filter = (path) => path.endsWith('.js') || path.endsWith('.ts');
-    constructor(logger) {
+    filter = (path) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts'));
+    constructor(logger, client) {
         super(logger);
         this.logger = logger;
+        this.client = client;
     }
     async reload(resolve) {
         if (typeof resolve === 'string') {
@@ -88,6 +90,8 @@ class CommandHandler extends common_1.BaseHandler {
                     option.onInternalError =
                         option.onInternalError?.bind(option) ?? commandInstance.onInternalError?.bind(commandInstance);
                     option.onAfterRun = option.onAfterRun?.bind(option) ?? commandInstance.onAfterRun?.bind(commandInstance);
+                    option.onPermissionsFail =
+                        option.onPermissionsFail?.bind(option) ?? commandInstance.onPermissionsFail?.bind(commandInstance);
                 }
             }
             this.values.push(commandInstance);
@@ -105,32 +109,74 @@ class CommandHandler extends common_1.BaseHandler {
             command.name_localizations = {};
             command.description_localizations = {};
             for (const locale of Object.keys(client.langs.values)) {
-                const valueName = client.langs.getKey(locale, command.__t.name);
-                if (valueName) {
-                    command.name_localizations[locale] = valueName;
+                const aliases = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
+                if (Object.values(common_1.Locale).includes(locale)) {
+                    if (command.__t.name) {
+                        const valueName = client.langs.getKey(locale, command.__t.name);
+                        if (valueName)
+                            command.name_localizations[locale] = valueName;
+                    }
+                    if (command.__t.description) {
+                        const valueKey = client.langs.getKey(locale, command.__t.description);
+                        if (valueKey)
+                            command.description_localizations[locale] = valueKey;
+                    }
                 }
-                const valueKey = client.langs.getKey(locale, command.__t.description);
-                if (valueKey) {
-                    command.description_localizations[locale] = valueKey;
+                for (const i of aliases) {
+                    if (command.__t.name) {
+                        const valueName = client.langs.getKey(locale, command.__t.name);
+                        if (valueName)
+                            command.name_localizations[i] = valueName;
+                    }
+                }
+                for (const i of aliases) {
+                    if (command.__t.description) {
+                        const valueKey = client.langs.getKey(locale, command.__t.description);
+                        if (valueKey)
+                            command.description_localizations[i] = valueKey;
+                    }
                 }
             }
         }
         if (command instanceof chat_1.Command && command.__tGroups) {
             command.groups = {};
             for (const locale of Object.keys(client.langs.values)) {
+                const aliases = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
                 for (const group in command.__tGroups) {
                     command.groups[group] ??= {
                         defaultDescription: command.__tGroups[group].defaultDescription,
                         description: [],
                         name: [],
                     };
-                    const valueName = client.langs.getKey(locale, command.__tGroups[group].name);
-                    if (valueName) {
-                        command.groups[group].name.push([locale, valueName]);
+                    if (Object.values(common_1.Locale).includes(locale)) {
+                        if (command.__tGroups[group].name) {
+                            const valueName = client.langs.getKey(locale, command.__tGroups[group].name);
+                            if (valueName) {
+                                command.groups[group].name.push([locale, valueName]);
+                            }
+                        }
+                        if (command.__tGroups[group].description) {
+                            const valueKey = client.langs.getKey(locale, command.__tGroups[group].description);
+                            if (valueKey) {
+                                command.groups[group].description.push([locale, valueKey]);
+                            }
+                        }
                     }
-                    const valueKey = client.langs.getKey(locale, command.__tGroups[group].description);
-                    if (valueKey) {
-                        command.groups[group].description.push([locale, valueKey]);
+                    for (const i of aliases) {
+                        if (command.__tGroups[group].name) {
+                            const valueName = client.langs.getKey(locale, command.__tGroups[group].name);
+                            if (valueName) {
+                                command.groups[group].name.push([i, valueName]);
+                            }
+                        }
+                    }
+                    for (const i of aliases) {
+                        if (command.__tGroups[group].description) {
+                            const valueKey = client.langs.getKey(locale, command.__tGroups[group].description);
+                            if (valueKey) {
+                                command.groups[group].description.push([i, valueKey]);
+                            }
+                        }
                     }
                 }
             }

package/lib/commands/index.d.ts

@@ -1,8 +1,8 @@
+export * from './applications/shared';
 export * from './applications/chat';
 export * from './applications/chatcontext';
 export * from './applications/menu';
 export * from './applications/menucontext';
 export * from './applications/options';
-export * from './applications/shared';
 export * from './decorators';
 export * from './optionresolver';

package/lib/commands/index.js

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./applications/shared"), exports);
+//
 __exportStar(require("./applications/chat"), exports);
 __exportStar(require("./applications/chatcontext"), exports);
 __exportStar(require("./applications/menu"), exports);
 __exportStar(require("./applications/menucontext"), exports);
 __exportStar(require("./applications/options"), exports);
-__exportStar(require("./applications/shared"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./optionresolver"), exports);

package/lib/commands/optionresolver.d.ts

@@ -1,4 +1,5 @@
-import type { APIApplicationCommandInteractionDataOption, APIAttachment, APIInteractionDataResolved, MakeRequired } from '../common';
+import { Attachment, GuildMember } from '..';
+import type { APIApplicationCommandInteractionDataOption, APIInteractionDataResolved, MakeRequired } from '../common';
 import { ApplicationCommandOptionType } from '../common';
 import type { AllChannels } from '../structures';
 import { GuildRole, InteractionGuildMember, User } from '../structures';
@@ -15,7 +16,7 @@ export declare class OptionResolver {
     private group;
     constructor(client: UsingClient, options: APIApplicationCommandInteractionDataOption[], parent?: Command | undefined, guildId?: string | undefined, resolved?: APIInteractionDataResolved | undefined);
     get fullCommandName(): string;
-    getCommand(): SubCommand | Command | undefined;
+    getCommand(): Command | SubCommand | undefined;
     getAutocompleteValue(): string | undefined;
     getAutocomplete(): CommandAutocompleteOption | undefined;
     getParent(): string | undefined;
@@ -23,7 +24,7 @@ export declare class OptionResolver {
     getGroup(): string | null;
     get(name: string): OptionResolved | undefined;
     getHoisted(name: string): OptionResolved | undefined;
-    getValue(name: string): string | number | boolean | APIAttachment | InteractionGuildMember | User | import("../structures").BaseChannel<import("discord-api-types/payloads/v10/channel").ChannelType> | import("../structures").DMChannel | import("../structures").CategoryChannel | GuildRole | undefined;
+    getValue(name: string): string | number | boolean | Attachment | GuildRole | GuildMember | User | import("..").BaseChannel<import("discord-api-types/payloads/v10/channel").ChannelType> | import("..").DMChannel | import("..").CategoryChannel | InteractionGuildMember | undefined;
     private getTypedOption;
     getChannel(name: string, required?: true): AllChannels;
     getString(name: string, required?: true): string;
@@ -35,8 +36,8 @@ export interface OptionResolved {
     value?: string | number | boolean;
     options?: OptionResolved[];
     user?: User;
-    member?: InteractionGuildMember;
-    attachment?: APIAttachment;
+    member?: GuildMember | InteractionGuildMember;
+    attachment?: Attachment;
     channel?: AllChannels;
     role?: GuildRole;
     focused?: boolean;

package/lib/commands/optionresolver.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptionResolver = void 0;
+const __1 = require("..");
 const common_1 = require("../common");
 const structures_1 = require("../structures");
 const channels_1 = __importDefault(require("../structures/channels"));
@@ -37,7 +38,7 @@ class OptionResolver {
     }
     getCommand() {
         if (this.subCommand) {
-            return (this.parent?.options).find(x => (this.group ? x.group === this.group : true) && x.name === this.subCommand);
+            return this.parent?.options?.find(x => (this.group ? x.group === this.group : true) && x.name === this.subCommand);
         }
         return this.parent;
     }
@@ -84,7 +85,7 @@ class OptionResolver {
             case common_1.ApplicationCommandOptionType.User:
                 return option.member ?? option.user;
             case common_1.ApplicationCommandOptionType.Mentionable:
-                return option.member ?? option.user ?? option.channel ?? option.role;
+                return option.member ?? option.user ?? option.role;
             default:
                 return;
         }
@@ -125,19 +126,22 @@ class OptionResolver {
             }
             const member = resolved.members?.[value];
             if (member) {
-                resolve.member = new structures_1.InteractionGuildMember(this.client, member, user, this.guildId);
+                resolve.member =
+                    member instanceof __1.GuildMember
+                        ? member
+                        : new structures_1.InteractionGuildMember(this.client, member, user, this.guildId);
             }
             const channel = resolved.channels?.[value];
             if (channel) {
-                resolve.channel = (0, channels_1.default)(channel, this.client);
+                resolve.channel = 'fetch' in channel ? channel : (0, channels_1.default)(channel, this.client);
             }
             const role = resolved.roles?.[value];
             if (role) {
-                resolve.role = new structures_1.GuildRole(this.client, role, this.guildId);
+                resolve.role = role instanceof structures_1.GuildRole ? role : new structures_1.GuildRole(this.client, role, this.guildId);
             }
             const attachment = resolved.attachments?.[value];
             if (attachment) {
-                resolve.attachment = attachment;
+                resolve.attachment = new __1.Attachment(this.client, attachment);
             }
         }
         return resolve;

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { GatewayDispatchPayload, GatewaySendPayload } from 'discord-api-types/v10';
 import { Worker } from 'node:worker_threads';
-import { REST } from '../../api';
+import { ApiHandler } from '../../api';
 import { ShardManager, type ShardManagerOptions } from '../../websocket';
 import { Logger } from '../it/logger';
 import type { MakeRequired } from '../types/util';
@@ -11,7 +11,7 @@ import type { MakeRequired } from '../types/util';
 export declare class Watcher extends ShardManager {
     worker?: Worker;
     logger: Logger;
-    rest?: REST;
+    rest?: ApiHandler;
     options: MakeRequired<WatcherOptions, 'intents' | 'token' | 'handlePayload' | 'info'>;
     /**
      * Initializes a new instance of the Watcher class.
@@ -31,7 +31,7 @@ export declare class Watcher extends ShardManager {
      */
     protected build(): void;
 }
-export interface WatcherOptions extends Omit<ShardManagerOptions, 'debug' | 'handlePayload' | 'info' | 'token' | 'intents'> {
+export interface WatcherOptions extends Omit<ShardManagerOptions, 'handlePayload' | 'info' | 'token' | 'intents'> {
     filePath: string;
     transpileCommand: string;
     srcPath: string;

package/lib/common/bot/watcher.js

@@ -67,7 +67,9 @@ class Watcher extends websocket_1.ShardManager {
     async spawnShards() {
         const RC = await base_1.BaseClient.prototype.getRC();
         this.options.token = RC.token;
-        this.rest ??= new api_1.REST({
+        this.rest ??= new api_1.ApiHandler({
+            baseUrl: 'api/v10',
+            domain: 'https://discord.com',
             token: this.options.token,
         });
         this.options.intents = RC.intents;

package/lib/common/index.d.ts

@@ -1,7 +1,6 @@
 export * from './it/constants';
 export * from './it/utils';
 export * from 'discord-api-types/v10';
-export * from './bot/watcher';
 export * from './it/colors';
 export * from './it/logger';
 export * from './shorters/channels';
@@ -11,3 +10,4 @@ export * from './types/options';
 export * from './types/resolvables';
 export * from './types/util';
 export * from './types/write';
+export * from './bot/watcher';