seyfert 1.0.1 → 1.1.1

package/lib/cache/resources/guilds.js

@@ -95,8 +95,9 @@ class Guilds extends base_1.BaseResource {
             bulkData.push(['channels', channel, channel.id, id]);
         }
         for (const channel of data.channels ?? []) {
-            if (channel.permission_overwrites?.length)
+            if (channel.permission_overwrites?.length) {
                 bulkData.push(['overwrites', channel.permission_overwrites, channel.id, id]);
+            }
         }
         for (const emoji of data.emojis ?? []) {
             bulkData.push(['emojis', emoji, emoji.id, id]);

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

@@ -3,7 +3,7 @@ import { PermissionsBitField } from '../../structures/extra/Permissions';
 import { GuildRelatedResource } from './default/guild-related';
 export declare class Overwrites extends GuildRelatedResource {
     namespace: string;
-    parse(data: any, _id: string, _guild_id: string): any;
+    parse(data: any[], _id: string, guild_id: string): any[];
     get(id: string): ReturnCache<{
         type: number;
         id: string;

package/lib/cache/resources/overwrites.js

@@ -6,7 +6,10 @@ const Permissions_1 = require("../../structures/extra/Permissions");
 const guild_related_1 = require("./default/guild-related");
 class Overwrites extends guild_related_1.GuildRelatedResource {
     namespace = 'overwrite';
-    parse(data, _id, _guild_id) {
+    parse(data, _id, guild_id) {
+        data.forEach(x => {
+            x.guild_id = guild_id;
+        });
         return data;
     }
     get(id) {
@@ -16,6 +19,7 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
                 deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
                 id: rawOverwrite.id,
                 type: rawOverwrite.type,
+                guildId: rawOverwrite.guild_id,
             }))
             : undefined);
     }
@@ -25,6 +29,7 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
             deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
             id: rawOverwrite.id,
             type: rawOverwrite.type,
+            guildId: rawOverwrite.guild_id,
         }))));
     }
     bulk(ids) {
@@ -33,6 +38,7 @@ class Overwrites extends guild_related_1.GuildRelatedResource {
             deny: new Permissions_1.PermissionsBitField(BigInt(rawOverwrite.deny)),
             id: rawOverwrite.id,
             type: rawOverwrite.type,
+            guildId: rawOverwrite.guild_id,
         }))));
     }
 }

package/lib/client/base.d.ts

@@ -1,184 +1,33 @@
 import { ApiHandler } from '../api';
 import type { Adapter } from '../cache';
 import { Cache } from '../cache';
