seyfert 2.1.1-dev-12334128354.0 → 2.1.1-dev-12340785707.0

package/lib/cache/index.js

@@ -462,7 +462,7 @@ class Cache {
             name: '[CACHE]',
         });
         await this.adapter.flush();
-        // this method will only check the cache for `users`, `members` y `channels`
+        // this method will only check the cache for `users`, `members`, and `channels`
         // likewise these have the three types of resources (GuildRelatedResource, GuildBasedResource, BaseResource)
         // will also check `overwrites`, since the latter stores an array not as an object but as data.
         await this.testUsersAndMembers();

package/lib/client/client.d.ts

@@ -1,5 +1,5 @@
 import type { CommandContext, Message } from '..';
-import { type Awaitable, type DeepPartial, type If, type MakePartial } from '../common';
+import { type Awaitable, type DeepPartial, type If, type PickPartial } from '../common';
 import { EventHandler } from '../events';
 import type { GatewayDispatchPayload, GatewayPresenceUpdateData } from '../types';
 import { ShardManager, type ShardManagerOptions } from '../websocket';
@@ -49,5 +49,5 @@ export interface ClientOptions extends BaseClientOptions {
         reply?: (ctx: CommandContext) => boolean;
     };
     handlePayload?: ShardManagerOptions['handlePayload'];
-    resharding?: MakePartial<NonNullable<ShardManagerOptions['resharding']>, 'getInfo'>;
+    resharding?: PickPartial<NonNullable<ShardManagerOptions['resharding']>, 'getInfo'>;
 }

package/lib/common/bot/watcher.d.ts

@@ -1,7 +1,7 @@
 import type { GatewayDispatchPayload, GatewaySendPayload } from '../../types';
 import type { ShardManager, ShardManagerOptions } from '../../websocket';
