seyfert 2.1.1-dev-12247418720.0 → 2.1.1-dev-12309212345.0

package/lib/cache/index.d.ts

@@ -16,8 +16,8 @@ import { type GatewayDispatchPayload, GatewayIntentBits } from '../types';
 import { Messages } from './resources/messages';
 import { Overwrites } from './resources/overwrites';
 export { BaseResource } from './resources/default/base';
-export { GuildRelatedResource } from './resources/default/guild-related';
 export { GuildBasedResource } from './resources/default/guild-based';
+export { GuildRelatedResource } from './resources/default/guild-related';
 export type InferAsyncCache = InternalOptions extends {
     asyncCache: infer P;
 } ? P : false;

package/lib/cache/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cache = exports.GuildBasedResource = exports.GuildRelatedResource = exports.BaseResource = void 0;
+exports.Cache = exports.GuildRelatedResource = exports.GuildBasedResource = exports.BaseResource = void 0;
 const common_1 = require("../common");
 const guilds_1 = require("./resources/guilds");
 const users_1 = require("./resources/users");
@@ -32,10 +32,10 @@ const messages_1 = require("./resources/messages");
 const overwrites_1 = require("./resources/overwrites");
 var base_1 = require("./resources/default/base");
 Object.defineProperty(exports, "BaseResource", { enumerable: true, get: function () { return base_1.BaseResource; } });
-var guild_related_1 = require("./resources/default/guild-related");
-Object.defineProperty(exports, "GuildRelatedResource", { enumerable: true, get: function () { return guild_related_1.GuildRelatedResource; } });
 var guild_based_1 = require("./resources/default/guild-based");
 Object.defineProperty(exports, "GuildBasedResource", { enumerable: true, get: function () { return guild_based_1.GuildBasedResource; } });
