seyfert 1.0.0 → 1.1.0

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

@@ -1,11 +1,12 @@
 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;
     client: BaseClient;
     namespace: string;
-    constructor(cache: Cache, client?: BaseClient);
+    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>;

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

@@ -72,7 +72,7 @@ class GuildRelatedResource {
             : (0, common_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => this.adapter.get(keys.map(x => `${this.namespace}.${x}`)));
     }
     count(to) {
-        return this.adapter.count(this.hashId(to));
+        return to === '*' ? (0, common_1.fakePromise)(this.keys(to)).then(x => x.length) : this.adapter.count(this.hashId(to));
     }
     contains(id, guild) {
         return this.adapter.contains(this.hashId(guild), id);

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

@@ -2,178 +2,26 @@ 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 type { InferWithPrefix, 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 { 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 { ComponentHandler } from '../components/handler';
 import { LangsHandler } from '../langs/handler';
-import type { ChatInputCommandInteraction, MessageCommandInteraction, UserCommandInteraction } from '../structures';
+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;
@@ -215,7 +63,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 {
@@ -261,17 +109,16 @@ export type InternalRuntimeConfig = Omit<MakeRequired<RC, 'intents'>, 'publicKey
 export type RuntimeConfig = OmitInsert<InternalRuntimeConfig, 'intents', {
     intents?: IntentStrings | number;
 }>;
-export type ServicesOptions = {
+export interface ServicesOptions {
     rest?: ApiHandler;
     cache?: {
-        adapter: Adapter;
+        adapter?: Adapter;
         disabledCache?: Cache['disabledCache'];
-        asyncCache?: boolean;
     };
     langs?: {
         default?: string;
         aliases?: Record<string, LocaleString[]>;
     };
     middlewares?: Record<string, MiddlewareContext>;
-};
+}
 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]',
@@ -66,7 +63,7 @@ class BaseClient {
             this.rest = rest;
         }
         if (cache) {
-            this.cache = new cache_1.Cache(this.cache?.intents ?? 0, cache.adapter, cache.asyncCache ?? this.cache?.asyncCache, 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 (langs) {
             if (langs.default)
@@ -108,7 +105,7 @@ class BaseClient {
             });
         }
         if (!this.cache) {
-            this.cache = new cache_1.Cache(0, new cache_1.MemoryAdapter(), false, [], this);
+            this.cache = new cache_1.Cache(0, new cache_1.MemoryAdapter(), [], this);
         }
         else {
             this.cache.__setClient(this);

package/lib/client/client.d.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext, Message, SubCommand } from '..';
-import type { DeepPartial, GatewayDispatchPayload, GatewayPresenceUpdateData, If } from '../common';
+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';
@@ -32,6 +32,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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 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");
@@ -11,7 +12,7 @@ const base_1 = require("./base");
 const oninteractioncreate_1 = require("./oninteractioncreate");
 const onmessagecreate_1 = require("./onmessagecreate");
 class Client extends base_1.BaseClient {
-    __handleGuilds;
+    __handleGuilds = new Set();
     gateway;
     events = new events_1.EventHandler(this.logger);
     me;
@@ -21,7 +22,6 @@ class Client extends base_1.BaseClient {
         super(options);
     }
     setServices({ gateway, ...rest }) {
-        this.__handleGuilds = new Set();
         super.setServices(rest);
         if (gateway) {
             const onPacket = this.onPacket.bind(this);
@@ -77,7 +77,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;
@@ -123,25 +126,23 @@ class Client extends base_1.BaseClient {
                         this.botId = packet.d.user.id;
                         this.applicationId = packet.d.application.id;
                         this.me = new structures_1.ClientUser(this, packet.d.user, packet.d.application);
-                        if (!this.__handleGuilds?.size) {
-                            if ([...this.gateway.values()].every(shard => shard.data.session_id) &&
-                                this.events.values.BOT_READY &&
-                                (this.events.values.BOT_READY.fired ? !this.events.values.BOT_READY.data.once : true)) {
+                        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);
-                                delete this.__handleGuilds;
                             }
+                            delete this.__handleGuilds;
                         }
                         this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
                         break;
                     case 'GUILD_CREATE': {
                         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) &&
-                                this.events.values.BOT_READY &&
-                                (this.events.values.BOT_READY.fired ? !this.events.values.BOT_READY.data.once : true)) {
+                            if (!this.__handleGuilds.size && [...this.gateway.values()].every(shard => shard.data.session_id)) {
                                 await this.events.runEvent('BOT_READY', this, this.me, -1);
                             }
+                            if (!this.__handleGuilds.size)
+                                delete this.__handleGuilds;
                             return;
                         }
                         break;

package/lib/client/oninteractioncreate.js

@@ -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 {
@@ -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 {
@@ -178,8 +178,8 @@ async function onInteractionCreate(self, body, shardId, __reply) {
         case v10_1.InteractionType.MessageComponent:
             {
                 const interaction = structures_1.BaseInteraction.from(self, body, __reply);
-                if (self.components.hasComponent([body.message.id, body.id], interaction.customId)) {
-                    await self.components.onComponent([body.message.id, body.id], interaction);
+                if (self.components.hasComponent(body.message.id, interaction.customId)) {
+                    await self.components.onComponent(body.message.id, interaction);
                 }
                 else {
                     await self.components.executeComponent(interaction);