-import type { MakePartial } from '../types/util';
-export interface WatcherOptions extends MakePartial<Omit<ShardManager['options'], 'handlePayload' | 'info' | 'token' | 'intents'>, 'compress' | 'presence' | 'properties' | 'shardEnd' | 'shardStart' | 'spawnShardDelay' | 'totalShards' | 'url' | 'version' | 'resharding' | 'debug'> {
+import type { PickPartial } from '../types/util';
+export interface WatcherOptions extends PickPartial<Omit<ShardManager['options'], 'handlePayload' | 'info' | 'token' | 'intents'>, 'compress' | 'presence' | 'properties' | 'shardEnd' | 'shardStart' | 'spawnShardDelay' | 'totalShards' | 'url' | 'version' | 'resharding' | 'debug'> {
     filePath: string;
     transpileCommand: string;
     srcPath: string;

package/lib/common/types/util.d.ts

@@ -3,7 +3,7 @@ export type ToClass<T, This> = new (...args: any[]) => {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? ReturnType<T[K]> extends Promise<T> ? (...args: Parameters<T[K]>) => Promise<This> : ReturnType<T[K]> extends T ? (...args: Parameters<T[K]>) => This : T[K] : T[K];
 };
 export type StringToNumber<T extends string> = T extends `${infer N extends number}` ? N : never;
-export type MakePartial<T, K extends keyof T> = Omit<T, K> & {
+export type PickPartial<T, K extends keyof T> = Omit<T, K> & {
     [P in K]?: T[P];
 };
 export type MakeDeepPartial<T, K extends keyof T> = Omit<T, K> & {
@@ -45,6 +45,9 @@ export type TupleOr<A, T> = ValueOf<A> extends never ? A : TupleOr<ArrayFirsElem
 export type MakeRequired<T, K extends keyof T = keyof T> = T & {
     [P in K]-?: NonFalsy<T[P]>;
 };
+export type PickRequired<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]: NonFalsy<T[P]>;
+};
 export type NonFalsy<T> = T extends false | 0 | '' | null | undefined | 0n ? never : T;
 export type CamelCase<S extends string> = S extends `${infer P1}_${infer P2}${infer P3}` ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}` : Lowercase<S>;
 export type SnakeCase<S extends string> = S extends `${infer A}${infer Rest}` ? A extends Uppercase<A> ? `_${Lowercase<A>}${SnakeCase<Rest>}` : `${A}${SnakeCase<Rest>}` : Lowercase<S>;

package/lib/components/handler.d.ts

@@ -38,13 +38,14 @@ export declare class ComponentHandler extends BaseHandler {
     filter: (path: string) => boolean;
     constructor(logger: Logger, client: UsingClient);
     private createMatchCallback;
-    createComponentCollector(messageId: string, channelId: string, guildId: string | undefined, options?: ListenerOptions): CreateComponentCollectorResult;
+    createComponentCollector(messageId: string, channelId: string, guildId: string | undefined, options?: ListenerOptions, components?: COMPONENTS['components']): CreateComponentCollectorResult;
     onComponent(id: string, interaction: ComponentInteraction): Promise<any>;
     hasComponent(id: string, customId: string): boolean | undefined;
     resetTimeouts(id: string): void;
     hasModal(interaction: ModalSubmitInteraction): boolean;
     onModalSubmit(interaction: ModalSubmitInteraction): any;
     deleteValue(id: string, reason?: string): void;
+    clearValue(id: string): COMPONENTS | undefined;
     stablishDefaults(component: ComponentCommands): void;
     set(instances: (new () => ComponentCommands)[]): void;
     load(componentsDir: string): Promise<void>;

package/lib/components/handler.js

@@ -25,26 +25,30 @@ class ComponentHandler extends common_1.BaseHandler {
             return str => match.includes(str);
         return str => match.test(str);
     }
-    createComponentCollector(messageId, channelId, guildId, options = {}) {
+    createComponentCollector(messageId, channelId, guildId, options = {}, components = []) {
         this.values.set(messageId, {
             messageId,
             channelId,
             guildId,
             options,
-            components: [],
+            components,
             idle: options.idle && options.idle > 0
                 ? setTimeout(() => {
-                    this.deleteValue(messageId);
+                    const old = this.clearValue(messageId);
+                    if (!old)
+                        return;
                     options.onStop?.('idle', () => {
-                        this.createComponentCollector(messageId, channelId, guildId, options);
+                        this.createComponentCollector(messageId, channelId, guildId, options, old.components);
                     });
                 }, options.idle)
                 : undefined,
             timeout: options.timeout && options.timeout > 0
                 ? setTimeout(() => {
-                    this.deleteValue(messageId);
+                    const old = this.clearValue(messageId);
+                    if (!old)
+                        return;
                     options.onStop?.('timeout', () => {
-                        this.createComponentCollector(messageId, channelId, guildId, options);
+                        this.createComponentCollector(messageId, channelId, guildId, options, old.components);
                     });
                 }, options.timeout)
                 : undefined,
@@ -61,9 +65,11 @@ class ComponentHandler extends common_1.BaseHandler {
             //@ts-expect-error generic
             run: this.values.get(messageId).__run,
             stop: (reason) => {
-                this.deleteValue(messageId);
+                const old = this.clearValue(messageId);
+                if (!old)
+                    return;
                 options.onStop?.(reason, () => {
-                    this.createComponentCollector(messageId, channelId, guildId, options);
+                    this.createComponentCollector(messageId, channelId, guildId, options, old.components);
                 });
             },
         };
@@ -79,10 +85,10 @@ class ComponentHandler extends common_1.BaseHandler {
         }
         row.idle?.refresh();
         await component.callback(interaction, reason => {
+            this.clearValue(id);
             row.options?.onStop?.(reason ?? 'stop', () => {
-                this.createComponentCollector(row.messageId, row.channelId, row.guildId, row.options);
+                this.createComponentCollector(row.messageId, row.channelId, row.guildId, row.options, row.components);
             });
-            this.deleteValue(id);
         }, () => {
             this.resetTimeouts(id);
         });
@@ -105,15 +111,21 @@ class ComponentHandler extends common_1.BaseHandler {
         return this.modals.get(interaction.user.id)?.(interaction);
     }
     deleteValue(id, reason) {
+        const component = this.clearValue(id);
+        if (!component)
+            return;
+        component.options?.onStop?.(reason, () => {
+            this.createComponentCollector(component.messageId, component.channelId, component.guildId, component.options, component.components);
+        });
+    }
+    clearValue(id) {
         const component = this.values.get(id);
-        if (component) {
-            component.options?.onStop?.(reason, () => {
-                this.createComponentCollector(component.messageId, component.channelId, component.guildId, component.options);
-            });
-            clearTimeout(component.timeout);
-            clearTimeout(component.idle);
-            this.values.delete(id);
-        }
+        if (!component)
+            return;
+        clearTimeout(component.timeout);
+        clearTimeout(component.idle);
+        this.values.delete(id);
+        return component;
     }
     stablishDefaults(component) {
         component.props ??= this.client.options.commands?.defaults?.props ?? {};

package/lib/components/modalcontext.d.ts

@@ -1,9 +1,8 @@
-import type { AllChannels, ModalCommand, ModalSubmitInteraction, ReturnCache } from '..';
+import type { AllChannels, Interaction, ModalCommand, ModalSubmitInteraction, ReturnCache } from '..';
 import type { GuildMemberStructure, GuildStructure } from '../client/transformers';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, RegisteredMiddlewares, UsingClient } from '../commands';
 import { BaseContext } from '../commands/basecontext';
 import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest, MakeRequired, ModalCreateBodyRequest, UnionToTuple } from '../common';
-import type { Interaction } from '../structures/Interaction';
 export interface ModalContext extends BaseContext, ExtendContext {
 }
 /**

package/lib/deps/mixer.js

@@ -7,7 +7,21 @@ exports.Mixin = Mixin;
  * @param c The class to get the descriptors of.
  * @returns The descriptors of the class.
  */
-function getDescriptors(c) {
+function getDenoDescriptors(c) {
+    const protos = [c.prototype];
+    let v = c;
+    while ((v = Object.getPrototypeOf(v))) {
+        if (v.prototype)
+            protos.push(v.prototype);
+    }
+    return protos.map(x => Object.getOwnPropertyDescriptors(x));
+}
+/**
+ * Gets the descriptors of a class.
+ * @param c The class to get the descriptors of.
+ * @returns The descriptors of the class.
+ */
+function getNodeDescriptors(c) {
     let proto = c.prototype;
     const result = [];
     while (proto) {
@@ -20,6 +34,11 @@ function getDescriptors(c) {
     }
     return result;
 }
+function getDescriptors(c) {
+    //@ts-expect-error
+    // biome-ignore lint/correctness/noUndeclaredVariables: <explanation>
+    return typeof Deno === 'undefined' ? getNodeDescriptors(c) : getDenoDescriptors(c);
+}
 /**
  * Mixes a class with other classes.
  * @param args The classes to mix.

package/lib/events/hooks/thread.d.ts

@@ -2,7 +2,12 @@ import { type ThreadChannelStructure } from '../../client/transformers';
 import type { UsingClient } from '../../commands';
 import type { GatewayThreadCreateDispatchData, GatewayThreadDeleteDispatchData, GatewayThreadListSyncDispatchData, GatewayThreadMemberUpdateDispatchData, GatewayThreadMembersUpdateDispatchData, GatewayThreadUpdateDispatchData } from '../../types';
 export declare const THREAD_CREATE: (self: UsingClient, data: GatewayThreadCreateDispatchData) => import("../..").ThreadChannel;
-export declare const THREAD_DELETE: (self: UsingClient, data: GatewayThreadDeleteDispatchData) => import("../..").ThreadChannel;
+export declare const THREAD_DELETE: (self: UsingClient, data: GatewayThreadDeleteDispatchData) => Promise<import("../..").BaseChannel<import("../../types").ChannelType> | import("../..").DMChannel | import("../..").CategoryChannel | {
+    id: string;
+    guildId: string;
+    parentId: string;
+    type: import("../../types").ChannelType;
+}>;
 export declare const THREAD_LIST_SYNC: (_self: UsingClient, data: GatewayThreadListSyncDispatchData) => {
     guildId: string;
     channelIds?: string[] | undefined;
@@ -272,8 +277,8 @@ export declare const THREAD_LIST_SYNC: (_self: UsingClient, data: GatewayThreadL
             deny: string;
         }[] | undefined;
         position: number;
-        parentId?: string | null | undefined;
         nsfw?: boolean | undefined;
+        parentId?: string | undefined;
     })[];
     members: {
         id?: string | undefined;

package/lib/events/hooks/thread.js

@@ -7,8 +7,8 @@ const THREAD_CREATE = (self, data) => {
     return transformers_1.Transformers.ThreadChannel(self, data);
 };
 exports.THREAD_CREATE = THREAD_CREATE;
-const THREAD_DELETE = (self, data) => {
-    return transformers_1.Transformers.ThreadChannel(self, data);
+const THREAD_DELETE = async (self, data) => {
+    return (await self.cache.channels?.get(data.id)) ?? (0, common_1.toCamelCase)(data);
 };
 exports.THREAD_DELETE = THREAD_DELETE;
 const THREAD_LIST_SYNC = (_self, data) => {

package/lib/structures/Interaction.d.ts

@@ -50,7 +50,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     isModal(): this is ModalSubmitInteraction;
     isEntryPoint(): this is EntryPointInteraction;
     static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): RoleSelectMenuInteraction | UserSelectMenuInteraction | MentionableSelectMenuInteraction | ChannelSelectMenuInteraction | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ButtonInteraction | StringSelectMenuInteraction<string[]> | ModalSubmitInteraction<boolean> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction>;
-    fetchGuild(force?: boolean): Promise<import("./Guild").Guild<"api">> | undefined;
+    fetchGuild(force?: boolean): Promise<import("./Guild").Guild<"api"> | undefined>;
 }
 export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | EntryPointInteraction | BaseInteraction;
 export interface AutocompleteInteraction extends ObjectToLower<Omit<APIApplicationCommandAutocompleteInteraction, 'user' | 'member' | 'type' | 'data' | 'message' | 'channel' | 'app_permissions'>> {

package/lib/structures/Interaction.js

@@ -216,7 +216,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return new BaseInteraction(client, gateway);
         }
     }
-    fetchGuild(force = false) {
+    async fetchGuild(force = false) {
         return this.guildId ? this.client.guilds.fetch(this.guildId, force) : undefined;
     }
 }

package/lib/structures/channels.d.ts

@@ -236,9 +236,10 @@ export interface ForumChannel extends ObjectToLower<Omit<APIGuildForumChannel, '
 export declare class ForumChannel extends BaseGuildChannel {
     type: ChannelType.GuildForum;
 }
-export interface ThreadChannel extends ObjectToLower<Omit<APIThreadChannel, 'permission_overwrites'>>, TextBaseGuildChannel {
+export interface ThreadChannel extends ObjectToLower<Omit<APIThreadChannel, 'permission_overwrites'>>, Omit<TextBaseGuildChannel, 'edit' | 'parentId'> {
 }
 export declare class ThreadChannel extends BaseChannel<ChannelType.PublicThread | ChannelType.AnnouncementThread | ChannelType.PrivateThread> {
+    parentId: string;
     type: ChannelType.PublicThread | ChannelType.AnnouncementThread | ChannelType.PrivateThread;
     webhooks: {
         list: () => Promise<import("./Webhook").Webhook[]>;

package/lib/structures/channels.js

@@ -375,6 +375,7 @@ exports.ForumChannel = ForumChannel = __decorate([
     (0, mixer_1.mix)(ThreadOnlyMethods, WebhookChannelMethods)
 ], ForumChannel);
 let ThreadChannel = class ThreadChannel extends BaseChannel {
+    parentId;
     webhooks = WebhookChannelMethods.channel({
         client: this.client,
         channelId: this.parentId,

package/lib/types/payloads/channel.d.ts

@@ -1,6 +1,7 @@
 /**
  * Types extracted from https://discord.com/developers/docs/resources/channel
  */
+import type { PickRequired } from '../../common';
 import type { ChannelType, OverwriteType, Permissions, Snowflake, VideoQualityMode } from '../index';
 import type { APIApplication } from './application';
 import type { APIPartialEmoji } from './emoji';
@@ -176,7 +177,7 @@ export interface APIGroupDMChannel extends Omit<APIDMChannelBase<ChannelType.Gro
     managed?: boolean;
 }
 export type ThreadChannelType = ChannelType.AnnouncementThread | ChannelType.PrivateThread | ChannelType.PublicThread;
-export interface APIThreadChannel extends Omit<APITextBasedChannel<ThreadChannelType>, 'name'>, APIGuildChannel<ThreadChannelType> {
+export interface APIThreadChannel extends Omit<APITextBasedChannel<ThreadChannelType>, 'name'>, PickRequired<APIGuildChannel<ThreadChannelType>, 'parent_id'> {
     /**
      * The client users member for the thread, only included in select endpoints
      */

package/lib/websocket/discord/workermanager.d.ts

@@ -2,7 +2,7 @@ import { type Worker as ClusterWorker } from 'node:cluster';
 import type { Worker as WorkerThreadsWorker } from 'node:worker_threads';
 import { ApiHandler, type CustomWorkerManagerEvents, Logger, type UsingClient, type WorkerClient } from '../..';
 import { type Adapter } from '../../cache';
-import { type Identify, type MakePartial } from '../../common';
+import { type Identify, type PickPartial } from '../../common';
 import type { GatewayPresenceUpdateData, GatewaySendPayload } from '../../types';
 import { ConnectQueue } from '../structures/timeout';
 import type { ShardOptions, WorkerData, WorkerManagerOptions } from './shared';
@@ -19,7 +19,7 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerTh
         shardEnd: number;
         shardsPerWorker: number;
     }, logger?: Logger): number[][];
-    options: MakePartial<Required<WorkerManagerOptions>, 'adapter' | 'handleWorkerMessage' | 'handlePayload'>;
+    options: PickPartial<Required<WorkerManagerOptions>, 'adapter' | 'handleWorkerMessage' | 'handlePayload'>;
     debugger?: Logger;
     connectQueue: ConnectQueue;
     workerQueue: (() => void)[];
@@ -31,8 +31,8 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | WorkerTh
     rest: ApiHandler;
     reshardingWorkerQueue: (() => void)[];
     private _info?;
-    constructor(options: Omit<MakePartial<WorkerManagerOptions, 'token' | 'intents' | 'info' | 'handlePayload' | 'handleWorkerMessage'>, 'resharding'> & {
-        resharding?: MakePartial<NonNullable<WorkerManagerOptions['resharding']>, 'getInfo'>;
+    constructor(options: Omit<PickPartial<WorkerManagerOptions, 'token' | 'intents' | 'info' | 'handlePayload' | 'handleWorkerMessage'>, 'resharding'> & {
+        resharding?: PickPartial<NonNullable<WorkerManagerOptions['resharding']>, 'getInfo'>;
     });
     setCache(adapter: Adapter): void;
     setRest(rest: ApiHandler): void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-12334128354.0",
+	"version": "2.1.1-dev-12340785707.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",