-import type { RegisteredMiddlewares } from '../commands';
-import type { MiddlewareContext } from '../commands/applications/shared';
-import { CommandHandler } from '../commands/handler';
-import { Logger, type LocaleString, type MakeRequired } from '../common';
-import type { DeepPartial, IntentStrings, OmitInsert } from '../common/types/util';
-import { ComponentHandler } from '../components/handler';
-import { LangsHandler } from '../langs/handler';
-import type { ChatInputCommandInteraction, MessageCommandInteraction, UserCommandInteraction } from '../structures';
+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 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';
 export declare class BaseClient {
     rest: ApiHandler;
     cache: Cache;
-    users: {
-        createDM: (userId: string, force?: boolean) => Promise<import("../structures").DMChannel>;
-        deleteDM: (userId: string, reason?: string | undefined) => Promise<import("../structures").DMChannel>;
-        fetch: (userId: string, force?: boolean) => Promise<import("../structures").User>;
-        write: (userId: string, body: Omit<import("discord-api-types/rest/v10/channel").RESTPostAPIChannelMessageJSONBody, "components" | "embeds"> & import("../common").ResolverProps) => Promise<import("../structures").Message>;
-    };
-    channels: {
-        fetch: (id: string, force?: boolean | undefined) => Promise<import("../structures").AllChannels>;
-        delete: (id: string, optional?: Partial<{
-            guildId: string;
-            reason: string;
-        }>) => Promise<import("../structures").AllChannels>;
-        edit: (id: string, body: import("discord-api-types/rest/v10/channel").RESTPatchAPIChannelJSONBody, optional?: Partial<{
-            guildId: string;
-            reason: string;
-        }>) => Promise<import("../structures").AllChannels>;
-        typing: (id: string) => Promise<never>;
-        pins: {
-            fetch: (channelId: string) => Promise<import("../structures").Message[]>;
-            set: (messageId: string, channelId: string, reason?: string | undefined) => Promise<never>;
-            delete: (messageId: string, channelId: string, reason?: string | undefined) => Promise<never>;
-        };
-        overwrites: {
-            memberPermissions: (channelId: string, member: import("../structures").GuildMember, checkAdmin?: boolean) => Promise<import("../structures/extra/Permissions").PermissionsBitField>;
-            overwritesFor: (channelId: string, member: import("../structures").GuildMember) => Promise<{
-                everyone: {
-                    type: number;
-                    id: string;
-                    deny: import("../structures/extra/Permissions").PermissionsBitField;
-                    allow: import("../structures/extra/Permissions").PermissionsBitField;
-                } | undefined;
-                roles: {
-                    type: number;
-                    id: string;
-                    deny: import("../structures/extra/Permissions").PermissionsBitField;
-                    allow: import("../structures/extra/Permissions").PermissionsBitField;
-                }[];
-                member: {
-                    type: number;
-                    id: string;
-                    deny: import("../structures/extra/Permissions").PermissionsBitField;
-                    allow: import("../structures/extra/Permissions").PermissionsBitField;
-                } | undefined;
-            }>;
-            rolePermissions: (channelId: string, role: import("../structures").GuildRole, checkAdmin?: boolean) => Promise<import("../structures/extra/Permissions").PermissionsBitField>;
-        };
-    };
-    guilds: {
-        create: (body: import("discord-api-types/rest/v10/guild").RESTPostAPIGuildsJSONBody) => Promise<import("../structures").Guild<"api">>;
-        fetch: (id: string, force?: boolean) => Promise<import("../structures").Guild<"cached"> | import("../structures").Guild<"api">>;
-        widgetURL: (id: string, style?: import("discord-api-types/payloads/v10/guild").GuildWidgetStyle | undefined) => Promise<import("discord-api-types/payloads/v10/guild").APIGuildWidgetSettings>;
-        list: (query?: import("discord-api-types/rest/v10/user").RESTGetAPICurrentUserGuildsQuery | undefined) => Promise<import("../structures").AnonymousGuild[]>;
-        fetchSelf: (id: string) => Promise<import("../structures").GuildMember>;
-        leave: (id: string) => Promise<void | undefined>;
-        channels: {
-            list: (guildId: string, force?: boolean) => Promise<import("../structures").AllChannels[]>;
-            fetch: (guildId: string, channelId: string, force?: boolean | undefined) => Promise<import("../structures").AllChannels>;
-            create: (guildId: string, body: import("discord-api-types/rest/v10/guild").RESTPostAPIGuildChannelJSONBody) => Promise<import("../structures").AllChannels>;
-            delete: (guildId: string, channelId: string, reason?: string | undefined) => Promise<import("../structures").AllChannels>;
-            edit: (guildchannelId: string, channelId: string, body: import("discord-api-types/rest/v10/channel").RESTPatchAPIChannelJSONBody, reason?: string | undefined) => Promise<import("../structures").AllChannels>;
-            editPositions: (guildId: string, body: import("discord-api-types/rest/v10/guild").RESTPatchAPIGuildChannelPositionsJSONBody) => Promise<never>;
-        };
-        moderation: {
-            list: (guildId: string) => Promise<import("discord-api-types/rest/v10/autoModeration").RESTGetAPIAutoModerationRulesResult>;
-            create: (guildId: string, body: import("discord-api-types/rest/v10/autoModeration").RESTPostAPIAutoModerationRuleJSONBody) => Promise<import("discord-api-types/payloads/v10/autoModeration").APIAutoModerationRule>;
-            delete: (guildId: string, ruleId: string, reason?: string | undefined) => Promise<never>;
-            fetch: (guildId: string, ruleId: string) => Promise<import("discord-api-types/payloads/v10/autoModeration").APIAutoModerationRule>;
-            edit: (guildId: string, ruleId: string, body: {
-                name?: string | undefined;
-                eventType?: import("discord-api-types/payloads/v10/autoModeration").AutoModerationRuleEventType | undefined;
-                triggerMetadata?: import("discord-api-types/payloads/v10/autoModeration").APIAutoModerationRuleTriggerMetadata | undefined;
-                actions?: import("discord-api-types/payloads/v10/autoModeration").APIAutoModerationAction[] | undefined;
-                enabled?: boolean | undefined;
-                exemptRoles?: string[] | undefined;
-                exemptChannels?: string[] | undefined;
-            }, reason?: string | undefined) => Promise<import("discord-api-types/payloads/v10/autoModeration").APIAutoModerationRule>;
-        };
-        stickers: {
-            list: (guildId: string) => Promise<import("../structures").Sticker[]>;
-            create: (guildId: string, { file, ...json }: import("../structures").CreateStickerBodyRequest, reason?: string | undefined) => Promise<import("../structures").Sticker>;
-            edit: (guildId: string, stickerId: string, body: import("discord-api-types/rest/v10/sticker").RESTPatchAPIGuildStickerJSONBody, reason?: string | undefined) => Promise<import("../structures").Sticker>;
-            fetch: (guildId: string, stickerId: string, force?: boolean) => Promise<import("../structures").Sticker>;
-            delete: (guildId: string, stickerId: string, reason?: string | undefined) => Promise<void>;
-        };
-        emojis: {
-            list: (guildId: string, force?: boolean) => Promise<import("../structures").GuildEmoji[]>;
-            create: (guildId: string, body: Omit<import("discord-api-types/rest/v10/emoji").RESTPostAPIGuildEmojiJSONBody, "image"> & {
-                image: import("../common").ImageResolvable;
-            }) => Promise<void>;
-            fetch: (guildId: string, emojiId: string, force?: boolean) => Promise<import("../structures").GuildEmoji>;
-            delete: (guildId: string, emojiId: string, reason?: string | undefined) => Promise<void>;
-            edit: (guildId: string, emojiId: string, body: import("discord-api-types/rest/v10/emoji").RESTPatchAPIGuildEmojiJSONBody, reason?: string | undefined) => Promise<import("../structures").GuildEmoji>;
-        };
-    };
-    messages: {
-        write: (channelId: string, { files, ...body }: Omit<import("discord-api-types/rest/v10/channel").RESTPostAPIChannelMessageJSONBody, "components" | "embeds"> & import("../common").ResolverProps) => Promise<import("../structures").Message>;
-        edit: (messageId: string, channelId: string, { files, ...body }: Omit<import("discord-api-types/rest/v10/channel").RESTPatchAPIChannelMessageJSONBody, "components" | "embeds"> & import("../common").ResolverProps) => Promise<import("../structures").Message>;
-        crosspost: (messageId: string, channelId: string, reason?: string | undefined) => Promise<import("../structures").Message>;
-        delete: (messageId: string, channelId: string, reason?: string | undefined) => Promise<void>;
-        fetch: (messageId: string, channelId: string) => Promise<import("../structures").Message>;
-        purge: (messages: string[], channelId: string, reason?: string | undefined) => Promise<never>;
-        reactions: {
-            add: (messageId: string, channelId: string, emoji: import("../common").EmojiResolvable) => Promise<never>;
-            delete: (messageId: string, channelId: string, emoji: import("../common").EmojiResolvable, userId?: string) => Promise<never>;
-            fetch: (messageId: string, channelId: string, emoji: import("../common").EmojiResolvable, query?: import("discord-api-types/rest/v10/channel").RESTGetAPIChannelMessageReactionUsersQuery | undefined) => Promise<import("../structures").User[]>;
-            purge: (messageId: string, channelId: string, emoji?: import("../common").EmojiResolvable | undefined) => Promise<never>;
-        };
-    };
-    members: {
-        resolve: (guildId: string, resolve: import("../common").GuildMemberResolvable) => Promise<import("../structures").GuildMember | undefined>;
-        search: (guildId: string, query?: import("discord-api-types/rest/v10/guild").RESTGetAPIGuildMembersSearchQuery | undefined) => Promise<import("../structures").GuildMember[]>;
-        unban: (guildId: string, memberId: string, body?: import("discord-api-types/rest/v10/guild").RESTPutAPIGuildBanJSONBody | undefined, reason?: string | undefined) => Promise<void>;
-        ban: (guildId: string, memberId: string, body?: import("discord-api-types/rest/v10/guild").RESTPutAPIGuildBanJSONBody | undefined, reason?: string | undefined) => Promise<void>;
-        kick: (guildId: string, memberId: string, reason?: string | undefined) => Promise<void>;
-        edit: (guildId: string, memberId: string, body: import("discord-api-types/rest/v10/guild").RESTPatchAPIGuildMemberJSONBody, reason?: string | undefined) => Promise<import("../structures").GuildMember>;
-        add: (guildId: string, memberId: string, body: import("discord-api-types/rest/v10/guild").RESTPutAPIGuildMemberJSONBody) => Promise<import("../structures").GuildMember | undefined>;
-        fetch: (guildId: string, memberId: string, force?: boolean) => Promise<import("../structures").GuildMember>;
-        list: (guildId: string, query?: import("discord-api-types/rest/v10/guild").RESTGetAPIGuildMembersQuery | undefined, force?: boolean) => Promise<import("../structures").GuildMember[]>;
-        roles: {
-            add: (guildId: string, memberId: string, id: string) => Promise<void>;
-            remove: (guildId: string, memberId: string, id: string) => Promise<void>;
-        };
-    };
-    webhooks: {
-        delete: (webhookId: string, { token, reason }: Partial<{
-            token: string;
-            reason: string;
-        }>) => Promise<never>;
-        edit: (webhookId: string, body: import("discord-api-types/rest/v10/webhook").RESTPatchAPIWebhookJSONBody | import("discord-api-types/rest/v10/webhook").RESTPatchAPIWebhookWithTokenJSONBody, { token, reason }: Partial<{
-            token: string;
-            reason: string;
-        }>) => Promise<import("discord-api-types/rest/v10/webhook").RESTGetAPIWebhookWithTokenResult>;
-        fetch: (webhookId: string, token?: string | undefined) => Promise<import("../structures").Webhook>;
-        messages: {
-            write: (webhookId: string, token: string, { body: data, ...payload }: {
-                body: Omit<import("discord-api-types/rest/v10/webhook").RESTPostAPIWebhookWithTokenJSONBody, "components" | "embeds"> & import("../common").ResolverProps;
-                query?: import("discord-api-types/rest/v10/webhook").RESTPostAPIWebhookWithTokenQuery | undefined;
-            }) => Promise<import("../structures").WebhookMessage | null>;
-            edit: (webhookId: string, token: string, { messageId, body: data, ...json }: {
-                body: Omit<import("discord-api-types/rest/v10/webhook").RESTPatchAPIWebhookWithTokenMessageJSONBody, "components" | "embeds"> & import("../common").ResolverProps;
-                messageId: string;
-                query?: import("discord-api-types/rest/v10/webhook").RESTGetAPIWebhookWithTokenMessageQuery | undefined;
-            }) => Promise<import("../structures").WebhookMessage>;
-            delete: (webhookId: string, token: string, messageId: string, reason?: string | undefined) => Promise<never>;
-            fetch: (webhookId: string, token: string, messageId: string, threadId?: string | undefined) => Promise<import("../structures").WebhookMessage | undefined>;
-        };
-    };
-    templates: {
-        fetch: (code: string) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
-        list: (guildId: string) => Promise<import("discord-api-types/rest/v10/template").RESTGetAPIGuildTemplatesResult>;
-        create: (guildId: string, body: import("discord-api-types/rest/v10/template").RESTPostAPIGuildTemplatesJSONBody) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
-        sync: (guildId: string, code: string) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
-        edit: (guildId: string, code: string, body: import("discord-api-types/utils/internals").AddUndefinedToPossiblyUndefinedPropertiesOfInterface<Partial<import("discord-api-types/rest/v10/template").RESTPostAPIGuildTemplatesJSONBody>>) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
-        delete: (guildId: string, code: string) => Promise<import("discord-api-types/payloads/v10/template").APITemplate>;
-    };
-    roles: {
-        create: (guildId: string, body: import("discord-api-types/rest/v10/guild").RESTPostAPIGuildRoleJSONBody, reason?: string | undefined) => Promise<any>;
-        list: (guildId: string, force?: boolean) => Promise<import("../structures").GuildRole[]>;
-        edit: (guildId: string, roleId: string, body: import("discord-api-types/rest/v10/guild").RESTPatchAPIGuildRoleJSONBody, reason?: string | undefined) => Promise<any>;
-        delete: (guildId: string, roleId: string, reason?: string | undefined) => Promise<void | undefined>;
-        editPositions: (guildId: string, body: import("discord-api-types/rest/v10/guild").RESTPatchAPIGuildRolePositionsJSONBody) => Promise<import("../structures").GuildRole[]>;
-    };
+    users: UsersShorter;
+    channels: ChannelShorter;
+    guilds: GuildShorter;
+    messages: MessageShorter;
+    members: MemberShorter;
+    webhooks: WebhookShorter;
+    templates: TemplateShorter;
+    roles: RoleShorter;
+    reactions: ReactionShorter;
+    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>;
@@ -191,7 +40,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>;
@@ -215,7 +64,7 @@ export declare class BaseClient {
     }>;
 }
 export interface BaseClientOptions {
-    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean>) => {};
+    context?: (interaction: ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | When<InferWithPrefix, Message, never>) => {};
     globalMiddlewares?: readonly (keyof RegisteredMiddlewares)[];
 }
 export interface StartOptions {
@@ -259,12 +108,12 @@ 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 type ServicesOptions = {
+export interface ServicesOptions {
     rest?: ApiHandler;
     cache?: {
-        adapter: Adapter;
+        adapter?: Adapter;
         disabledCache?: Cache['disabledCache'];
     };
     langs?: {
@@ -272,5 +121,10 @@ export type 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

@@ -6,24 +6,21 @@ const api_1 = require("../api");
 const cache_1 = require("../cache");
 const handler_1 = require("../commands/handler");
 const common_1 = require("../common");
-const members_1 = require("../common/shorters/members");
-const messages_1 = require("../common/shorters/messages");
-const roles_1 = require("../common/shorters/roles");
-const templates_1 = require("../common/shorters/templates");
-const webhook_1 = require("../common/shorters/webhook");
 const handler_2 = require("../components/handler");
 const handler_3 = require("../langs/handler");
 class BaseClient {
     rest;
     cache;
-    users = new common_1.UsersShorter(this).users;
-    channels = new common_1.ChannelShorter(this).channels;
-    guilds = new common_1.GuildShorter(this).guilds;
-    messages = new messages_1.MessageShorter(this).messages;
-    members = new members_1.MemberShorter(this).members;
-    webhooks = new webhook_1.WebhookShorter(this).webhooks;
-    templates = new templates_1.TemplateShorter(this).templates;
-    roles = new roles_1.RoleShorter(this).roles;
+    users = new common_1.UsersShorter(this);
+    channels = new common_1.ChannelShorter(this);
+    guilds = new common_1.GuildShorter(this);
+    messages = new common_1.MessageShorter(this);
+    members = new common_1.MemberShorter(this);
+    webhooks = new common_1.WebhookShorter(this);
+    templates = new common_1.TemplateShorter(this);
+    roles = new common_1.RoleShorter(this);
+    reactions = new common_1.ReactionShorter(this);
+    emojis = new common_1.EmojiShorter(this);
     debugger;
     logger = new common_1.Logger({
         name: '[Seyfert]',
@@ -61,12 +58,53 @@ 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, cache.disabledCache ?? this.cache?.disabledCache, this);
+            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)
@@ -74,9 +112,6 @@ class BaseClient {
             if (langs.aliases)
                 this.langs.aliases = Object.entries(langs.aliases);
         }
-        if (middlewares) {
-            this.middlewares = middlewares;
-        }
     }
     async execute(..._options) {
         if ((await this.getRC()).debug) {
@@ -142,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,5 @@
-import type { Command, CommandContext, Message, SubCommand } from '..';
+import type { ClientEvent, Command, CommandContext, EventHandlerLike, Message, SubCommand } from '..';
 import { type DeepPartial, type GatewayDispatchPayload, type GatewayPresenceUpdateData, type If } from '../common';
-import { EventHandler } from '../events';
 import { ClientUser } from '../structures';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
 import { MemberUpdateHandler } from '../websocket/discord/events/memberUpdate';
@@ -10,7 +9,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 +17,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?: {
@@ -32,6 +34,11 @@ export interface ClientOptions extends BaseClientOptions {
     shards?: {
         start: number;
         end: number;
+        total?: number;
+    };
+    gateway?: {
+        properties?: Partial<ShardManagerOptions['properties']>;
+        compress?: ShardManagerOptions['compress'];
     };
     commands?: {
         prefix: (message: Message) => Promise<string[]> | string[];

package/lib/client/client.js

@@ -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');
         }
@@ -77,7 +89,10 @@ class Client extends base_1.BaseClient {
                 presence: this.options?.presence,
                 debug: debugRC,
                 shardStart: this.options?.shards?.start,
-                shardEnd: this.options?.shards?.end,
+                shardEnd: this.options?.shards?.end ?? this.options?.shards?.total,
+                totalShards: this.options?.shards?.total ?? this.options?.shards?.end,
+                properties: { ...this.options?.gateway?.properties, ...websocket_1.properties },
+                compress: this.options?.gateway?.compress,
             });
         }
         this.cache.intents = this.gateway.options.intents;
@@ -89,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
@@ -126,7 +141,7 @@ class Client extends base_1.BaseClient {
                         if (!this.__handleGuilds?.size ||
                             !((this.gateway.options.intents & common_1.GatewayIntentBits.Guilds) === common_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;
                         }
@@ -136,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;
@@ -145,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/oninteractioncreate.js

@@ -9,7 +9,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
     switch (body.type) {
         case v10_1.InteractionType.ApplicationCommandAutocomplete:
             {
-                const parentCommand = self.commands.values.find(x => {
+                const parentCommand = self.commands?.values.find(x => {
                     if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
                         return false;
                     }
@@ -47,7 +47,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     case v10_1.ApplicationCommandType.Message:
                     case v10_1.ApplicationCommandType.User:
                         {
-                            const command = self.commands.values.find(x => {
+                            const command = self.commands?.values.find(x => {
                                 if (x.guild_id && !x.guild_id.includes(body.data.guild_id ?? '')) {
                                     return false;
                                 }
@@ -57,7 +57,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                             // idc, is a YOU problem
                             if (!command?.run)
                                 return self.logger.warn(`${command.name ?? 'Unknown'} command does not have 'run' callback`);
-                            const context = new commands_1.MenuCommandContext(self, interaction, shardId);
+                            const context = new commands_1.MenuCommandContext(self, interaction, shardId, command);
                             const extendContext = self.options?.context?.(interaction) ?? {};
                             Object.assign(context, extendContext);
                             try {
@@ -103,7 +103,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     case v10_1.ApplicationCommandType.ChatInput:
                         {
                             const packetData = body.data;
-                            const parentCommand = self.commands.values.find(x => {
+                            const parentCommand = self.commands?.values.find(x => {
                                 if (x.guild_id && !x.guild_id.includes(packetData.guild_id ?? '')) {
                                     return false;
                                 }
@@ -114,7 +114,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                             const command = optionsResolver.getCommand();
                             if (!command?.run)
                                 return self.logger.warn(`${optionsResolver.fullCommandName} command does not have 'run' callback`);
-                            const context = new commands_1.CommandContext(self, interaction, optionsResolver, shardId);
+                            const context = new commands_1.CommandContext(self, interaction, optionsResolver, shardId, command);
                             const extendContext = self.options?.context?.(interaction) ?? {};
                             Object.assign(context, extendContext);
                             try {
@@ -167,22 +167,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;