seyfert 1.1.0 → 1.2.0

package/lib/cache/resources/default/base.d.ts

@@ -1,6 +1,6 @@
+import type { GatewayIntentBits } from 'discord-api-types/v10';
 import type { BaseClient } from '../../../client/base';
 import type { UsingClient } from '../../../commands';
-import { type GatewayIntentBits } from '../../../common';
 import type { Cache, ReturnCache } from '../../index';
 export declare class BaseResource<T = any> {
     protected cache: Cache;
@@ -9,19 +9,19 @@ export declare class BaseResource<T = any> {
     constructor(cache: Cache, client?: UsingClient);
     get rest(): import("../../..").ApiHandler;
     get adapter(): import("../../index").Adapter;
-    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string): import("../../index").RPV<void>;
+    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string): import("../../../common").Awaitable<void>;
     setIfNI(intent: keyof typeof GatewayIntentBits, id: string, data: any): any;
     get(id: string): ReturnCache<T | undefined>;
     bulk(ids: string[]): ReturnCache<T[]>;
-    set(id: string, data: any): import("../../index").RPV<void>;
-    patch<T extends Record<any, any> = Record<any, any>>(id: string, data: T): import("../../index").RPV<void>;
-    remove(id: string): import("../../index").RPV<void>;
+    set(id: string, data: any): import("../../../common").Awaitable<void>;
+    patch<T extends Record<any, any> = Record<any, any>>(id: string, data: T): import("../../../common").Awaitable<void>;
+    remove(id: string): import("../../../common").Awaitable<void>;
     keys(): ReturnCache<string[]>;
     values(): ReturnCache<T[]>;
-    count(): import("../../index").RPV<number>;
-    contains(id: string): import("../../index").RPV<boolean>;
-    getToRelationship(): import("../../index").RPV<string[]>;
-    addToRelationship(id: string | string[]): import("../../index").RPV<void>;
-    removeToRelationship(id: string | string[]): import("../../index").RPV<void>;
+    count(): import("../../../common").Awaitable<number>;
+    contains(id: string): import("../../../common").Awaitable<boolean>;
+    getToRelationship(): import("../../../common").Awaitable<string[]>;
+    addToRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
+    removeToRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
     hashId(id: string): string;
 }

package/lib/cache/resources/default/guild-based.d.ts

@@ -1,6 +1,6 @@
+import type { GatewayIntentBits } from 'discord-api-types/v10';
 import type { BaseClient } from '../../../client/base';
 import type { UsingClient } from '../../../commands';
