seyfert 2.1.1-dev-11674440750.0 → 2.1.1-dev-11697693162.0

package/lib/api/api.d.ts

@@ -22,7 +22,8 @@ export declare class ApiHandler {
     get proxy(): APIRoutes;
     globalUnblock(): void;
     request<T = unknown>(method: HttpMethods, url: `/${string}`, { auth, ...request }?: ApiRequestOptions): Promise<T>;
-    parseError(method: HttpMethods, route: `/${string}`, response: Response, result: unknown): Error;
+    parseError(method: HttpMethods, route: `/${string}`, response: Response, result: string | Record<string, any>): Error;
+    parseValidationError(data: Record<string, any>, path?: string, errors?: string[]): string[];
     handle50X(method: HttpMethods, url: `/${string}`, request: ApiRequestOptions, next: () => void): Promise<unknown>;
     handle429(route: string, method: HttpMethods, url: `/${string}`, request: ApiRequestOptions, response: Response, result: string, next: () => void, reject: (err: unknown) => void, now: number): Promise<unknown>;
     clearResetInterval(route: string): void;

package/lib/api/api.js

@@ -172,17 +172,31 @@ class ApiHandler {
     }
     parseError(method, route, response, result) {
         let errMessage = '';
-        if (typeof result === 'object' && result) {
-            if ('message' in result) {
-                errMessage += `${result.message}${'code' in result ? ` ${result.code}` : ''}\n`;
-            }
-            if ('errors' in result && result) {
-                errMessage += `${JSON.stringify(result.errors, null, 2)}\n`;
+        if (typeof result === 'object') {
+            errMessage += `${result.message ?? 'Unknown'} ${result.code ?? ''}\n[${response.status} ${response.statusText}] ${method} ${route}`;
+            if ('errors' in result) {
+                const errors = this.parseValidationError(result.errors);
+                errMessage += `\n${errors.join('\n') || JSON.stringify(result.errors, null, 2)}`;
             }
         }
-        errMessage += `    at [${response.status} ${response.statusText}] ${method} ${route}\n`;
+        else {
+            errMessage = `[${response.status} ${response.statusText}] ${method} ${route}`;
+        }
         return new Error(errMessage);
     }
+    parseValidationError(data, path = '', errors = []) {
+        for (const key in data) {
+            if (key === '_errors') {
+                for (const error of data[key]) {
+                    errors.push(`${path.slice(0, -1)} [${error.code}]: ${error.message}`);
+                }
+            }
+            else if (typeof data[key] === 'object') {
+                this.parseValidationError(data[key], `${path}${key}.`, errors);
+            }
+        }
+        return errors;
+    }
     async handle50X(method, url, request, next) {
         const wait = Math.floor(Math.random() * 1900 + 100);
         this.debugger?.warn(`Handling a 50X status, retrying in ${wait}ms`);

package/lib/client/transformers.d.ts

@@ -41,7 +41,7 @@ export declare const Transformers: {
     BaseChannel(client: import("../commands").UsingClient, data: import("../types").APIChannelBase<ChannelType>): BaseChannelStructure;
     BaseGuildChannel(client: import("../commands").UsingClient, data: import("../types").APIGuildChannel<ChannelType>): BaseGuildChannelStructure;
     TextGuildChannel(client: import("../commands").UsingClient, data: import("../types").APIGuildChannel<ChannelType>): TextGuildChannelStructure;
-    DMChannel(...args: ConstructorParameters<typeof DMChannel>): DMChannelStructure;
+    DMChannel(client: import("../commands").UsingClient, data: import("../types").APIChannelBase<ChannelType>): DMChannelStructure;
     VoiceChannel(client: import("../commands").UsingClient, data: import("../types").APIChannelBase<ChannelType>): VoiceChannelStructure;
     StageChannel(client: import("../commands").UsingClient, data: import("../types").APIChannelBase<ChannelType>): StageChannelStructure;
     MediaChannel(client: import("../commands").UsingClient, data: import("../types").APIChannelBase<ChannelType>): MediaChannelStructure;

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

@@ -1,11 +1,11 @@
-import type { PermissionStrings, SeyfertBaseChoiceableOption, SeyfertBasicOption, SeyfertChoice, SeyfertNumberOption, SeyfertStringOption } from '../..';
+import type { PermissionStrings, SeyfertBaseChoiceableOption, SeyfertBasicOption, SeyfertChoice } from '../..';
 import type { Attachment } from '../../builders';
 import type { GuildRoleStructure, InteractionGuildMemberStructure, UserStructure } from '../../client/transformers';
 import type { AllChannels, AutocompleteInteraction } from '../../structures';
 import { type APIApplicationCommandBasicOption, type APIApplicationCommandOption, ApplicationCommandOptionType, ApplicationCommandType, type ApplicationIntegrationType, type InteractionContextType, type LocaleString } from '../../types';
 import type { Groups, RegisteredMiddlewares } from '../decorators';
 import type { CommandContext } from './chatcontext';
-import type { ExtraProps, IgnoreCommand, OnOptionsReturnObject, UsingClient } from './shared';
+import type { ExtraProps, IgnoreCommand, OnOptionsReturnObject, SeyfertChannelMap, UsingClient } from './shared';
 export interface ReturnOptionsTypes {
     1: never;
     2: never;
@@ -41,7 +41,11 @@ type KeysWithoutRequired<T extends OptionsRecord> = {
 }[keyof T];
 type ContextOptionsAuxInternal<T extends CommandBaseOption & {
     type: ApplicationCommandOptionType;
-}> = T['value'] extends (...args: any) => any ? Parameters<Parameters<T['value']>[1]>[0] : NonNullable<T['value']> extends (...args: any) => any ? Parameters<Parameters<NonNullable<T['value']>>[1]>[0] extends never ? T extends SeyfertStringOption | SeyfertNumberOption ? NonNullable<T['choices']> extends SeyfertChoice<string | number>[] ? NonNullable<T['choices']>[number]['value'] : ReturnOptionsTypes[T['type']] : ReturnOptionsTypes[T['type']] : Parameters<Parameters<NonNullable<T['value']>>[1]>[0] : T extends SeyfertStringOption | SeyfertNumberOption ? NonNullable<T['choices']> extends SeyfertChoice<string | number>[] ? NonNullable<T['choices']>[number]['value'] : ReturnOptionsTypes[T['type']] : ReturnOptionsTypes[T['type']];
+}> = T['value'] extends (...args: any) => any ? Parameters<Parameters<T['value']>[1]>[0] : NonNullable<T['value']> extends (...args: any) => any ? Parameters<Parameters<NonNullable<T['value']>>[1]>[0] extends never ? T extends {
+    channel_types?: infer C;
+} ? C extends any[] ? C[number] extends keyof SeyfertChannelMap ? SeyfertChannelMap[C[number]] : never : never : T extends {
+    choices?: infer C;
+} ? C extends SeyfertChoice<string>[] ? C[number]['value'] : never : never : Parameters<Parameters<NonNullable<T['value']>>[1]>[0] : ReturnOptionsTypes[T['type']];
 type ContextOptionsAux<T extends OptionsRecord> = {
     [K in Exclude<keyof T, KeysWithoutRequired<T>>]: ContextOptionsAuxInternal<T[K]>;
 } & {

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

@@ -3,10 +3,10 @@ import type { Awaitable, FlatObjectKeys } from '../../common';
 import type { ModalContext } from '../../components';
 import type { ComponentContext } from '../../components/componentcontext';
 import type { MessageCommandInteraction, UserCommandInteraction } from '../../structures';
-import { type APIApplicationCommandBasicOption, type APIApplicationCommandOptionChoice, ApplicationCommandOptionType, type ChannelType } from '../../types';
+import { type APIApplicationCommandBasicOption, type APIApplicationCommandOptionChoice, ApplicationCommandOptionType } from '../../types';
 import type { LocalizationMap } from '../../types/payloads';
 import type { CommandContext } from './chatcontext';
-import type { DefaultLocale, MiddlewareContext, OKFunction, StopFunction } from './shared';
+import type { DefaultLocale, MiddlewareContext, OKFunction, SeyfertChannelMap, StopFunction } from './shared';
 export interface SeyfertBasicOption<T extends keyof ReturnOptionsTypes, R = true | false> {
     required?: R;
     value?(data: {
@@ -47,9 +47,9 @@ export interface ChoiceableValues {
     [ApplicationCommandOptionType.Number]: number;
     [ApplicationCommandOptionType.Integer]: number;
 }
-export type ValueCallback<T extends keyof ReturnOptionsTypes, C = T extends ChoiceableTypes ? SeyfertChoice<ChoiceableValues[T]>[] : never, I = any> = (data: {
+export type ValueCallback<T extends keyof ReturnOptionsTypes, C = T extends ChoiceableTypes ? SeyfertChoice<ChoiceableValues[T]>[] : keyof SeyfertChannelMap, I = any> = (data: {
     context: CommandContext;
-    value: T extends ChoiceableTypes ? C extends SeyfertChoice<ChoiceableValues[T]>[] ? C[number]['value'] extends ReturnOptionsTypes[T] ? C[number]['value'] : ReturnOptionsTypes[T] : ReturnOptionsTypes[T] : ReturnOptionsTypes[T];
+    value: T extends ChoiceableTypes ? C extends SeyfertChoice<ChoiceableValues[T]>[] ? C[number]['value'] extends ReturnOptionsTypes[T] ? C[number]['value'] : never : never : C extends keyof SeyfertChannelMap ? SeyfertChannelMap[C] : never;
 }, ok: OKFunction<I>, fail: StopFunction) => Awaitable<void>;
 export type SeyfertStringOption<T = SeyfertChoice<string>[], R = boolean, VC = never> = SeyfertBaseChoiceableOption<ApplicationCommandOptionType.String, T, R, VC> & {
     autocomplete?: AutocompleteCallback;
@@ -71,8 +71,17 @@ export type SeyfertNumberOption<T = SeyfertChoice<number>[], R = boolean, VC = n
 };
 export type SeyfertBooleanOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Boolean, R>;
 export type SeyfertUserOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.User, R>;
-export type SeyfertChannelOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Channel, R> & {
-    channel_types?: ChannelType[];
+export type SeyfertChannelOption<C = keyof SeyfertChannelMap, R = true | false, VC = never> = {
+    required?: R;
+    value?: ValueCallback<ApplicationCommandOptionType.Channel, C, VC>;
+    description: string;
+    description_localizations?: APIApplicationCommandBasicOption['description_localizations'];
+    name_localizations?: APIApplicationCommandBasicOption['name_localizations'];
+    locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+    channel_types?: C[];
 };
 export type SeyfertRoleOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Role, R>;
 export type SeyfertMentionableOption<R = boolean> = SeyfertBasicOption<ApplicationCommandOptionType.Mentionable, R>;
@@ -128,15 +137,25 @@ export declare function createNumberOption<R extends boolean, C extends SeyfertC
     readonly min_value?: number;
     readonly max_value?: number;
 };
+export declare function createChannelOption<R extends boolean, C extends keyof SeyfertChannelMap = keyof SeyfertChannelMap, VC = never>(data: SeyfertChannelOption<C, R, VC>): {
+    readonly type: ApplicationCommandOptionType.Channel;
+    readonly required?: R | undefined;
+    readonly value?: ValueCallback<ApplicationCommandOptionType.Channel, C, VC> | undefined;
+    readonly description: string;
+    readonly description_localizations?: APIApplicationCommandBasicOption["description_localizations"];
+    readonly name_localizations?: APIApplicationCommandBasicOption["name_localizations"];
+    readonly locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
+    readonly channel_types?: C[] | undefined;
+};
 export declare function createBooleanOption<R extends boolean, T extends SeyfertBooleanOption<R> = SeyfertBooleanOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Boolean;
 };
 export declare function createUserOption<R extends boolean, T extends SeyfertUserOption<R> = SeyfertUserOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.User;
 };
-export declare function createChannelOption<R extends boolean, T extends SeyfertChannelOption<R> = SeyfertChannelOption<R>>(data: T): T & {
-    readonly type: ApplicationCommandOptionType.Channel;
-};
 export declare function createRoleOption<R extends boolean, T extends SeyfertRoleOption<R> = SeyfertRoleOption<R>>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Role;
 };

package/lib/commands/applications/options.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStringOption = createStringOption;
 exports.createIntegerOption = createIntegerOption;
 exports.createNumberOption = createNumberOption;
+exports.createChannelOption = createChannelOption;
 exports.createBooleanOption = createBooleanOption;
 exports.createUserOption = createUserOption;
-exports.createChannelOption = createChannelOption;
 exports.createRoleOption = createRoleOption;
 exports.createMentionableOption = createMentionableOption;
 exports.createAttachmentOption = createAttachmentOption;
@@ -20,15 +20,15 @@ function createIntegerOption(data) {
 function createNumberOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Number };
 }
+function createChannelOption(data) {
+    return { ...data, type: types_1.ApplicationCommandOptionType.Channel };
+}
 function createBooleanOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Boolean };
 }
 function createUserOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.User };
 }
-function createChannelOption(data) {
-    return { ...data, type: types_1.ApplicationCommandOptionType.Channel };
-}
 function createRoleOption(data) {
     return { ...data, type: types_1.ApplicationCommandOptionType.Role };
 }

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

@@ -1,6 +1,7 @@
+import type { CategoryChannelStructure, DMChannelStructure, DirectoryChannelStructure, ForumChannelStructure, MediaChannelStructure, NewsChannelStructure, StageChannelStructure, TextGuildChannelStructure, ThreadChannelStructure, VoiceChannelStructure } from '../../client';
 import type { BaseClient } from '../../client/base';
 import type { IsStrictlyUndefined } from '../../common';
-import type { ChannelType } from '../../types';
+import { ChannelType } from '../../types';
 import type { RegisteredMiddlewares } from '../decorators';
 export type OKFunction<T> = (value: T) => void;
 export type StopFunction = (error: string) => void;
@@ -64,3 +65,18 @@ export declare enum IgnoreCommand {
     Slash = 0,
     Message = 1
 }
+export interface SeyfertChannelMap {
+    [ChannelType.GuildText]: TextGuildChannelStructure;
+    [ChannelType.DM]: DMChannelStructure;
+    [ChannelType.GuildVoice]: VoiceChannelStructure;
+    [ChannelType.GroupDM]: DMChannelStructure;
+    [ChannelType.GuildCategory]: CategoryChannelStructure;
+    [ChannelType.GuildAnnouncement]: NewsChannelStructure;
+    [ChannelType.AnnouncementThread]: ThreadChannelStructure;
+    [ChannelType.PublicThread]: ThreadChannelStructure;
+    [ChannelType.PrivateThread]: ThreadChannelStructure;
+    [ChannelType.GuildStageVoice]: StageChannelStructure;
+    [ChannelType.GuildDirectory]: DirectoryChannelStructure;
+    [ChannelType.GuildForum]: ForumChannelStructure;
+    [ChannelType.GuildMedia]: MediaChannelStructure;
+}

package/lib/commands/applications/shared.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IgnoreCommand = void 0;
+const types_1 = require("../../types");
 var IgnoreCommand;
 (function (IgnoreCommand) {
     IgnoreCommand[IgnoreCommand["Slash"] = 0] = "Slash";

package/lib/structures/channels.d.ts

@@ -6,7 +6,7 @@ import { type APIChannelBase, type APIDMChannel, type APIGuildCategoryChannel, t
 import type { GuildMember } from './GuildMember';
 import type { GuildRole } from './GuildRole';
 import { DiscordBase } from './extra/DiscordBase';
-export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIChannelBase<ChannelType>> {
+export declare class BaseNoEditableChannel<T extends ChannelType> extends DiscordBase<APIChannelBase<ChannelType>> {
     type: T;
     constructor(client: UsingClient, data: APIChannelBase<ChannelType>);
     static __intent__(id: '@me'): 'DirectMessages';
@@ -15,7 +15,6 @@ export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIC
     get url(): string;
     fetch(force?: boolean): Promise<AllChannels>;
     delete(reason?: string): Promise<AllChannels>;
-    edit(body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<AllChannels>;
     toString(): `<#${string}>`;
     isStage(): this is StageChannel;
     isMedia(): this is MediaChannel;
@@ -42,6 +41,9 @@ export declare class BaseChannel<T extends ChannelType> extends DiscordBase<APIC
         editPositions: (body: RESTPatchAPIGuildChannelPositionsJSONBody) => Promise<never>;
     };
 }
+export declare class BaseChannel<T extends ChannelType> extends BaseNoEditableChannel<T> {
+    edit(body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<AllChannels>;
+}
 interface IChannelTypes {
     GuildStageVoice: StageChannel;
     GuildMedia: MediaChannel;
@@ -107,7 +109,7 @@ export declare class BaseGuildChannel extends BaseChannel<ChannelType> {
     setName(name: string, reason?: string): Promise<AllChannels>;
     setParent(parent_id: string | null, reason?: string): Promise<AllChannels>;
 }
-export interface MessagesMethods extends BaseChannel<ChannelType> {
+export interface MessagesMethods extends BaseNoEditableChannel<ChannelType> {
 }
 export declare class MessagesMethods extends DiscordBase {
     typing(): Promise<void>;
@@ -218,10 +220,9 @@ export declare class TextGuildChannel extends BaseGuildChannel {
     setRatelimitPerUser(rate_limit_per_user: number | null | undefined): Promise<AllChannels>;
     setNsfw(nsfw?: boolean, reason?: string): Promise<AllChannels>;
 }
-export interface DMChannel extends ObjectToLower<APIDMChannel>, Omit<MessagesMethods, 'edit'> {
+export interface DMChannel extends ObjectToLower<APIDMChannel>, MessagesMethods {
 }
-declare const DMChannel_base: ToClass<Omit<BaseChannel<ChannelType.DM>, "edit">, DMChannel>;
-export declare class DMChannel extends DMChannel_base {
+export declare class DMChannel extends BaseNoEditableChannel<ChannelType.DM> {
     type: ChannelType.DM;
 }
 export interface VoiceChannel extends ObjectToLower<Omit<APIGuildVoiceChannel, 'permission_overwrites'>>, Omit<TextGuildChannel, 'type'>, VoiceChannelMethods, WebhookChannelMethods {

package/lib/structures/channels.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DirectoryChannel = exports.NewsChannel = exports.CategoryChannel = exports.ThreadChannel = exports.ForumChannel = exports.MediaChannel = exports.StageChannel = exports.VoiceChannel = exports.DMChannel = exports.TextGuildChannel = exports.WebhookChannelMethods = exports.WebhookGuildMethods = exports.VoiceChannelMethods = exports.ThreadOnlyMethods = exports.TopicableGuildChannel = exports.TextBaseGuildChannel = exports.MessagesMethods = exports.BaseGuildChannel = exports.BaseChannel = void 0;
+exports.DirectoryChannel = exports.NewsChannel = exports.CategoryChannel = exports.ThreadChannel = exports.ForumChannel = exports.MediaChannel = exports.StageChannel = exports.VoiceChannel = exports.DMChannel = exports.TextGuildChannel = exports.WebhookChannelMethods = exports.WebhookGuildMethods = exports.VoiceChannelMethods = exports.ThreadOnlyMethods = exports.TopicableGuildChannel = exports.TextBaseGuildChannel = exports.MessagesMethods = exports.BaseGuildChannel = exports.BaseChannel = exports.BaseNoEditableChannel = void 0;
 exports.channelFrom = channelFrom;
 const __1 = require("..");
 const builders_1 = require("../builders");
@@ -14,7 +14,7 @@ const transformers_1 = require("../client/transformers");
 const mixer_1 = require("../deps/mixer");
 const types_1 = require("../types");
 const DiscordBase_1 = require("./extra/DiscordBase");
-class BaseChannel extends DiscordBase_1.DiscordBase {
+class BaseNoEditableChannel extends DiscordBase_1.DiscordBase {
     constructor(client, data) {
         super(client, data);
     }
@@ -31,12 +31,6 @@ class BaseChannel extends DiscordBase_1.DiscordBase {
     delete(reason) {
         return this.client.channels.delete(this.id, { reason });
     }
-    edit(body, reason) {
-        return this.client.channels.edit(this.id, body, {
-            reason,
-            guildId: 'guildId' in this ? this.guildId : '@me',
-        });
-    }
     toString() {
         return __1.Formatter.channelMention(this.id);
     }
@@ -93,6 +87,15 @@ class BaseChannel extends DiscordBase_1.DiscordBase {
         };
     }
 }
+exports.BaseNoEditableChannel = BaseNoEditableChannel;
+class BaseChannel extends BaseNoEditableChannel {
+    edit(body, reason) {
+        return this.client.channels.edit(this.id, body, {
+            reason,
+            guildId: 'guildId' in this ? this.guildId : '@me',
+        });
+    }
+}
 exports.BaseChannel = BaseChannel;
 class BaseGuildChannel extends BaseChannel {
     constructor(client, data) {
@@ -335,7 +338,7 @@ exports.TextGuildChannel = TextGuildChannel;
 exports.TextGuildChannel = TextGuildChannel = __decorate([
     (0, mixer_1.mix)(TextBaseGuildChannel, WebhookChannelMethods)
 ], TextGuildChannel);
-let DMChannel = class DMChannel extends BaseChannel {
+let DMChannel = class DMChannel extends BaseNoEditableChannel {
 };
 exports.DMChannel = DMChannel;
 exports.DMChannel = DMChannel = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11674440750.0",
+	"version": "2.1.1-dev-11697693162.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -24,7 +24,7 @@
 		"@biomejs/biome": "1.9.4",
 		"@commitlint/cli": "^19.5.0",
 		"@commitlint/config-conventional": "^19.5.0",
-		"@types/node": "^22.8.6",
+		"@types/node": "^22.9.0",
 		"husky": "^9.1.6",
 		"lint-staged": "^15.2.10",
 		"typescript": "^5.6.3",