seyfert 1.2.3 → 1.3.1

package/lib/client/client.d.ts

@@ -1,6 +1,7 @@
 import { type GatewayDispatchPayload, type GatewayPresenceUpdateData } from 'discord-api-types/v10';
-import type { ClientEvent, Command, CommandContext, EventHandlerLike, Message, SubCommand } from '..';
+import type { Command, CommandContext, Message, SubCommand } from '..';
 import type { DeepPartial, If } from '../common';
+import { EventHandler } from '../events';
 import { ClientUser } from '../structures';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
 import { MemberUpdateHandler } from '../websocket/discord/events/memberUpdate';
@@ -10,7 +11,7 @@ import { BaseClient } from './base';
 export declare class Client<Ready extends boolean = boolean> extends BaseClient {
     private __handleGuilds?;
     gateway: ShardManager;
-    events?: EventHandlerLike;
+    events?: EventHandler | undefined;
     me: If<Ready, ClientUser>;
     options: ClientOptions | undefined;
     memberUpdateHandler: MemberUpdateHandler;
@@ -19,7 +20,7 @@ export declare class Client<Ready extends boolean = boolean> extends BaseClient
     setServices({ gateway, ...rest }: ServicesOptions & {
         gateway?: ShardManager;
         handlers?: ServicesOptions['handlers'] & {
-            events?: EventHandlerLike | ((event: ClientEvent) => any);
+            events?: EventHandler['callback'];
         };
     }): void;
     loadEvents(dir?: string): Promise<void>;
@@ -41,8 +42,8 @@ export interface ClientOptions extends BaseClientOptions {
         properties?: Partial<ShardManagerOptions['properties']>;
         compress?: ShardManagerOptions['compress'];
     };
-    commands?: {
-        prefix: (message: Message) => Promise<string[]> | string[];
+    commands?: BaseClientOptions['commands'] & {
+        prefix?: (message: Message) => Promise<string[]> | string[];
         deferReplyResponse?: (ctx: CommandContext) => Parameters<Message['write']>[0];
         reply?: (ctx: CommandContext) => boolean;
         argsParser?: (content: string, command: SubCommand | Command) => Record<string, string>;

package/lib/client/client.js

@@ -38,7 +38,9 @@ class Client extends base_1.BaseClient {
             }
             else if (typeof rest.handlers.events === 'function') {
                 this.events = new events_1.EventHandler(this.logger);
-                this.events.__callback = rest.handlers.events;
+                this.events.setHandlers({
+                    callback: rest.handlers.events,
+                });
             }
             else {
                 this.events = rest.handlers.events;
@@ -121,6 +123,16 @@ class Client extends base_1.BaseClient {
                 await this.events?.execute(packet.t, packet, this, shardId);
                 await this.cache.onPacket(packet);
                 break;
+            case 'MESSAGE_UPDATE':
+            case 'MESSAGE_DELETE_BULK':
+            case 'MESSAGE_DELETE':
+                await this.events?.execute(packet.t, packet, this, shardId);
+                await this.cache.onPacket(packet);
+                break;
+            case 'GUILD_DELETE':
+            case 'CHANNEL_UPDATE':
+                await this.events?.execute(packet.t, packet, this, shardId);
+                break;
             //rest of the events
             default: {
                 await this.cache.onPacket(packet);

package/lib/client/oninteractioncreate.js

@@ -33,7 +33,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                 }
                 catch (error) {
                     try {
-                        await optionsResolver.getCommand()?.onInternalError?.(self, error);
+                        await optionsResolver.getCommand()?.onInternalError?.(self, optionsResolver.getCommand(), error);
                     }
                     catch {
                         // supress error
@@ -152,7 +152,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                             }
                             catch (error) {
                                 try {
-                                    await command.onInternalError?.(self, error);
+                                    await command.onInternalError?.(self, context.command, error);
                                 }
                                 catch {
                                     // supress error

package/lib/client/onmessagecreate.js

@@ -40,7 +40,7 @@ function getCommandFromContent(commandRaw, self) {
     };
 }
 async function onMessageCreate(self, rawMessage, shardId) {
-    if (!self.options?.commands)
+    if (!self.options?.commands?.prefix)
         return;
     const message = new structures_1.Message(self, rawMessage);
     const prefixes = (await self.options.commands.prefix(message)).sort((a, b) => b.length - a.length);
@@ -134,7 +134,7 @@ async function onMessageCreate(self, rawMessage, shardId) {
     }
     catch (error) {
         try {
-            await command.onInternalError?.(self, error);
+            await command.onInternalError?.(self, context.command, error);
         }
         catch {
             // supress error

package/lib/client/workerclient.d.ts

@@ -7,7 +7,7 @@ import { type GatewayDispatchPayload } from 'discord-api-types/v10';
 import { Logger } from '..';
 import type { Cache } from '../cache';
 import { type DeepPartial, type When } from '../common';
-import { type EventHandlerLike } from '../events';
+import { EventHandler } from '../events';
 import { ClientUser } from '../structures';
 import { Shard, type ShardManagerOptions } from '../websocket';
 import type { WorkerShardInfo } from '../websocket/discord/worker';
@@ -18,7 +18,7 @@ import type { Client } from './client';
 export declare class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
     private __handleGuilds?;
     logger: Logger;
-    events?: EventHandlerLike;
+    events?: EventHandler | undefined;
     me: When<Ready, ClientUser>;
     promises: Map<string, {
         resolve: (value: any) => void;
@@ -31,7 +31,7 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     get latency(): number;
     setServices({ ...rest }: ServicesOptions & {
         handlers?: ServicesOptions['handlers'] & {
-            events?: EventHandlerLike;
+            events?: EventHandler['callback'];
         };
     }): void;
     start(options?: Omit<DeepPartial<StartOptions>, 'httpConnection' | 'token' | 'connection'>): Promise<void>;

package/lib/client/workerclient.js

@@ -78,7 +78,18 @@ class WorkerClient extends base_1.BaseClient {
     setServices({ ...rest }) {
         super.setServices(rest);
         if (rest.handlers && 'events' in rest.handlers) {
-            this.events = rest.handlers.events;
+            if (!rest.handlers.events) {
+                this.events = undefined;
+            }
+            else if (typeof rest.handlers.events === 'function') {
+                this.events = new events_1.EventHandler(this.logger);
+                this.events.setHandlers({
+                    callback: rest.handlers.events,
+                });
+            }
+            else {
+                this.events = rest.handlers.events;
+            }
         }
     }
     async start(options = {}) {
@@ -274,12 +285,16 @@ class WorkerClient extends base_1.BaseClient {
         await this.events?.execute('RAW', packet, this, shardId);
         switch (packet.t) {
             case 'GUILD_MEMBER_UPDATE':
+            case 'PRESENCE_UPDATE':
+            case 'MESSAGE_UPDATE':
+            case 'MESSAGE_DELETE_BULK':
+            case 'MESSAGE_DELETE':
                 await this.events?.execute(packet.t, packet, this, shardId);
                 await this.cache.onPacket(packet);
                 break;
-            case 'PRESENCE_UPDATE':
+            case 'GUILD_DELETE':
+            case 'CHANNEL_UPDATE':
                 await this.events?.execute(packet.t, packet, this, shardId);
-                await this.cache.onPacket(packet);
                 break;
             //rest of the events
             default:

package/lib/collection.d.ts

@@ -119,9 +119,10 @@ type LimitedCollectionData<V> = {
     expireOn: number;
     value: V;
 };
-export interface LimitedCollectionOptions {
+export interface LimitedCollectionOptions<K, V> {
     limit: number;
     expire: number;
+    onDelete?: (key: K, value: V) => void;
     resetOnDemand: boolean;
 }
 /**
@@ -138,11 +139,11 @@ export interface LimitedCollectionOptions {
  * console.log(mappedArray); // Output: ['1: one', '2: two', '3: three']
  */
 export declare class LimitedCollection<K, V> {
-    static readonly default: LimitedCollectionOptions;
+    static readonly default: LimitedCollectionOptions<any, any>;
     private readonly data;
     private readonly options;
     private timeout;
-    constructor(options?: Partial<LimitedCollectionOptions>);
+    constructor(options?: Partial<LimitedCollectionOptions<K, V>>);
     /**
      * Adds an element to the limited collection.
      * @param key The key of the element.
@@ -228,6 +229,10 @@ export declare class LimitedCollection<K, V> {
     private resetTimeout;
     private stopTimeout;
     private startTimeout;
+    keys(): () => IterableIterator<K>;
+    values(): () => IterableIterator<LimitedCollectionData<V>>;
+    entries(): IterableIterator<[K, LimitedCollectionData<V>]>;
+    clear(): void;
     private clearExpired;
 }
 export {};

package/lib/collection.js

@@ -230,7 +230,8 @@ class LimitedCollection {
         if (this.size > this.options.limit) {
             const iter = this.data.keys();
             while (this.size > this.options.limit) {
-                this.delete(iter.next().value);
+                const keyValue = iter.next().value;
+                this.delete(keyValue);
             }
         }
         if (this.closer?.expireOn === expireOn) {
@@ -265,7 +266,7 @@ class LimitedCollection {
         if (this.options.resetOnDemand && data && data.expire !== -1) {
             const oldExpireOn = data.expireOn;
             data.expireOn = Date.now() + data.expire;
-            if (this.closer.expireOn === oldExpireOn) {
+            if (this.closer?.expireOn === oldExpireOn) {
                 this.resetTimeout();
             }
         }
@@ -296,8 +297,11 @@ class LimitedCollection {
      */
     delete(key) {
         const value = this.raw(key);
-        if (value && value.expireOn === this.closer.expireOn)
-            setImmediate(() => this.resetTimeout());
+        if (value) {
+            if (value.expireOn === this.closer?.expireOn)
+                setImmediate(() => this.resetTimeout());
+            this.options.onDelete?.(key, value.value);
+        }
         return this.data.delete(key);
     }
     /**
@@ -360,12 +364,26 @@ class LimitedCollection {
             this.resetTimeout();
         }, expireOn - Date.now());
     }
+    keys() {
+        return this.data.keys;
+    }
+    values() {
+        return this.data.values;
+    }
+    entries() {
+        return this.data.entries();
+    }
+    clear() {
+        this.data.clear();
+        this.resetTimeout();
+    }
     clearExpired() {
         for (const [key, value] of this.data) {
             if (value.expireOn === -1) {
                 continue;
             }
             if (Date.now() >= value.expireOn) {
+                this.options.onDelete?.(key, value.value);
                 this.data.delete(key);
             }
         }

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

@@ -99,14 +99,14 @@ declare class BaseCommand {
         integration_types: BaseCommand['integrationTypes'];
     };
     reload(): Promise<void>;
-    run?(context: CommandContext<any>): any;
-    onAfterRun?(context: CommandContext<any>, error: unknown | undefined): any;
-    onRunError?(context: CommandContext<any>, error: unknown): any;
-    onOptionsError?(context: CommandContext<{}, never>, metadata: OnOptionsReturnObject): any;
-    onMiddlewaresError?(context: CommandContext<{}, never>, error: string): any;
-    onBotPermissionsFail?(context: CommandContext<{}, never>, permissions: PermissionStrings): any;
-    onPermissionsFail?(context: CommandContext<{}, never>, permissions: PermissionStrings): any;
-    onInternalError?(client: UsingClient, error?: unknown): any;
+    run?(context: CommandContext): any;
+    onAfterRun?(context: CommandContext, error: unknown | undefined): any;
+    onRunError?(context: CommandContext, error: unknown): any;
+    onOptionsError?(context: CommandContext, metadata: OnOptionsReturnObject): any;
+    onMiddlewaresError?(context: CommandContext, error: string): any;
+    onBotPermissionsFail?(context: CommandContext, permissions: PermissionStrings): any;
+    onPermissionsFail?(context: CommandContext, permissions: PermissionStrings): any;
+    onInternalError?(client: UsingClient, command: Command | SubCommand, error?: unknown): any;
 }
 export declare class Command extends BaseCommand {
     type: ApplicationCommandType;
@@ -130,12 +130,6 @@ export declare class Command extends BaseCommand {
         contexts: InteractionContextTypes[] | undefined;
         integration_types: IntegrationTypes[] | undefined;
     };
-    onRunError(context: CommandContext<any>, error: unknown): any;
-    onOptionsError(context: CommandContext<{}, never>, metadata: OnOptionsReturnObject): any;
-    onMiddlewaresError(context: CommandContext<{}, never>, error: string): any;
-    onBotPermissionsFail(context: CommandContext<{}, never>, permissions: PermissionStrings): any;
-    onPermissionsFail(context: CommandContext<{}, never>, permissions: PermissionStrings): any;
-    onInternalError(client: UsingClient, error?: unknown): any;
 }
 export declare abstract class SubCommand extends BaseCommand {
     type: ApplicationCommandOptionType;

package/lib/commands/applications/chat.js

@@ -128,13 +128,13 @@ class BaseCommand {
     }
     async reload() {
         delete require.cache[this.__filePath];
-        const __tempCommand = await (0, common_1.magicImport)(this.__filePath).then(x => x.default ?? x);
-        Object.setPrototypeOf(this, __tempCommand.prototype);
         for (const i of this.options ?? []) {
             if (i instanceof SubCommand && i.__filePath) {
                 await i.reload();
             }
         }
+        const __tempCommand = await (0, common_1.magicImport)(this.__filePath).then(x => x.default ?? x);
+        Object.setPrototypeOf(this, __tempCommand.prototype);
     }
 }
 class Command extends BaseCommand {
@@ -171,24 +171,6 @@ class Command extends BaseCommand {
             options,
         };
     }
-    onRunError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onRunError>`, context.author.id, error);
-    }
-    onOptionsError(context, metadata) {
-        context.client.logger.fatal(`${this.name}.<onOptionsError>`, context.author.id, metadata);
-    }
-    onMiddlewaresError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onMiddlewaresError>`, context.author.id, error);
-    }
-    onBotPermissionsFail(context, permissions) {
-        context.client.logger.fatal(`${this.name}.<onBotPermissionsFail>`, context.author.id, permissions);
-    }
-    onPermissionsFail(context, permissions) {
-        context.client.logger.fatal(`${this.name}.<onPermissionsFail>`, context.author.id, permissions);
-    }
-    onInternalError(client, error) {
-        client.logger.fatal(`${this.name}.<onInternalError>`, error);
-    }
 }
 exports.Command = Command;
 class SubCommand extends BaseCommand {

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

@@ -28,7 +28,7 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     get fullCommandName(): string;
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     deferReply(ephemeral?: boolean): Promise<void | Message>;
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message | WebhookMessage>;
     deleteResponse(): Promise<void>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     fetchResponse(): Promise<If<InferWithPrefix, WebhookMessage | Message | undefined, WebhookMessage | undefined>>;

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

@@ -23,7 +23,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage, void | WebhookMessage>>;
     modal(body: ModalCreateBodyRequest): Promise<void>;
     deferReply(ephemeral?: boolean): Promise<void>;
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
     deleteResponse(): Promise<void | undefined>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     fetchResponse(): Promise<WebhookMessage | undefined>;

package/lib/commands/handler.d.ts

@@ -1,14 +1,8 @@
 import type { Logger } from '../common';
 import { BaseHandler } from '../common';
-import { Command } from './applications/chat';
+import { Command, SubCommand } from './applications/chat';
 import { ContextMenuCommand } from './applications/menu';
 import type { UsingClient } from './applications/shared';
-export interface CommandHandlerLike {
-    values: CommandHandler['values'];
-    load: CommandHandler['load'];
-    reload: CommandHandler['reload'];
-    reloadAll: CommandHandler['reloadAll'];
-}
 export declare class CommandHandler extends BaseHandler {
     protected logger: Logger;
     protected client: UsingClient;
@@ -19,4 +13,14 @@ export declare class CommandHandler extends BaseHandler {
     reloadAll(stopIfFail?: boolean): Promise<void>;
     load(commandsDir: string, client: UsingClient): Promise<(Command | ContextMenuCommand)[]>;
     private __parseCommandLocales;
+    setHandlers({ onCommand, onSubCommand, }: {
+        onCommand?: CommandHandler['onCommand'];
+        onSubCommand?: CommandHandler['onSubCommand'];
+    }): void;
+    onCommand: (file: {
+        new (): Command | SubCommand | ContextMenuCommand;
+    }) => Command | SubCommand | ContextMenuCommand | false;
+    onSubCommand: (file: {
+        new (): SubCommand;
+    }) => SubCommand | false;
 }

package/lib/commands/handler.js

@@ -40,8 +40,9 @@ class CommandHandler extends common_1.BaseHandler {
         for (const command of result) {
             let commandInstance;
             try {
-                //@ts-expect-error abstract class
-                commandInstance = new command.file();
+                commandInstance = this.onCommand(command.file);
+                if (!commandInstance)
+                    continue;
             }
             catch (e) {
                 if (e instanceof Error && e.message === 'command.file is not a constructor') {
@@ -57,12 +58,18 @@ class CommandHandler extends common_1.BaseHandler {
             if (commandInstance instanceof menu_1.ContextMenuCommand) {
                 this.values.push(commandInstance);
                 commandInstance.__filePath = command.path;
-                await this.__callback?.(commandInstance);
                 continue;
             }
             if (!(commandInstance instanceof chat_1.Command)) {
                 continue;
             }
+            commandInstance.onAfterRun ??= client.options?.commands?.defaults?.onAfterRun;
+            commandInstance.onBotPermissionsFail ??= client.options?.commands?.defaults?.onBotPermissionsFail;
+            commandInstance.onInternalError ??= client.options?.commands?.defaults?.onInternalError;
+            commandInstance.onMiddlewaresError ??= client.options?.commands?.defaults?.onMiddlewaresError;
+            commandInstance.onOptionsError ??= client.options?.commands?.defaults?.onOptionsError;
+            commandInstance.onPermissionsFail ??= client.options?.commands?.defaults?.onPermissionsFail;
+            commandInstance.onRunError ??= client.options?.commands?.defaults?.onRunError;
             commandInstance.__filePath = command.path;
             commandInstance.options ??= [];
             if (commandInstance.__autoload) {
@@ -73,9 +80,8 @@ class CommandHandler extends common_1.BaseHandler {
                         continue;
                     }
                     try {
-                        //@ts-expect-error abstract class
-                        const subCommand = new (result.find(x => x.path === option).file)();
-                        if (subCommand instanceof chat_1.SubCommand) {
+                        const subCommand = this.onSubCommand(result.find(x => x.path === option).file);
+                        if (subCommand && subCommand instanceof chat_1.SubCommand) {
                             subCommand.__filePath = option;
                             commandInstance.options.push(subCommand);
                         }
@@ -89,17 +95,33 @@ class CommandHandler extends common_1.BaseHandler {
                 if (option instanceof chat_1.SubCommand) {
                     option.middlewares = (commandInstance.middlewares ?? []).concat(option.middlewares ?? []);
                     option.onMiddlewaresError =
-                        option.onMiddlewaresError?.bind(option) ?? commandInstance.onMiddlewaresError?.bind(commandInstance);
-                    option.onRunError = option.onRunError?.bind(option) ?? commandInstance.onRunError?.bind(commandInstance);
+                        option.onMiddlewaresError?.bind(option) ??
+                            commandInstance.onMiddlewaresError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onMiddlewaresError;
+                    option.onRunError =
+                        option.onRunError?.bind(option) ??
+                            commandInstance.onRunError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onRunError;
                     option.onOptionsError =
-                        option.onOptionsError?.bind(option) ?? commandInstance.onOptionsError?.bind(commandInstance);
+                        option.onOptionsError?.bind(option) ??
+                            commandInstance.onOptionsError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onOptionsError;
                     option.onInternalError =
-                        option.onInternalError?.bind(option) ?? commandInstance.onInternalError?.bind(commandInstance);
-                    option.onAfterRun = option.onAfterRun?.bind(option) ?? commandInstance.onAfterRun?.bind(commandInstance);
+                        option.onInternalError?.bind(option) ??
+                            commandInstance.onInternalError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onInternalError;
+                    option.onAfterRun =
+                        option.onAfterRun?.bind(option) ??
+                            commandInstance.onAfterRun?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onAfterRun;
                     option.onBotPermissionsFail =
-                        option.onBotPermissionsFail?.bind(option) ?? commandInstance.onBotPermissionsFail?.bind(commandInstance);
+                        option.onBotPermissionsFail?.bind(option) ??
+                            commandInstance.onBotPermissionsFail?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onBotPermissionsFail;
                     option.onPermissionsFail =
-                        option.onPermissionsFail?.bind(option) ?? commandInstance.onPermissionsFail?.bind(commandInstance);
+                        option.onPermissionsFail?.bind(option) ??
+                            commandInstance.onPermissionsFail?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onPermissionsFail;
                 }
             }
             this.values.push(commandInstance);
@@ -109,7 +131,6 @@ class CommandHandler extends common_1.BaseHandler {
                     this.__parseCommandLocales(i, client);
                 }
             }
-            await this.__callback?.(commandInstance);
         }
         return this.values;
     }
@@ -194,5 +215,13 @@ class CommandHandler extends common_1.BaseHandler {
             }
         }
     }
+    setHandlers({ onCommand, onSubCommand, }) {
+        if (onCommand)
+            this.onCommand = onCommand;
+        if (onSubCommand)
+            this.onSubCommand = onSubCommand;
+    }
+    onCommand = (file) => new file();
+    onSubCommand = (file) => new file();
 }
 exports.CommandHandler = CommandHandler;

package/lib/common/index.d.ts

@@ -11,7 +11,9 @@ export * from './shorters/reactions';
 export * from './shorters/roles';
 export * from './shorters/templates';
 export * from './shorters/users';
+export * from './shorters/threads';
 export * from './shorters/webhook';
+export * from './shorters/interaction';
 export * from './types/options';
 export * from './types/resolvables';
 export * from './types/util';

package/lib/common/index.js

@@ -28,7 +28,9 @@ __exportStar(require("./shorters/reactions"), exports);
 __exportStar(require("./shorters/roles"), exports);
 __exportStar(require("./shorters/templates"), exports);
 __exportStar(require("./shorters/users"), exports);
+__exportStar(require("./shorters/threads"), exports);
 __exportStar(require("./shorters/webhook"), exports);
+__exportStar(require("./shorters/interaction"), exports);
 __exportStar(require("./types/options"), exports);
 __exportStar(require("./types/resolvables"), exports);
 __exportStar(require("./types/util"), exports);

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

@@ -40,7 +40,6 @@ export declare function filterSplit<Element, Predicate extends (value: Element)
  */
 export declare class BaseHandler {
     protected logger: Logger;
-    __callback?: (...args: any[]) => any;
     /**
      * Initializes a new instance of the BaseHandler class.
      * @param logger The logger instance.

package/lib/common/it/utils.js

@@ -95,7 +95,6 @@ exports.filterSplit = filterSplit;
  */
 class BaseHandler {
     logger;
-    __callback;
     /**
      * Initializes a new instance of the BaseHandler class.
      * @param logger The logger instance.

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

@@ -1,6 +1,6 @@
-import { type RESTPatchAPIChannelJSONBody, type RESTPostAPIChannelThreadsJSONBody, type RESTPostAPIGuildForumThreadsJSONBody } from 'discord-api-types/v10';
+import { type RESTGetAPIChannelMessagesQuery, type RESTPatchAPIChannelJSONBody, type RESTPostAPIChannelThreadsJSONBody, type RESTPostAPIGuildForumThreadsJSONBody } from 'discord-api-types/v10';
 import { Message, type GuildMember, type GuildRole } from '../../structures';
-import { type AllChannels, type ThreadChannel } from '../../structures/channels';
+import { type AllChannels } from '../../structures/channels';
 import { PermissionsBitField } from '../../structures/extra/Permissions';
 import { BaseShorter } from './base';
 export declare class ChannelShorter extends BaseShorter {
@@ -55,7 +55,7 @@ export declare class ChannelShorter extends BaseShorter {
      * @param reason The reason for unpinning the message.
      * @returns A promise that resolves when the thread is succesfully created.
      */
-    thread(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<ThreadChannel>;
+    thread(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<import("../../structures").ThreadChannel>;
     memberPermissions(channelId: string, member: GuildMember, checkAdmin?: boolean): Promise<PermissionsBitField>;
     overwritesFor(channelId: string, member: GuildMember): Promise<{
         everyone: {
@@ -81,6 +81,8 @@ export declare class ChannelShorter extends BaseShorter {
         } | undefined;
     }>;
     rolePermissions(channelId: string, role: GuildRole, checkAdmin?: boolean): Promise<PermissionsBitField>;
+    fetchMessages(channelId: string, query?: RESTGetAPIChannelMessagesQuery): Promise<Message[]>;
+    setVoiceStatus(channelId: string, status?: string | null): Promise<never>;
 }
 export type ChannelShorterOptionalParams = Partial<{
     guildId: string;

package/lib/common/shorters/channels.js

@@ -9,6 +9,7 @@ const structures_1 = require("../../structures");
 const channels_1 = __importDefault(require("../../structures/channels"));
 const Permissions_1 = require("../../structures/extra/Permissions");
 const base_1 = require("./base");
+const utils_1 = require("../it/utils");
 class ChannelShorter extends base_1.BaseShorter {
     /**
      * Fetches a channel by its ID.
@@ -34,8 +35,9 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the deleted channel.
      */
     async delete(id, optional = { guildId: '@me' }) {
-        const res = await this.client.proxy.channels(id).delete({ reason: optional.reason });
-        await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId);
+        const options = (0, utils_1.MergeOptions)({ guildId: '@me' }, optional);
+        const res = await this.client.proxy.channels(id).delete({ reason: options.reason });
+        await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId);
         return (0, channels_1.default)(res, this.client);
     }
     /**
@@ -46,10 +48,11 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the edited channel.
      */
     async edit(id, body, optional = { guildId: '@me' }) {
-        const res = await this.client.proxy.channels(id).patch({ body, reason: optional.reason });
-        await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res);
+        const options = (0, utils_1.MergeOptions)({ guildId: '@me' }, optional);
+        const res = await this.client.proxy.channels(id).patch({ body, reason: options.reason });
+        await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res);
         if (body.permission_overwrites && 'permission_overwrites' in res)
-            await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res.permission_overwrites);
+            await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res.permission_overwrites);
         return (0, channels_1.default)(res, this.client);
     }
     /**
@@ -62,6 +65,9 @@ class ChannelShorter extends base_1.BaseShorter {
     }
     async pins(channelId) {
         const messages = await this.client.proxy.channels(channelId).pins.get();
+        await this.client.cache.messages?.patch(messages.map(x => {
+            return [x.id, x];
+        }), channelId);
         return messages.map(message => new structures_1.Message(this.client, message));
     }
     /**
@@ -91,11 +97,7 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A promise that resolves when the thread is succesfully created.
      */
     async thread(channelId, body, reason) {
-        return (this.client.proxy
-            .channels(channelId)
-            .threads.post({ body, reason })
-            // When testing this, discord returns the thread object, but in discord api types it does not.
-            .then(thread => (0, channels_1.default)(thread, this.client)));
+        return this.client.threads.create(channelId, body, reason);
     }
     async memberPermissions(channelId, member, checkAdmin = true) {
         const memberPermissions = await member.fetchPermissions();
@@ -148,5 +150,17 @@ class ChannelShorter extends base_1.BaseShorter {
         permissions.add(roleOverwrites?.allow.bits ?? 0n);
         return permissions;
     }
+    async fetchMessages(channelId, query) {
+        const result = await this.client.proxy.channels(channelId).messages.get({
+            query,
+        });
+        await this.client.cache.messages?.patch(result.map(x => {
+            return [x.id, x];
+        }), channelId);
+        return result.map(message => new structures_1.Message(this.client, message));
+    }
+    setVoiceStatus(channelId, status = null) {
+        return this.client.proxy.channels(channelId)['voice-status'].put({ body: { status } });
+    }
 }
 exports.ChannelShorter = ChannelShorter;