-import { type GatewayIntentBits } from '../../../common';
 import type { Cache, ReturnCache } from '../../index';
 export declare class GuildBasedResource<T = any> {
     protected cache: Cache;
@@ -9,7 +9,7 @@ export declare class GuildBasedResource<T = any> {
     constructor(cache: Cache, client?: UsingClient);
     parse(data: any, id: string, guild_id: string): any;
     get adapter(): import("../../index").Adapter;
-    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../index").RPV<void>;
+    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../../common").Awaitable<void>;
     setIfNI(intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: any): any;
     get(id: string, guild: string): ReturnCache<(T & {
         guild_id: string;
@@ -21,17 +21,17 @@ export declare class GuildBasedResource<T = any> {
     set(__keys: [string, any][], guild: string): ReturnCache<void>;
     patch(__keys: string, guild: string, data: any): ReturnCache<void>;
     patch(__keys: [string, any][], guild: string): ReturnCache<void>;
-    remove(id: string | string[], guild: string): import("../../index").RPV<void>;
+    remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     keys(guild: string): ReturnCache<string[]>;
     values(guild: string): ReturnCache<(T & {
         guild_id: string;
     })[]>;
     count(guild: string): ReturnCache<number>;
     contains(id: string, guild: string): ReturnCache<boolean>;
-    getToRelationship(guild: string): import("../../index").RPV<string[]>;
-    addToRelationship(id: string | string[], guild: string): import("../../index").RPV<void>;
-    removeToRelationship(id: string | string[], guild: string): import("../../index").RPV<void>;
-    removeRelationship(id: string | string[]): import("../../index").RPV<void>;
+    getToRelationship(guild: string): import("../../../common").Awaitable<string[]>;
+    addToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
+    removeToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
+    removeRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
     hashId(id: string): string;
     hashGuildId(guild: string, id: string): string;
 }

package/lib/cache/resources/default/guild-based.js

@@ -17,7 +17,8 @@ class GuildBasedResource {
         this.client = client;
     }
     parse(data, id, guild_id) {
-        data.id = id;
+        if (!data.id)
+            data.id = id;
         data.guild_id = guild_id;
         return data;
     }

package/lib/cache/resources/default/guild-related.d.ts

@@ -1,6 +1,6 @@
+import type { GatewayIntentBits } from 'discord-api-types/v10';
 import type { BaseClient } from '../../../client/base';
 import type { UsingClient } from '../../../commands';
-import { type GatewayIntentBits } from '../../../common';
 import type { Cache, ReturnCache } from '../../index';
 export declare class GuildRelatedResource<T = any> {
     protected cache: Cache;
@@ -9,7 +9,7 @@ export declare class GuildRelatedResource<T = any> {
     constructor(cache: Cache, client?: UsingClient);
     parse(data: any, id: string, guild_id: string): any;
     get adapter(): import("../../index").Adapter;
-    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../index").RPV<void>;
+    removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../../common").Awaitable<void>;
     setIfNI(intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: any): any;
     get(id: string): ReturnCache<(T & {
         guild_id: string;
@@ -21,16 +21,16 @@ export declare class GuildRelatedResource<T = any> {
     set(__keys: [string, any][], guild: string): ReturnCache<void>;
     patch(__keys: string, guild?: string, data?: any): ReturnCache<void>;
     patch(__keys: [string, any][], guild?: string): ReturnCache<void>;
-    remove(id: string | string[], guild: string): import("../../index").RPV<void>;
+    remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     keys(guild: string): ReturnCache<string[]>;
     values(guild: string): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    count(to: string): import("../../index").RPV<number>;
-    contains(id: string, guild: string): import("../../index").RPV<boolean>;
-    getToRelationship(guild: string): import("../../index").RPV<string[]>;
-    addToRelationship(id: string | string[], guild: string): import("../../index").RPV<void>;
-    removeToRelationship(id: string | string[], guild: string): import("../../index").RPV<void>;
-    removeRelationship(id: string | string[]): import("../../index").RPV<void>;
+    count(to: string): import("../../../common").Awaitable<number>;
+    contains(id: string, guild: string): import("../../../common").Awaitable<boolean>;
+    getToRelationship(guild: string): import("../../../common").Awaitable<string[]>;
+    addToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
+    removeToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
+    removeRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
     hashId(id: string): string;
 }

package/lib/cache/resources/default/guild-related.js

@@ -17,7 +17,8 @@ class GuildRelatedResource {
         this.client = client;
     }
     parse(data, id, guild_id) {
-        data.id = id;
+        if (!data.id)
+            data.id = id;
         data.guild_id = guild_id;
         return data;
     }

package/lib/cache/resources/presence.d.ts

@@ -1,4 +1,4 @@
-import type { GatewayPresenceUpdate } from '../../common';
+import type { GatewayPresenceUpdate } from 'discord-api-types/v10';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Presences extends GuildRelatedResource<PresenceResource> {
     namespace: string;

package/lib/cache/resources/stage-instances.d.ts

@@ -1,4 +1,4 @@
-import type { APIStageInstance } from '../../common';
+import type { APIStageInstance } from 'discord-api-types/v10';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class StageInstances extends GuildRelatedResource<APIStageInstance> {
     namespace: string;

package/lib/cache/resources/voice-states.d.ts

@@ -1,4 +1,4 @@
-import type { GatewayVoiceState } from '../../common';
+import type { GatewayVoiceState } from 'discord-api-types/v10';
 import { GuildBasedResource } from './default/guild-based';
 export declare class VoiceStates extends GuildBasedResource<VoiceStateResource> {
     namespace: string;

package/lib/client/base.d.ts

@@ -1,14 +1,16 @@
 import { ApiHandler } from '../api';
 import type { Adapter } from '../cache';
 import { Cache } from '../cache';
-import type { RegisteredMiddlewares } from '../commands';
+import type { Command, ContextMenuCommand, RegisteredMiddlewares } from '../commands';
 import type { InferWithPrefix, MiddlewareContext } from '../commands/applications/shared';
-import { CommandHandler } from '../commands/handler';
-import { ChannelShorter, EmojiShorter, GuildShorter, Logger, MemberShorter, MessageShorter, ReactionShorter, RoleShorter, TemplateShorter, UsersShorter, WebhookShorter, type LocaleString, type MakeRequired } from '../common';
+import { type CommandHandlerLike } from '../commands/handler';
+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 { ComponentHandler } from '../components/handler';
-import { LangsHandler } from '../langs/handler';
-import type { ChatInputCommandInteraction, Message, MessageCommandInteraction, UserCommandInteraction } from '../structures';
+import type { ComponentCommand, ModalCommand } from '../components';
+import { type ComponentHandlerLike } from '../components/handler';
+import { type LangsHandlerLike } from '../langs/handler';
+import type { ChatInputCommandInteraction, ComponentInteraction, Message, MessageCommandInteraction, UserCommandInteraction } from '../structures';
 export declare class BaseClient {
     rest: ApiHandler;
     cache: Cache;
@@ -24,9 +26,9 @@ export declare class BaseClient {
     emojis: EmojiShorter;
     debugger?: Logger;
     logger: Logger;
-    langs: LangsHandler;
-    commands: CommandHandler;
-    components: ComponentHandler;
+    langs?: LangsHandlerLike;
+    commands?: CommandHandlerLike;
+    components?: ComponentHandlerLike;
     private _applicationId?;
     private _botId?;
     middlewares?: Record<string, MiddlewareContext>;
@@ -39,7 +41,7 @@ export declare class BaseClient {
     set applicationId(id: string);
     get applicationId(): string;
     get proxy(): import("../api").APIRoutes;
-    setServices({ rest, cache, langs, middlewares }: ServicesOptions): void;
+    setServices({ rest, cache, langs, middlewares, handlers }: ServicesOptions): void;
     protected execute(..._options: unknown[]): Promise<void>;
     start(options?: Pick<DeepPartial<StartOptions>, 'langsDir' | 'commandsDir' | 'connection' | 'token' | 'componentsDir'>): Promise<void>;
     protected onPacket(..._packet: unknown[]): Promise<void>;
@@ -63,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 {
@@ -107,7 +109,7 @@ export type RuntimeConfigHTTP = Omit<MakeRequired<RC, 'publicKey' | 'application
 };
 export type InternalRuntimeConfig = Omit<MakeRequired<RC, 'intents'>, 'publicKey' | 'port'>;
 export type RuntimeConfig = OmitInsert<InternalRuntimeConfig, 'intents', {
-    intents?: IntentStrings | number;
+    intents?: IntentStrings | number[] | number;
 }>;
 export interface ServicesOptions {
     rest?: ApiHandler;
@@ -120,5 +122,10 @@ export interface ServicesOptions {
         aliases?: Record<string, LocaleString[]>;
     };
     middlewares?: Record<string, MiddlewareContext>;
+    handlers?: {
+        components?: ComponentHandlerLike | ((component: ComponentCommand | ModalCommand) => any);
+        commands?: CommandHandlerLike | ((command: Command | ContextMenuCommand) => any);
+        langs?: LangsHandlerLike | ((locale: string, record: Record<string, unknown>) => any);
+    };
 }
 export {};

package/lib/client/base.js

@@ -58,22 +58,60 @@ class BaseClient {
     get proxy() {
         return new api_1.Router(this.rest).createProxy();
     }
-    setServices({ rest, cache, langs, middlewares }) {
+    setServices({ rest, cache, langs, middlewares, handlers }) {
         if (rest) {
             this.rest = rest;
         }
         if (cache) {
             this.cache = new cache_1.Cache(this.cache?.intents ?? 0, cache?.adapter ?? this.cache?.adapter ?? new cache_1.MemoryAdapter(), cache.disabledCache ?? this.cache?.disabledCache ?? [], this);
         }
+        if (middlewares) {
+            this.middlewares = middlewares;
+        }
+        if (handlers) {
+            if ('components' in handlers) {
+                if (!handlers.components) {
+                    this.components = undefined;
+                }
+                else if (typeof handlers.components === 'function') {
+                    this.components = new handler_2.ComponentHandler(this.logger, this);
+                    this.components.__callback = handlers.components;
+                }
+                else {
+                    this.components = handlers.components;
+                }
+            }
+            if ('commands' in handlers) {
+                if (!handlers.commands) {
+                    this.commands = undefined;
+                }
+                else if (typeof handlers.commands === 'function') {
+                    this.commands = new handler_1.CommandHandler(this.logger, this);
+                    this.commands.__callback = handlers.commands;
+                }
+                else {
+                    this.commands = handlers.commands;
+                }
+            }
+            if ('langs' in handlers) {
+                if (!handlers.langs) {
+                    this.langs = undefined;
+                }
+                else if (typeof handlers.langs === 'function') {
+                    this.langs = new handler_3.LangsHandler(this.logger);
+                    this.langs.__callback = handlers.langs;
+                }
+                else {
+                    this.langs = handlers.langs;
+                }
+            }
+        }
         if (langs) {
             if (langs.default)
                 this.langs.defaultLang = langs.default;
             if (langs.aliases)
                 this.langs.aliases = Object.entries(langs.aliases);
         }
-        if (middlewares) {
-            this.middlewares = middlewares;
-        }
     }
     async execute(..._options) {
         if ((await this.getRC()).debug) {
@@ -139,21 +177,21 @@ class BaseClient {
     }
     async loadCommands(dir) {
         dir ??= await this.getRC().then(x => x.commands);
-        if (dir) {
+        if (dir && this.commands) {
             await this.commands.load(dir, this);
             this.logger.info('CommandHandler loaded');
         }
     }
     async loadComponents(dir) {
         dir ??= await this.getRC().then(x => x.components);
-        if (dir) {
+        if (dir && this.components) {
             await this.components.load(dir);
             this.logger.info('ComponentHandler loaded');
         }
     }
     async loadLangs(dir) {
         dir ??= await this.getRC().then(x => x.langs);
-        if (dir) {
+        if (dir && this.langs) {
             await this.langs.load(dir);
             this.logger.info('LangsHandler loaded');
         }

package/lib/client/client.d.ts

@@ -1,6 +1,6 @@
-import type { Command, CommandContext, Message, SubCommand } from '..';
-import { type DeepPartial, type GatewayDispatchPayload, type GatewayPresenceUpdateData, type If } from '../common';
-import { EventHandler } from '../events';
+import { type GatewayDispatchPayload, type GatewayPresenceUpdateData } from 'discord-api-types/v10';
+import type { ClientEvent, Command, CommandContext, EventHandlerLike, Message, SubCommand } from '..';
+import type { DeepPartial, If } from '../common';
 import { ClientUser } from '../structures';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
 import { MemberUpdateHandler } from '../websocket/discord/events/memberUpdate';
@@ -10,7 +10,7 @@ import { BaseClient } from './base';
 export declare class Client<Ready extends boolean = boolean> extends BaseClient {
     private __handleGuilds?;
     gateway: ShardManager;
-    events: EventHandler;
+    events?: EventHandlerLike;
     me: If<Ready, ClientUser>;
     options: ClientOptions | undefined;
     memberUpdateHandler: MemberUpdateHandler;
@@ -18,6 +18,9 @@ export declare class Client<Ready extends boolean = boolean> extends BaseClient
     constructor(options?: ClientOptions);
     setServices({ gateway, ...rest }: ServicesOptions & {
         gateway?: ShardManager;
+        handlers?: ServicesOptions['handlers'] & {
+            events?: EventHandlerLike | ((event: ClientEvent) => any);
+        };
     }): void;
     loadEvents(dir?: string): Promise<void>;
     protected execute(options?: {

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");
@@ -32,10 +32,22 @@ class Client extends base_1.BaseClient {
             };
             this.gateway = gateway;
         }
+        if (rest.handlers && 'events' in rest.handlers) {
+            if (!rest.handlers.events) {
+                this.events = undefined;
+            }
+            else if (typeof rest.handlers.events === 'function') {
+                this.events = new events_1.EventHandler(this.logger);
+                this.events.__callback = rest.handlers.events;
+            }
+            else {
+                this.events = rest.handlers.events;
+            }
+        }
     }
     async loadEvents(dir) {
         dir ??= await this.getRC().then(x => x.events);
-        if (dir) {
+        if (dir && this.events) {
             await this.events.load(dir);
             this.logger.info('EventHandler loaded');
         }
@@ -92,21 +104,21 @@ class Client extends base_1.BaseClient {
         }
     }
     async onPacket(shardId, packet) {
-        await this.events.runEvent('RAW', this, packet, shardId);
+        await this.events?.runEvent('RAW', this, packet, shardId);
         switch (packet.t) {
             //// Cases where we must obtain the old data before updating
             case 'GUILD_MEMBER_UPDATE':
                 if (!this.memberUpdateHandler.check(packet.d)) {
                     return;
                 }
-                await this.events.execute(packet.t, packet, this, shardId);
+                await this.events?.execute(packet.t, packet, this, shardId);
                 await this.cache.onPacket(packet);
                 break;
             case 'PRESENCE_UPDATE':
                 if (!this.presenceUpdateHandler.check(packet.d)) {
                     return;
                 }
-                await this.events.execute(packet.t, packet, this, shardId);
+                await this.events?.execute(packet.t, packet, this, shardId);
                 await this.cache.onPacket(packet);
                 break;
             //rest of the events
@@ -127,9 +139,9 @@ 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);
+                                await this.events?.runEvent('BOT_READY', this, this.me, -1);
                             }
                             delete this.__handleGuilds;
                         }
@@ -139,7 +151,7 @@ class Client extends base_1.BaseClient {
                         if (this.__handleGuilds?.has(packet.d.id)) {
                             this.__handleGuilds.delete(packet.d.id);
                             if (!this.__handleGuilds.size && [...this.gateway.values()].every(shard => shard.data.session_id)) {
-                                await this.events.runEvent('BOT_READY', this, this.me, -1);
+                                await this.events?.runEvent('BOT_READY', this, this.me, -1);
                             }
                             if (!this.__handleGuilds.size)
                                 delete this.__handleGuilds;
@@ -148,7 +160,7 @@ class Client extends base_1.BaseClient {
                         break;
                     }
                 }
-                await this.events.execute(packet.t, packet, this, shardId);
+                await this.events?.execute(packet.t, packet, this, shardId);
                 break;
             }
         }

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,11 +104,11 @@ 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 }) => {

package/lib/client/oninteractioncreate.js

@@ -9,13 +9,13 @@ async function onInteractionCreate(self, body, shardId, __reply) {
     switch (body.type) {
         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;
+                const parentCommand = self.commands?.values.find(x => {
+                    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
@@ -47,9 +47,9 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     case v10_1.ApplicationCommandType.Message:
                     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;
+                            const command = self.commands?.values.find(x => {
+                                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;
+                            const parentCommand = self.commands?.values.find(x => {
+                                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));
                                     }
@@ -167,22 +166,22 @@ async function onInteractionCreate(self, body, shardId, __reply) {
         case v10_1.InteractionType.ModalSubmit:
             {
                 const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                if (self.components.hasModal(interaction)) {
+                if (self.components?.hasModal(interaction)) {
                     await self.components.onModalSubmit(interaction);
                 }
                 else {
-                    await self.components.executeModal(interaction);
+                    await self.components?.executeModal(interaction);
                 }
             }
             break;
         case v10_1.InteractionType.MessageComponent:
             {
                 const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                if (self.components.hasComponent(body.message.id, interaction.customId)) {
+                if (self.components?.hasComponent(body.message.id, interaction.customId)) {
                     await self.components.onComponent(body.message.id, interaction);
                 }
                 else {
-                    await self.components.executeComponent(interaction);
+                    await self.components?.executeComponent(interaction);
                 }
             }
             break;

package/lib/client/onmessagecreate.js

@@ -45,13 +45,15 @@ async function onMessageCreate(self, rawMessage, shardId) {
     if (!prefix || !message.content.startsWith(prefix))
         return;
     const content = message.content.slice(prefix.length).trimStart();
-    const { fullCommandName, command, parent } = getCommandFromContent(content.split(' ').filter(x => x), self);
+    const { fullCommandName, command, parent } = getCommandFromContent(content
+        .split(' ')
+        .filter(x => x)
+        .slice(0, 3), self);
     if (!command)
         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;
@@ -75,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));
             }