+var guild_related_1 = require("./resources/default/guild-related");
+Object.defineProperty(exports, "GuildRelatedResource", { enumerable: true, get: function () { return guild_related_1.GuildRelatedResource; } });
 __exportStar(require("./adapters/index"), exports);
 class Cache {
     intents;
@@ -117,7 +117,7 @@ class Cache {
         return this.hasIntent('DirectMessages');
     }
     get hasBansIntent() {
-        return this.hasIntent('GuildBans');
+        return this.hasIntent('GuildModeration');
     }
     async bulkGet(keys) {
         const allData = {};
@@ -321,9 +321,11 @@ class Cache {
                 break;
             case 'GUILD_CREATE':
             case 'GUILD_UPDATE':
+            case 'RAW_GUILD_CREATE':
                 await this.guilds?.patch(event.d.id, { unavailable: false, ...event.d });
                 break;
             case 'GUILD_DELETE':
+            case 'RAW_GUILD_DELETE':
                 if (event.d.unavailable) {
                     await this.guilds?.patch(event.d.id, event.d);
                 }

package/lib/client/base.d.ts

@@ -37,14 +37,13 @@ export declare class BaseClient {
     soundboards: SoundboardShorter;
     debugger?: Logger;
     logger: Logger;
-    langs?: LangsHandler | undefined;
-    commands?: CommandHandler | undefined;
-    components?: ComponentHandler | undefined;
+    langs: LangsHandler;
+    commands: CommandHandler;
+    components: ComponentHandler;
     handleCommand: HandleCommand;
     private _applicationId?;
     private _botId?;
     middlewares?: Record<string, MiddlewareContext>;
-    protected static assertString(value: unknown, message?: string): asserts value is string;
     protected static getBotIdFromToken(token: string): string;
     options: BaseClientOptions;
     constructor(options?: BaseClientOptions);

package/lib/client/base.js

@@ -45,11 +45,6 @@ class BaseClient {
     _applicationId;
     _botId;
     middlewares;
-    static assertString(value, message) {
-        if (!(typeof value === 'string' && value !== '')) {
-            throw new Error(message ?? 'Value is not a string');
-        }
-    }
     static getBotIdFromToken(token) {
         return Buffer.from(token.split('.')[0], 'base64').toString('ascii');
     }
@@ -191,7 +186,7 @@ class BaseClient {
         await this.loadComponents(options.componentsDir);
         const { token: tokenRC, debug } = await this.getRC();
         const token = options.token ?? tokenRC;
-        BaseClient.assertString(token, 'token is not a string');
+        (0, common_1.assertString)(token, 'token is not a string');
         if (this.rest.options.token === 'INVALID')
             this.rest.options.token = token;
         this.rest.debug = debug;
@@ -248,14 +243,16 @@ class BaseClient {
         return should;
     }
     syncCachePath(cachePath) {
-        return node_fs_1.promises.writeFile(cachePath, JSON.stringify(this.commands.values.filter(cmd => !('ignore' in cmd) || cmd.ignore !== shared_1.IgnoreCommand.Slash).map(x => x.toJSON())));
+        return node_fs_1.promises.writeFile(cachePath, JSON.stringify(this.commands.values
+            .filter(cmd => !('ignore' in cmd) || cmd.ignore !== shared_1.IgnoreCommand.Slash)
+            .map(x => x.toJSON())));
     }
     async uploadCommands({ applicationId, cachePath } = {}) {
         applicationId ??= await this.getRC().then(x => x.applicationId ?? this.applicationId);
-        BaseClient.assertString(applicationId, 'applicationId is not a string');
+        (0, common_1.assertString)(applicationId, 'applicationId is not a string');
         const commands = this.commands.values;
         const filter = (0, common_1.filterSplit)(commands, command => ('guildId' in command ? !command.guildId : true));
-        if (this.commands?.entryPoint) {
+        if (this.commands.entryPoint) {
             filter.expect.push(this.commands.entryPoint);
         }
         if (!cachePath || (await this.shouldUploadCommands(cachePath)))

package/lib/client/client.d.ts

@@ -10,7 +10,6 @@ import { BaseClient } from './base';
 import { Collectors } from './collectors';
 import { type ClientUserStructure, type MessageStructure } from './transformers';
 export declare class Client<Ready extends boolean = boolean> extends BaseClient {
-    private __handleGuilds?;
     gateway: ShardManager;
     me: If<Ready, ClientUserStructure>;
     options: Omit<ClientOptions, 'commands'> & {
@@ -19,7 +18,7 @@ export declare class Client<Ready extends boolean = boolean> extends BaseClient
     memberUpdateHandler: MemberUpdateHandler;
     presenceUpdateHandler: PresenceUpdateHandler;
     collectors: Collectors;
-    events?: EventHandler | undefined;
+    events: EventHandler;
     constructor(options?: ClientOptions);
     setServices({ gateway, ...rest }: ServicesOptions & {
         gateway?: ShardManager;

package/lib/client/client.js

@@ -11,7 +11,6 @@ const collectors_1 = require("./collectors");
 const transformers_1 = require("./transformers");
 let parentPort;
 class Client extends base_1.BaseClient {
-    __handleGuilds;
     gateway;
     me;
     memberUpdateHandler = new memberUpdate_1.MemberUpdateHandler();
@@ -35,7 +34,7 @@ class Client extends base_1.BaseClient {
     }
     async loadEvents(dir) {
         dir ??= await this.getRC().then(x => ('events' in x.locations ? x.locations.events : undefined));
-        if (dir && this.events) {
+        if (dir) {
             await this.events.load(dir);
             this.logger.info('EventHandler loaded');
         }
@@ -70,7 +69,7 @@ class Client extends base_1.BaseClient {
         const intents = options?.connection?.intents ?? intentsRC;
         this.cache.intents = intents;
         if (!this.gateway) {
-            base_1.BaseClient.assertString(token, 'token is not a string');
+            (0, common_1.assertString)(token, 'token is not a string');
             this.gateway = new websocket_1.ShardManager({
                 token,
                 info: await this.proxy.gateway.bot.get(),
@@ -105,7 +104,7 @@ class Client extends base_1.BaseClient {
     }
     async onPacket(shardId, packet) {
         Promise.allSettled([
-            this.events?.runEvent('RAW', this, packet, shardId, false),
+            this.events.runEvent('RAW', this, packet, shardId, false),
             this.collectors.run('RAW', packet, this),
         ]); //ignore promise
         switch (packet.t) {
@@ -114,7 +113,7 @@ class Client extends base_1.BaseClient {
                     if (!this.memberUpdateHandler.check(packet.d)) {
                         return;
                     }
-                    await this.events?.execute(packet, this, shardId);
+                    await this.events.execute(packet, this, shardId);
                 }
                 break;
             case 'PRESENCE_UPDATE':
@@ -122,60 +121,42 @@ class Client extends base_1.BaseClient {
                     if (!this.presenceUpdateHandler.check(packet.d)) {
                         return;
                     }
-                    await this.events?.execute(packet, this, shardId);
+                    await this.events.execute(packet, this, shardId);
                 }
                 break;
-            case 'GUILD_DELETE':
-            case 'GUILD_CREATE': {
-                if (this.__handleGuilds?.includes(packet.d.id)) {
-                    this.__handleGuilds?.splice(this.__handleGuilds.indexOf(packet.d.id), 1);
-                    if (!this.__handleGuilds?.length && [...this.gateway.values()].every(shard => shard.data.session_id)) {
-                        delete this.__handleGuilds;
-                        await this.cache.onPacket(packet);
-                        return this.events?.runEvent('BOT_READY', this, this.me, -1);
-                    }
-                    if (!this.__handleGuilds?.length)
-                        delete this.__handleGuilds;
-                    return this.cache.onPacket(packet);
-                }
-                await this.events?.execute(packet, this, shardId);
-                break;
-            }
             //rest of the events
             default: {
                 switch (packet.t) {
                     case 'INTERACTION_CREATE':
                         {
-                            await this.events?.execute(packet, this, shardId);
+                            await this.events.execute(packet, this, shardId);
                             await this.handleCommand.interaction(packet.d, shardId);
                         }
                         break;
                     case 'MESSAGE_CREATE':
                         {
-                            await this.events?.execute(packet, this, shardId);
+                            await this.events.execute(packet, this, shardId);
                             await this.handleCommand.message(packet.d, shardId);
                         }
                         break;
                     case 'READY': {
-                        const ids = packet.d.guilds.map(x => x.id);
-                        if ((0, common_1.hasIntent)(this.gateway.options.intents, 'Guilds')) {
-                            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);
-                        if (!this.__handleGuilds?.length) {
-                            if ([...this.gateway.values()].every(shard => shard.data.session_id)) {
-                                await this.events?.runEvent('BOT_READY', this, this.me, -1);
-                            }
-                            delete this.__handleGuilds;
-                        }
                         this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
-                        await this.events?.execute(packet, this, shardId);
+                        await this.events.execute(packet, this, shardId);
                         break;
                     }
+                    case 'GUILDS_READY':
+                        {
+                            await this.events.execute(packet, this, shardId);
+                            if ([...this.gateway.values()].every(shard => shard.isReady)) {
+                                await this.events.runEvent('BOT_READY', this, this.me, -1);
+                            }
+                        }
+                        break;
                     default:
-                        await this.events?.execute(packet, this, shardId);
+                        await this.events.execute(packet, this, shardId);
                         break;
                 }
                 break;

package/lib/client/workerclient.d.ts

@@ -13,12 +13,10 @@ import type { ShardData } from '../websocket/discord/shared';
 import { Collectors } from './collectors';
 import { type ClientUserStructure } from './transformers';
 export declare class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
-    private __handleGuilds?;
-    private __handleGuildsResharding?;
     memberUpdateHandler: MemberUpdateHandler;
     presenceUpdateHandler: PresenceUpdateHandler;
     collectors: Collectors;
-    events?: EventHandler | undefined;
+    events: EventHandler;
     me: When<Ready, ClientUserStructure>;
     promises: Map<string, {
         resolve: (value: any) => void;
@@ -26,7 +24,6 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     }>;
     shards: Map<number, Shard>;
     resharding: Map<number, Shard>;
-    private _ready?;
     options: WorkerClientOptions;
     constructor(options?: WorkerClientOptions);
     get workerId(): number;

package/lib/client/workerclient.js

@@ -36,8 +36,6 @@ catch {
     //
 }
 class WorkerClient extends base_1.BaseClient {
-    __handleGuilds;
-    __handleGuildsResharding;
     memberUpdateHandler = new memberUpdate_1.MemberUpdateHandler();
     presenceUpdateHandler = new presenceUpdate_1.PresenceUpdateHandler();
     collectors = new collectors_1.Collectors();
@@ -46,7 +44,6 @@ class WorkerClient extends base_1.BaseClient {
     promises = new Map();
     shards = new Map();
     resharding = new Map();
-    _ready;
     constructor(options) {
         super(options);
         if (options?.postMessage) {
@@ -111,15 +108,12 @@ class WorkerClient extends base_1.BaseClient {
             type: workerData.resharding ? 'WORKER_START_RESHARDING' : 'WORKER_START',
             workerId: workerData.workerId,
         });
-        if (workerData.resharding) {
-            this.__handleGuildsResharding = [];
-        }
         await super.start(options);
         await this.loadEvents(options.eventsDir);
     }
     async loadEvents(dir) {
-        dir ??= await this.getRC().then(x => ('events' in x.locations ? x.locations.events : undefined));
-        if (dir && this.events) {
+        dir ??= await this.getRC().then(x => x.locations.events);
+        if (dir) {
             await this.events.load(dir);
             this.logger.info('EventHandler loaded');
         }
@@ -199,28 +193,10 @@ class WorkerClient extends base_1.BaseClient {
                                 ...this.options.gateway?.properties,
                             },
                             handlePayload(_, payload) {
-                                if (payload.t === 'GUILD_CREATE' || payload.t === 'GUILD_DELETE') {
-                                    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++;
-                                const ids = payload.d.guilds.map(x => x.id);
-                                if ((0, common_1.hasIntent)(workerData.intents, 'Guilds')) {
-                                    self.__handleGuildsResharding = self.__handleGuildsResharding?.concat(ids) ?? ids;
+                                if (payload.t === 'READY') {
+                                    shardsConnected++;
                                 }
-                                if (shardsConnected === workerData.shards.length && !self.__handleGuildsResharding?.length) {
-                                    delete self.__handleGuildsResharding;
+                                else if (payload.t === 'GUILDS_READY' && shardsConnected === workerData.shards.length) {
                                     self.postMessage({
                                         type: 'WORKER_READY_RESHARDING',
                                         workerId: workerData.workerId,
@@ -281,7 +257,7 @@ class WorkerClient extends base_1.BaseClient {
                 }
                 break;
             case 'BOT_READY':
-                await this.events?.runEvent('BOT_READY', this, this.me, -1);
+                await this.events.runEvent('BOT_READY', this, this.me, -1);
                 break;
             case 'API_RESPONSE':
                 {
@@ -326,7 +302,6 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'WORKER_ALREADY_EXISTS_RESHARDING':
                 {
-                    this.__handleGuildsResharding = [];
                     this.postMessage({
                         type: 'WORKER_START_RESHARDING',
                         workerId: workerData.workerId,
@@ -440,7 +415,7 @@ class WorkerClient extends base_1.BaseClient {
     }
     async onPacket(packet, shardId) {
         Promise.allSettled([
-            this.events?.runEvent('RAW', this, packet, shardId, false),
+            this.events.runEvent('RAW', this, packet, shardId, false),
             this.collectors.run('RAW', packet, this),
         ]); //ignore promise
         switch (packet.t) {
@@ -449,7 +424,7 @@ class WorkerClient extends base_1.BaseClient {
                     if (!this.memberUpdateHandler.check(packet.d)) {
                         return;
                     }
-                    await this.events?.execute(packet, this, shardId);
+                    await this.events.execute(packet, this, shardId);
                 }
                 break;
             case 'PRESENCE_UPDATE':
@@ -457,76 +432,52 @@ class WorkerClient extends base_1.BaseClient {
                     if (!this.presenceUpdateHandler.check(packet.d)) {
                         return;
                     }
-                    await this.events?.execute(packet, this, shardId);
-                }
-                break;
-            case 'GUILD_DELETE':
-            case 'GUILD_CREATE': {
-                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({
-                            type: 'WORKER_READY',
-                            workerId: this.workerId,
-                        });
-                        return this.events?.runEvent('WORKER_READY', this, this.me, -1);
-                    }
-                    if (!this.__handleGuilds?.length)
-                        delete this.__handleGuilds;
-                    return this.cache.onPacket(packet);
+                    await this.events.execute(packet, this, shardId);
                 }
-                await this.events?.execute(packet, this, shardId);
                 break;
-            }
             default: {
                 switch (packet.t) {
                     case 'INTERACTION_CREATE':
                         {
-                            await this.events?.execute(packet, this, shardId);
+                            await this.events.execute(packet, this, shardId);
                             await this.handleCommand.interaction(packet.d, shardId);
                         }
                         break;
                     case 'MESSAGE_CREATE':
                         {
-                            await this.events?.execute(packet, this, shardId);
+                            await this.events.execute(packet, this, shardId);
                             await this.handleCommand.message(packet.d, shardId);
                         }
                         break;
-                    case 'READY':
+                    case 'READY': {
+                        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 ([...this.shards.values()].every(shard => shard.data.session_id)) {
+                            this.postMessage({
+                                type: 'WORKER_SHARDS_CONNECTED',
+                                workerId: this.workerId,
+                            });
+                            await this.events.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
+                        }
+                        await this.events.execute(packet, this, shardId);
+                        this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
+                        break;
+                    }
+                    case 'GUILDS_READY':
                         {
-                            const ids = packet.d.guilds.map(x => x.id);
-                            if ((0, common_1.hasIntent)(this.workerData.intents, 'Guilds')) {
-                                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);
-                            await this.events?.execute(packet, this, shardId);
-                            if (!this._ready && [...this.shards.values()].every(shard => shard.data.session_id)) {
-                                this._ready = true;
+                            if ([...this.shards.values()].every(shard => shard.isReady)) {
                                 this.postMessage({
-                                    type: 'WORKER_SHARDS_CONNECTED',
+                                    type: 'WORKER_READY',
                                     workerId: this.workerId,
                                 });
-                                await this.events?.runEvent('WORKER_SHARDS_CONNECTED', this, this.me, -1);
-                            }
-                            if (!this.__handleGuilds?.length) {
-                                if ([...this.shards.values()].every(shard => shard.data.session_id)) {
-                                    this.postMessage({
-                                        type: 'WORKER_READY',
-                                        workerId: this.workerId,
-                                    });
-                                    await this.events?.runEvent('WORKER_READY', this, this.me, -1);
-                                }
-                                delete this.__handleGuilds;
+                                await this.events.runEvent('WORKER_READY', this, this.me, -1);
                             }
-                            this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
+                            await this.events.execute(packet, this, shardId);
                         }
                         break;
                     default:
-                        await this.events?.execute(packet, this, shardId);
+                        await this.events.execute(packet, this, shardId);
                         break;
                 }
                 break;

package/lib/commands/applications/chatcontext.js

@@ -32,7 +32,7 @@ class CommandContext extends basecontext_1.BaseContext {
         return this.client.proxy;
     }
     get t() {
-        return this.client.t(this.interaction?.locale ?? this.client.langs?.defaultLang ?? 'en-US');
+        return this.client.t(this.interaction?.locale ?? this.client.langs.defaultLang ?? 'en-US');
     }
     get fullCommandName() {
         return this.resolver.fullCommandName;

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

@@ -24,7 +24,7 @@ export declare class EntryPointContext<M extends keyof RegisteredMiddlewares = n
     modal(body: ModalCreateBodyRequest): Promise<undefined>;
     deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<import("../../common").When<WR, import("../..").WebhookMessage, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
-    deleteResponse(): Promise<void | undefined>;
+    deleteResponse(): Promise<void>;
     editOrReply<WR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, withResponse?: WR): Promise<import("../../common").When<WR, import("../..").WebhookMessage, void>>;
     fetchResponse(): Promise<import("../..").WebhookMessage>;
     channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;

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

@@ -25,7 +25,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     modal(body: ModalCreateBodyRequest): Promise<undefined>;
     deferReply<WR extends boolean = false>(ephemeral?: boolean, withResponse?: WR): Promise<import("../../common").When<WR, import("../..").WebhookMessage, undefined>>;
     editResponse(body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
-    deleteResponse(): Promise<void | undefined>;
+    deleteResponse(): Promise<void>;
     editOrReply<WR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, withResponse?: WR): Promise<import("../../common").When<WR, import("../..").WebhookMessage, void>>;
     fetchResponse(): Promise<import("../..").WebhookMessage>;
     channel(mode?: 'rest' | 'flow'): Promise<AllChannels>;

package/lib/commands/handle.js

@@ -148,14 +148,14 @@ class HandleCommand {
         const context = new components_1.ModalContext(this.client, interaction);
         const extended = this.client.options?.context?.(interaction) ?? {};
         Object.assign(context, extended);
-        await this.client.components?.executeModal(context);
+        await this.client.components.executeModal(context);
     }
     async messageComponent(interaction) {
         //@ts-expect-error
         const context = new components_1.ComponentContext(this.client, interaction);
         const extended = this.client.options?.context?.(interaction) ?? {};
         Object.assign(context, extended);
-        await this.client.components?.executeComponent(context);
+        await this.client.components.executeComponent(context);
     }
     async interaction(body, shardId, __reply) {
         this.client.debugger?.debug(`[${types_1.InteractionType[body.type] ?? body.type}] Interaction received.`);
@@ -185,7 +185,7 @@ class HandleCommand {
                         break;
                     }
                     case types_1.ApplicationCommandType.PrimaryEntryPoint: {
-                        const command = this.client.commands?.entryPoint;
+                        const command = this.client.commands.entryPoint;
                         if (!command?.run)
                             return;
                         const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
@@ -214,7 +214,7 @@ class HandleCommand {
             case types_1.InteractionType.ModalSubmit:
                 {
                     const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
-                    if (this.client.components?.hasModal(interaction)) {
+                    if (this.client.components.hasModal(interaction)) {
                         await this.client.components.onModalSubmit(interaction);
                     }
                     else
@@ -224,7 +224,7 @@ class HandleCommand {
             case types_1.InteractionType.MessageComponent:
                 {
                     const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
-                    if (this.client.components?.hasComponent(body.message.id, interaction.customId)) {
+                    if (this.client.components.hasComponent(body.message.id, interaction.customId)) {
                         await this.client.components.onComponent(body.message.id, interaction);
                     }
                     else

package/lib/common/it/utils.d.ts

@@ -120,3 +120,4 @@ export declare function hasProps<T extends Record<any, any>>(target: T, props: T
 export declare function hasIntent(intents: number, target: keyof typeof GatewayIntentBits | GatewayIntentBits): boolean;
 export declare function toArrayBuffer(buffer: Buffer): ArrayBuffer;
 export declare function toBuffer(arrayBuffer: ArrayBuffer): Buffer<ArrayBuffer>;
+export declare function assertString(value: unknown, message?: string): asserts value is string;

package/lib/common/it/utils.js

@@ -21,6 +21,7 @@ exports.hasProps = hasProps;
 exports.hasIntent = hasIntent;
 exports.toArrayBuffer = toArrayBuffer;
 exports.toBuffer = toBuffer;
+exports.assertString = assertString;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const __1 = require("..");
@@ -385,3 +386,8 @@ function toBuffer(arrayBuffer) {
     }
     return buffer;
 }
+function assertString(value, message) {
+    if (!(typeof value === 'string' && value !== '')) {
+        throw new Error(message ?? 'Value is not a string');
+    }
+}

package/lib/common/shorters/bans.js

@@ -13,7 +13,7 @@ class BanShorter extends base_1.BaseShorter {
     async bulkCreate(guildId, body, reason) {
         const bans = await this.client.proxy.guilds(guildId)['bulk-bans'].post({ reason, body });
         for (const id of bans.banned_users)
-            this.client.cache.members?.removeIfNI('GuildBans', id, guildId);
+            this.client.cache.members?.removeIfNI('GuildModeration', id, guildId);
         return bans;
     }
     /**
@@ -34,7 +34,7 @@ class BanShorter extends base_1.BaseShorter {
      */
     async create(guildId, memberId, body, reason) {
         await this.client.proxy.guilds(guildId).bans(memberId).put({ reason, body });
-        await this.client.cache.members?.removeIfNI('GuildBans', memberId, guildId);
+        await this.client.cache.members?.removeIfNI('GuildModeration', memberId, guildId);
     }
     /**
      * Fetches a ban from the guild.

package/lib/common/shorters/guilds.d.ts

@@ -1,5 +1,5 @@
 import { type GuildStructure } from '../../client/transformers';
-import { BaseChannel, type CreateStickerBodyRequest, Guild, GuildMember } from '../../structures';
+import { type CreateStickerBodyRequest, Guild, GuildMember } from '../../structures';
 import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildsJSONBody } from '../../types';
 import { BaseShorter } from './base';
 export declare class GuildShorter extends BaseShorter {
@@ -46,7 +46,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param force Whether to force fetching the channel from the API even if it exists in the cache.
          * @returns A Promise that resolves to the fetched channel.
          */
-        fetch: (guildId: string, channelId: string, force?: boolean) => Promise<import("../../types").APIGuildCategoryChannel | import("../../types").APIGuildStageVoiceChannel | import("../../types").APIGuildVoiceChannel | import("../../types").APINewsChannel | import("../../types").APITextChannel | BaseChannel<import("../../types").ChannelType> | import("../../structures").DMChannel | import("../../structures").CategoryChannel>;
+        fetch: (guildId: string, channelId: string, force?: boolean) => Promise<import("../../structures").AllChannels>;
         /**
          * Creates a new channel in the guild.
          * @param guildId The ID of the guild.

package/lib/common/shorters/interaction.d.ts

@@ -7,7 +7,7 @@ export declare class InteractionShorter extends BaseShorter {
     fetchOriginal(token: string): Promise<import("../..").WebhookMessage>;
     editMessage(token: string, messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
     editOriginal(token: string, body: InteractionMessageUpdateBodyRequest): Promise<import("../..").WebhookMessage>;
-    deleteResponse(token: string, messageId: string): Promise<void | undefined>;
-    deleteOriginal(token: string): Promise<void | undefined>;
+    deleteResponse(token: string, messageId: string): Promise<void>;
+    deleteOriginal(token: string): Promise<void>;
     followup(token: string, { files, ...body }: MessageWebhookCreateBodyRequest): Promise<import("../..").WebhookMessage>;
 }

package/lib/common/shorters/interaction.js

@@ -48,7 +48,7 @@ class InteractionShorter extends base_1.BaseShorter {
             .webhooks(this.client.applicationId)(token)
             .messages(messageId)
             .delete()
-            .then(() => this.client.components?.deleteValue(messageId, 'messageDelete'));
+            .then(() => this.client.components.deleteValue(messageId, 'messageDelete'));
     }
     deleteOriginal(token) {
         return this.deleteResponse(token, '@original');

package/lib/common/shorters/members.js

@@ -61,7 +61,7 @@ class MemberShorter extends base_1.BaseShorter {
      */
     async ban(guildId, memberId, body, reason) {
         await this.client.proxy.guilds(guildId).bans(memberId).put({ reason, body });
-        await this.client.cache.members?.removeIfNI('GuildBans', memberId, guildId);
+        await this.client.cache.members?.removeIfNI('GuildModeration', memberId, guildId);
     }
     /**
      * Kicks a member from the guild.