seyfert 2.1.1-dev-11318571086.0 → 2.1.1-dev-11388830407.0

package/lib/api/api.d.ts

@@ -1,10 +1,11 @@
-import { Logger } from '../common';
+import { type Awaitable, Logger } from '../common';
 import type { APIRoutes } from './Routes';
 import { Bucket } from './bucket';
 import { type ApiHandlerInternalOptions, type ApiHandlerOptions, type ApiRequestOptions, type HttpMethods, type RawFile, type RequestHeaders } from './shared';
 export interface ApiHandler {
     debugger?: Logger;
 }
+export type OnRatelimitCallback = (response: Response, request: ApiRequestOptions) => Awaitable<any>;
 export declare class ApiHandler {
     #private;
     options: ApiHandlerInternalOptions;
@@ -16,6 +17,7 @@ export declare class ApiHandler {
         resolve: (value: any) => any;
         reject: (error: any) => any;
     }>;
+    onRatelimit?: OnRatelimitCallback;
     constructor(options: ApiHandlerOptions);
     get proxy(): APIRoutes;
     globalUnblock(): void;

package/lib/api/api.js

@@ -16,6 +16,7 @@ class ApiHandler {
     readyQueue = [];
     cdn = Router_1.CDNRouter.createProxy();
     workerPromises;
+    onRatelimit;
     constructor(options) {
         this.options = {
             baseUrl: 'api/v10',
@@ -198,6 +199,7 @@ class ApiHandler {
         });
     }
     async handle429(route, method, url, request, response, result, next, reject, now) {
+        await this.onRatelimit?.(response, request);
         const content = `${JSON.stringify(request)} `;
         let retryAfter = Number(response.headers.get('x-ratelimit-reset-after') || response.headers.get('retry-after')) * 1000;
         if (Number.isNaN(retryAfter)) {

package/lib/client/client.d.ts

@@ -1,7 +1,7 @@
 import type { CommandContext, Message } from '..';
 import { type Awaitable, type DeepPartial, type If } from '../common';
 import { EventHandler } from '../events';
-import { type GatewayDispatchPayload, type GatewayPresenceUpdateData } from '../types';
+import type { GatewayDispatchPayload, GatewayPresenceUpdateData } from '../types';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
 import { MemberUpdateHandler } from '../websocket/discord/events/memberUpdate';
 import { PresenceUpdateHandler } from '../websocket/discord/events/presenceUpdate';

package/lib/client/client.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const common_1 = require("../common");
 const events_1 = require("../events");
-const types_1 = require("../types");
 const websocket_1 = require("../websocket");
 const memberUpdate_1 = require("../websocket/discord/events/memberUpdate");
 const presenceUpdate_1 = require("../websocket/discord/events/presenceUpdate");
@@ -164,7 +163,7 @@ class Client extends base_1.BaseClient {
                         this.botId = packet.d.user.id;
                         this.applicationId = packet.d.application.id;
                         this.me = transformers_1.Transformers.ClientUser(this, packet.d.user, packet.d.application);
-                        if (!(0, common_1.hasIntent)(this.gateway.options.intents, types_1.GatewayIntentBits.Guilds)) {
+                        if (!this.__handleGuilds.length) {
                             if ([...this.gateway.values()].every(shard => shard.data.session_id)) {
                                 await this.events?.runEvent('BOT_READY', this, this.me, -1);
                             }

package/lib/client/workerclient.d.ts

@@ -1,6 +1,6 @@
 import { type DeepPartial, type When } from '../common';
 import { EventHandler } from '../events';
-import { type GatewayDispatchPayload } from '../types';
+import type { GatewayDispatchPayload } from '../types';
 import { Shard, type ShardManagerOptions, type WorkerData } from '../websocket';
 import type { WorkerMessage, WorkerShardInfo } from '../websocket/discord/worker';
 import type { ManagerMessages } from '../websocket/discord/workermanager';

package/lib/client/workerclient.js

@@ -7,7 +7,6 @@ const __1 = require("..");
 const cache_1 = require("../cache");
 const common_1 = require("../common");
 const events_1 = require("../events");
-const types_1 = require("../types");
 const websocket_1 = require("../websocket");
 const base_1 = require("./base");
 const memberUpdate_1 = require("../websocket/discord/events/memberUpdate");
@@ -34,7 +33,7 @@ catch {
     //
 }
 class WorkerClient extends base_1.BaseClient {
-    __handleGuilds = new Set();
+    __handleGuilds;
     __handleGuildsResharding;
     memberUpdateHandler = new memberUpdate_1.MemberUpdateHandler();
     presenceUpdateHandler = new presenceUpdate_1.PresenceUpdateHandler();
@@ -122,7 +121,7 @@ class WorkerClient extends base_1.BaseClient {
             workerId: workerData.workerId,
         });
         if (workerData.resharding) {
-            this.__handleGuildsResharding = new Set();
+            this.__handleGuildsResharding = [];
         }
         await super.start(options);
         await this.loadEvents(options.eventsDir);
@@ -211,23 +210,24 @@ class WorkerClient extends base_1.BaseClient {
                             },
                             handlePayload(_, payload) {
                                 if (payload.t === 'GUILD_CREATE' || payload.t === 'GUILD_DELETE') {
-                                    self.__handleGuildsResharding.delete(payload.d.id);
-                                    if (!self.__handleGuildsResharding?.size && shardsConnected === workerData.shards.length) {
-                                        delete self.__handleGuildsResharding;
-                                        self.postMessage({
-                                            type: 'WORKER_READY_RESHARDING',
-                                            workerId: workerData.workerId,
-                                        });
+                                    const indexOf = self.__handleGuildsResharding.indexOf(payload.d.id);
+                                    if (indexOf !== -1) {
+                                        self.__handleGuildsResharding.splice(indexOf, 1);
+                                        if (!self.__handleGuildsResharding?.length && shardsConnected === workerData.shards.length) {
+                                            delete self.__handleGuildsResharding;
+                                            self.postMessage({
+                                                type: 'WORKER_READY_RESHARDING',
+                                                workerId: workerData.workerId,
+                                            });
+                                        }
                                     }
                                 }
                                 if (payload.t !== 'READY')
                                     return;
                                 shardsConnected++;
-                                for (const guild of payload.d.guilds) {
-                                    self.__handleGuildsResharding.add(guild.id);
-                                }
-                                if (shardsConnected === workerData.shards.length &&
-                                    !(0, common_1.hasIntent)(workerData.intents, types_1.GatewayIntentBits.Guilds)) {
+                                const ids = payload.d.guilds.map(x => x.id);
+                                self.__handleGuildsResharding = self.__handleGuildsResharding?.concat(ids) ?? ids;
+                                if (shardsConnected === workerData.shards.length && !self.__handleGuildsResharding.length) {
                                     delete self.__handleGuildsResharding;
                                     self.postMessage({
                                         type: 'WORKER_READY_RESHARDING',
@@ -357,7 +357,7 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'WORKER_ALREADY_EXISTS_RESHARDING':
                 {
-                    this.__handleGuildsResharding = new Set();
+                    this.__handleGuildsResharding = [];
                     this.postMessage({
                         type: 'WORKER_START_RESHARDING',
                         workerId: workerData.workerId,
@@ -442,9 +442,9 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'GUILD_DELETE':
             case 'GUILD_CREATE': {
-                if (this.__handleGuilds?.has(packet.d.id)) {
-                    this.__handleGuilds?.delete(packet.d.id);
-                    if (!this.__handleGuilds?.size && [...this.shards.values()].every(shard => shard.data.session_id)) {
+                if (this.__handleGuilds?.includes(packet.d.id)) {
+                    this.__handleGuilds?.splice(this.__handleGuilds.indexOf(packet.d.id), 1);
+                    if (!this.__handleGuilds?.length && [...this.shards.values()].every(shard => shard.data.session_id)) {
                         delete this.__handleGuilds;
                         await this.cache.onPacket(packet);
                         this.postMessage({
@@ -453,7 +453,7 @@ class WorkerClient extends base_1.BaseClient {
                         });
                         return this.events?.runEvent('WORKER_READY', this, this.me, -1);
                     }
-                    if (!this.__handleGuilds?.size)
+                    if (!this.__handleGuilds?.length)
                         delete this.__handleGuilds;
                     return this.cache.onPacket(packet);
                 }
@@ -476,11 +476,8 @@ class WorkerClient extends base_1.BaseClient {
                         break;
                     case 'READY':
                         {
-                            if (!this.__handleGuilds)
-                                this.__handleGuilds = new Set();
-                            for (const g of packet.d.guilds) {
-                                this.__handleGuilds?.add(g.id);
-                            }
+                            const ids = packet.d.guilds.map(x => x.id);
+                            this.__handleGuilds = this.__handleGuilds?.concat(ids) ?? ids;
                             this.botId = packet.d.user.id;
                             this.applicationId = packet.d.application.id;
                             this.me = transformers_1.Transformers.ClientUser(this, packet.d.user, packet.d.application);
@@ -493,7 +490,7 @@ class WorkerClient extends base_1.BaseClient {
                                 });
                                 await this.events?.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
                             }
-                            if (!(0, common_1.hasIntent)(workerData.intents, types_1.GatewayIntentBits.Guilds)) {
+                            if (!this.__handleGuilds.length) {
                                 if ([...this.shards.values()].every(shard => shard.data.session_id)) {
                                     this.postMessage({
                                         type: 'WORKER_READY',

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

@@ -1,6 +1,6 @@
 import type { AllChannels, InferWithPrefix, ReturnCache } from '../..';
 import type { GuildMemberStructure, GuildStructure, InteractionGuildMemberStructure, MessageStructure, OptionResolverStructure, WebhookMessageStructure } from '../../client/transformers';
-import type { If, UnionToTuple, When } from '../../common';
+import type { If, MakeRequired, UnionToTuple, When } from '../../common';
 import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest } from '../../common/types/write';
 import { ChatInputCommandInteraction } from '../../structures';
 import { BaseContext } from '../basecontext';
@@ -44,3 +44,7 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     get member(): If<InferWithPrefix, GuildMemberStructure | InteractionGuildMemberStructure | undefined, InteractionGuildMemberStructure | undefined>;
     isChat(): this is CommandContext;
 }
+export interface GuildCommandContext<T extends OptionsRecord = {}, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<CommandContext<T, M>, 'guildId'>, 'guild'> {
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
+}

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

@@ -1,6 +1,6 @@
 import type { ReturnCache } from '../..';
 import type { GuildMemberStructure, GuildStructure, MessageStructure, WebhookMessageStructure } from '../../client/transformers';
-import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../../common';
+import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, ModalCreateBodyRequest, UnionToTuple, When } from '../../common';
 import type { AllChannels, EntryPointInteraction } from '../../structures';
 import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
@@ -38,3 +38,7 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     get author(): import("../..").User;
     get member(): import("../..").InteractionGuildMember | undefined;
 }
+export interface GuildEntryPointContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<EntryPointContext<M>, 'guildId'>, 'guild'> {
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
+}

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

@@ -1,6 +1,6 @@
 import type { ContextMenuCommand, ReturnCache } from '../..';
 import { type GuildMemberStructure, type GuildStructure, type MessageStructure, type UserStructure, type WebhookMessageStructure } from '../../client/transformers';
-import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type ModalCreateBodyRequest, type UnionToTuple, type When } from '../../common';
+import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type MakeRequired, type ModalCreateBodyRequest, type UnionToTuple, type When } from '../../common';
 import type { AllChannels, MessageCommandInteraction, UserCommandInteraction } from '../../structures';
 import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
@@ -42,3 +42,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
     isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
 }
+export interface GuildMenuCommandContext<T extends MessageCommandInteraction | UserCommandInteraction, M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<MenuCommandContext<T, M>, 'guildId'>, 'guild'> {
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
+}

package/lib/commands/handler.js

@@ -474,8 +474,8 @@ class CommandHandler extends common_1.BaseHandler {
             option.onPermissionsFail?.bind(option) ??
                 commandInstance.onPermissionsFail?.bind(commandInstance) ??
                 this.client.options.commands?.defaults?.onPermissionsFail;
-        option.botPermissions = new Permissions_1.PermissionsBitField().add(option.botPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.botPermissions);
-        option.defaultMemberPermissions ??= new Permissions_1.PermissionsBitField().add(option.defaultMemberPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.defaultMemberPermissions);
+        option.botPermissions = Permissions_1.PermissionsBitField.resolve(option.botPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.botPermissions ?? Permissions_1.PermissionsBitField.None);
+        option.defaultMemberPermissions ??= Permissions_1.PermissionsBitField.resolve(option.defaultMemberPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.defaultMemberPermissions ?? Permissions_1.PermissionsBitField.None);
         option.contexts ??= commandInstance.contexts;
         option.integrationTypes ??= commandInstance.integrationTypes;
         option.props ??= commandInstance.props;

package/lib/components/componentcontext.d.ts

@@ -2,7 +2,7 @@ import type { AllChannels, ButtonInteraction, ChannelSelectMenuInteraction, Comp
 import type { GuildMemberStructure, GuildStructure, MessageStructure, WebhookMessageStructure } from '../client/transformers';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
-import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import type { ComponentInteractionMessageUpdate, InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
 export interface ComponentContext<Type extends keyof ContextComponentCommandInteractionMap = keyof ContextComponentCommandInteractionMap> extends BaseContext, ExtendContext {
 }
 /**
@@ -117,3 +117,7 @@ export interface ContextComponentCommandInteractionMap {
     MentionableSelect: MentionableSelectMenuInteraction;
     ChannelSelect: ChannelSelectMenuInteraction;
 }
+export interface GuildComponentContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ComponentContext<M>, 'guildId'>, 'guild'> {
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
+}

package/lib/components/modalcontext.d.ts

@@ -2,7 +2,7 @@ import type { AllChannels, ModalCommand, ModalSubmitInteraction, ReturnCache } f
 import type { GuildMemberStructure, GuildStructure, MessageStructure, WebhookMessageStructure } from '../client/transformers';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
-import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
+import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, ModalCreateBodyRequest, UnionToTuple, When } from '../common';
 export interface ModalContext extends BaseContext, ExtendContext {
 }
 /**
@@ -103,3 +103,7 @@ export declare class ModalContext<M extends keyof RegisteredMiddlewares = never>
     get member(): import("..").InteractionGuildMember | undefined;
     isModal(): this is ModalContext;
 }
+export interface GuildModalContext<M extends keyof RegisteredMiddlewares = never> extends Omit<MakeRequired<ModalContext<M>, 'guildId'>, 'guild'> {
+    guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
+    guild(mode?: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
+}

package/lib/structures/extra/BitField.d.ts

@@ -13,5 +13,5 @@ export declare class BitField<T extends object> {
     values(bits?: BitFieldResolvable<T>[]): bigint[];
     add(...bits: (BitFieldResolvable<T> | undefined)[]): bigint;
     remove(...bits: BitFieldResolvable<T>[]): bigint;
-    resolve(bits: BitFieldResolvable<T>): bigint;
+    resolve(...bits: BitFieldResolvable<T>[]): bigint;
 }

package/lib/structures/extra/BitField.js

@@ -60,23 +60,31 @@ class BitField {
         }
         return this.bits;
     }
-    resolve(bits) {
-        switch (typeof bits) {
-            case 'string':
-                return this.resolve(this.Flags[bits]);
-            case 'number':
-                return BigInt(bits);
-            case 'bigint':
-                return bits;
-            case 'object': {
-                if (!Array.isArray(bits)) {
-                    throw new TypeError(`Cannot resolve permission: ${bits}`);
+    resolve(...bits) {
+        let bitsResult = 0n;
+        for (const bit of bits) {
+            switch (typeof bit) {
+                case 'string':
+                    bitsResult |= this.resolve(this.Flags[bit]);
+                    break;
+                case 'number':
+                    bitsResult |= BigInt(bit);
+                    break;
+                case 'bigint':
+                    bitsResult |= bit;
+                    break;
+                case 'object': {
+                    if (!Array.isArray(bit)) {
+                        throw new TypeError(`Cannot resolve permission: ${bit}`);
+                    }
+                    bitsResult |= bits.reduce((acc, val) => this.resolve(val) | acc, BitField.None);
+                    break;
                 }
-                return bits.map(x => this.resolve(x)).reduce((acc, cur) => acc | cur, BitField.None);
+                default:
+                    throw new TypeError(`Cannot resolve permission: ${typeof bit === 'symbol' ? String(bit) : bit}`);
             }
-            default:
-                throw new TypeError(`Cannot resolve permission: ${typeof bits === 'symbol' ? String(bits) : bits}`);
         }
+        return bitsResult;
     }
 }
 exports.BitField = BitField;

package/lib/structures/extra/Permissions.d.ts

@@ -59,6 +59,6 @@ export declare class PermissionsBitField extends BitField<typeof PermissionFlags
     keys: (bits?: BitFieldResolvable<typeof PermissionFlagsBits>[]) => PermissionStrings;
     has(...bits: BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
     strictHas(...bits: BitFieldResolvable<typeof PermissionFlagsBits>[]): boolean;
-    resolve<T extends typeof PermissionFlagsBits>(bits: BitFieldResolvable<T>): bigint;
-    static resolve<T extends typeof PermissionFlagsBits>(bits: BitFieldResolvable<T>): bigint;
+    resolve<T extends typeof PermissionFlagsBits>(...bits: BitFieldResolvable<T>[]): bigint;
+    static resolve<T extends typeof PermissionFlagsBits>(...bits: BitFieldResolvable<T>[]): bigint;
 }

package/lib/structures/extra/Permissions.js

@@ -17,26 +17,34 @@ class PermissionsBitField extends BitField_1.BitField {
     strictHas(...bits) {
         return super.has(...bits);
     }
-    resolve(bits) {
-        return PermissionsBitField.resolve(bits);
+    resolve(...bits) {
+        return bits.reduce((acc, cur) => acc | PermissionsBitField.resolve(cur), BitField_1.BitField.None);
     }
-    static resolve(bits) {
-        switch (typeof bits) {
-            case 'string':
-                return PermissionsBitField.resolve(types_1.PermissionFlagsBits[bits]);
-            case 'number':
-                return BigInt(bits);
-            case 'bigint':
-                return bits;
-            case 'object': {
-                if (!Array.isArray(bits)) {
-                    throw new TypeError(`Cannot resolve permission: ${bits}`);
+    static resolve(...bits) {
+        let bitsResult = 0n;
+        for (const bit of bits) {
+            switch (typeof bit) {
+                case 'string':
+                    bitsResult |= PermissionsBitField.resolve(types_1.PermissionFlagsBits[bit]);
+                    break;
+                case 'number':
+                    bitsResult |= BigInt(bit);
+                    break;
+                case 'bigint':
+                    bitsResult |= bit;
+                    break;
+                case 'object': {
+                    if (!Array.isArray(bit)) {
+                        throw new TypeError(`Cannot resolve permission: ${bit}`);
+                    }
+                    bitsResult |= bit.reduce((acc, val) => PermissionsBitField.resolve(val) | acc, BitField_1.BitField.None);
+                    break;
                 }
-                return bits.map(x => PermissionsBitField.resolve(x)).reduce((acc, cur) => acc | cur, BitField_1.BitField.None);
+                default:
+                    throw new TypeError(`Cannot resolve permission: ${typeof bit === 'symbol' ? String(bit) : bit}`);
             }
-            default:
-                throw new TypeError(`Cannot resolve permission: ${typeof bits === 'symbol' ? String(bits) : bits}`);
         }
+        return bitsResult;
     }
 }
 exports.PermissionsBitField = PermissionsBitField;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11318571086.0",
+	"version": "2.1.1-dev-11388830407.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -24,11 +24,11 @@
 		"@biomejs/biome": "1.9.3",
 		"@commitlint/cli": "^19.5.0",
 		"@commitlint/config-conventional": "^19.5.0",
-		"@types/node": "^22.7.5",
+		"@types/node": "^22.7.6",
 		"husky": "^9.1.6",
 		"lint-staged": "^15.2.10",
 		"typescript": "^5.6.3",
-		"vitest": "^2.1.2"
+		"vitest": "^2.1.3"
 	},
 	"homepage": "https://seyfert.dev",
 	"repository": {