seyfert 1.3.3 → 1.4.0

package/lib/client/oninteractioncreate.js

@@ -4,6 +4,7 @@ exports.onInteractionCreate = void 0;
 const v10_1 = require("discord-api-types/v10");
 const commands_1 = require("../commands");
 const structures_1 = require("../structures");
+const components_1 = require("../components");
 async function onInteractionCreate(self, body, shardId, __reply) {
     self.debugger?.debug(`[${v10_1.InteractionType[body.type] ?? body.type}] Interaction received.`);
     switch (body.type) {
@@ -16,7 +17,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     return x.name === body.data.name;
                 });
                 const optionsResolver = new commands_1.OptionResolver(self, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
-                const interaction = new structures_1.AutocompleteInteraction(self, body, __reply);
+                const interaction = new structures_1.AutocompleteInteraction(self, body, optionsResolver, __reply);
                 const command = optionsResolver.getAutocomplete();
                 // idc, is a YOU problem
                 if (!command?.autocomplete)
@@ -64,17 +65,17 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                                 if (command.botPermissions && interaction.appPermissions) {
                                     const permissions = interaction.appPermissions.missings(...interaction.appPermissions.values([command.botPermissions]));
                                     if (!interaction.appPermissions.has('Administrator') && permissions.length) {
-                                        return command.onBotPermissionsFail?.(context, interaction.appPermissions.keys(permissions));
+                                        return command.onBotPermissionsFail(context, interaction.appPermissions.keys(permissions));
                                     }
                                 }
-                                const resultRunGlobalMiddlewares = await command.__runGlobalMiddlewares(context);
+                                const resultRunGlobalMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, (self.options?.globalMiddlewares ?? []), true);
                                 if (resultRunGlobalMiddlewares.pass) {
                                     return;
                                 }
                                 if ('error' in resultRunGlobalMiddlewares) {
                                     return command.onMiddlewaresError(context, resultRunGlobalMiddlewares.error ?? 'Unknown error');
                                 }
-                                const resultRunMiddlewares = await command.__runMiddlewares(context);
+                                const resultRunMiddlewares = await commands_1.BaseCommand.__runMiddlewares(context, command.middlewares, false);
                                 if (resultRunMiddlewares.pass) {
                                     return;
                                 }
@@ -86,7 +87,7 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                                     await command.onAfterRun?.(context, undefined);
                                 }
                                 catch (error) {
-                                    await command.onRunError?.(context, error);
+                                    await command.onRunError(context, error);
                                     await command.onAfterRun?.(context, error);
                                 }
                             }
@@ -170,7 +171,10 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     await self.components.onModalSubmit(interaction);
                 }
                 else {
-                    await self.components?.executeModal(interaction);
+                    const context = new components_1.ModalContext(self, interaction);
+                    const extended = self.options?.context?.(interaction) ?? {};
+                    Object.assign(context, extended);
+                    await self.components?.executeModal(context);
                 }
             }
             break;
@@ -181,7 +185,11 @@ async function onInteractionCreate(self, body, shardId, __reply) {
                     await self.components.onComponent(body.message.id, interaction);
                 }
                 else {
-                    await self.components?.executeComponent(interaction);
+                    //@ts-expect-error
+                    const context = new components_1.ComponentContext(self, interaction);
+                    const extended = self.options?.context?.(interaction) ?? {};
+                    Object.assign(context, extended);
+                    await self.components?.executeComponent(context);
                 }
             }
             break;

package/lib/client/onmessagecreate.js

@@ -67,7 +67,11 @@ async function onMessageCreate(self, rawMessage, shardId) {
         members: {},
         attachments: {},
     };
-    const args = (self.options?.commands?.argsParser ?? defaultArgsParser)(content, command);
+    let newContent = content;
+    for (const i of fullCommandName.split(' ')) {
+        newContent = newContent.slice(newContent.indexOf(i) + i.length);
+    }
+    const args = (self.options?.commands?.argsParser ?? defaultArgsParser)(newContent.slice(1), command, message);
     const { options, errors } = await parseOptions(self, command, rawMessage, args, resolved);
     const optionsResolver = new __1.OptionResolver(self, options, parent, message.guildId, resolved);
     const context = new __1.CommandContext(self, message, optionsResolver, shardId, command);
@@ -262,82 +266,31 @@ async function parseOptions(self, command, message, args, resolved) {
                     {
                         value = args[i.name];
                         const option = i;
-                        if (value) {
-                            if (option.min_length) {
-                                if (value.length < option.min_length) {
-                                    value = undefined;
-                                    errors.push({
-                                        name: i.name,
-                                        error: `The entered string has less than ${option.min_length} characters. The minimum required is ${option.min_length} characters.`,
-                                    });
-                                    break;
-                                }
-                            }
-                            if (option.max_length) {
-                                if (value.length > option.max_length) {
-                                    value = undefined;
-                                    errors.push({
-                                        name: i.name,
-                                        error: `The entered string has more than ${option.max_length} characters. The maximum required is ${option.max_length} characters.`,
-                                    });
-                                    break;
-                                }
-                            }
-                            if (option.choices?.length) {
-                                if (!option.choices.some(x => x.name === value)) {
-                                    value = undefined;
-                                    errors.push({
-                                        name: i.name,
-                                        error: `The entered choice is invalid. Please choose one of the following options: ${option.choices
-                                            .map(x => x.name)
-                                            .join(', ')}.`,
-                                    });
-                                    break;
-                                }
-                                value = option.choices.find(x => x.name === value).value;
-                            }
-                        }
-                    }
-                    break;
-                case v10_1.ApplicationCommandOptionType.Number:
-                case v10_1.ApplicationCommandOptionType.Integer:
-                    {
-                        value = Number(args[i.name]);
-                        if (args[i.name] === undefined) {
-                            value = undefined;
+                        if (!value)
                             break;
-                        }
-                        if (Number.isNaN(value)) {
-                            value = undefined;
-                            errors.push({
-                                name: i.name,
-                                error: 'The entered choice is an invalid number.',
-                            });
-                            break;
-                        }
-                        const option = i;
-                        if (option.min_value) {
-                            if (value < option.min_value) {
+                        if (option.min_length) {
+                            if (value.length < option.min_length) {
                                 value = undefined;
                                 errors.push({
                                     name: i.name,
-                                    error: `The entered number is less than ${option.min_value}. The minimum allowed is ${option.min_value}`,
+                                    error: `The entered string has less than ${option.min_length} characters. The minimum required is ${option.min_length} characters.`,
                                 });
                                 break;
                             }
                         }
-                        if (option.max_value) {
-                            if (value > option.max_value) {
+                        if (option.max_length) {
+                            if (value.length > option.max_length) {
                                 value = undefined;
                                 errors.push({
                                     name: i.name,
-                                    error: `The entered number is greater than ${option.max_value}. The maximum allowed is ${option.max_value}`,
+                                    error: `The entered string has more than ${option.max_length} characters. The maximum required is ${option.max_length} characters.`,
                                 });
                                 break;
                             }
                         }
                         if (option.choices?.length) {
-                            if (!option.choices.some(x => x.name === value)) {
+                            const choice = option.choices.find(x => x.name === value);
+                            if (!choice) {
                                 value = undefined;
                                 errors.push({
                                     name: i.name,
@@ -347,8 +300,62 @@ async function parseOptions(self, command, message, args, resolved) {
                                 });
                                 break;
                             }
-                            value = option.choices.find(x => x.name === value).value;
+                            value = choice.value;
+                        }
+                    }
+                    break;
+                case v10_1.ApplicationCommandOptionType.Number:
+                case v10_1.ApplicationCommandOptionType.Integer:
+                    {
+                        const option = i;
+                        if (!option.choices?.length) {
+                            value = Number(args[i.name]);
+                            if (args[i.name] === undefined) {
+                                value = undefined;
+                                break;
+                            }
+                            if (Number.isNaN(value)) {
+                                value = undefined;
+                                errors.push({
+                                    name: i.name,
+                                    error: 'The entered choice is an invalid number.',
+                                });
+                                break;
+                            }
+                            if (option.min_value) {
+                                if (value < option.min_value) {
+                                    value = undefined;
+                                    errors.push({
+                                        name: i.name,
+                                        error: `The entered number is less than ${option.min_value}. The minimum allowed is ${option.min_value}`,
+                                    });
+                                    break;
+                                }
+                            }
+                            if (option.max_value) {
+                                if (value > option.max_value) {
+                                    value = undefined;
+                                    errors.push({
+                                        name: i.name,
+                                        error: `The entered number is greater than ${option.max_value}. The maximum allowed is ${option.max_value}`,
+                                    });
+                                    break;
+                                }
+                            }
+                            break;
                         }
+                        const choice = option.choices.find(x => x.name === args[i.name]);
+                        if (!choice) {
+                            value = undefined;
+                            errors.push({
+                                name: i.name,
+                                error: `The entered choice is invalid. Please choose one of the following options: ${option.choices
+                                    .map(x => x.name)
+                                    .join(', ')}.`,
+                            });
+                            break;
+                        }
+                        value = choice.value;
                     }
                     break;
                 default:
@@ -362,10 +369,11 @@ async function parseOptions(self, command, message, args, resolved) {
                 });
             }
             else if (i.required)
-                errors.push({
-                    error: 'Option is required but returned undefined',
-                    name: i.name,
-                });
+                if (!errors.some(x => x.name === i.name))
+                    errors.push({
+                        error: 'Option is required but returned undefined',
+                        name: i.name,
+                    });
         }
         catch (e) {
             errors.push({

package/lib/client/workerclient.d.ts

@@ -25,7 +25,7 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
         timeout: NodeJS.Timeout;
     }>;
     shards: Map<number, Shard>;
-    options: WorkerClientOptions | undefined;
+    options: WorkerClientOptions;
     constructor(options?: WorkerClientOptions);
     get workerId(): number;
     get latency(): number;

package/lib/client/workerclient.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateShardInfo = exports.WorkerClient = void 0;
 const v10_1 = require("discord-api-types/v10");
 const node_crypto_1 = require("node:crypto");
-const node_worker_threads_1 = require("node:worker_threads");
 const __1 = require("..");
 const cache_1 = require("../cache");
 const common_1 = require("../common");
@@ -14,6 +13,7 @@ const base_1 = require("./base");
 const oninteractioncreate_1 = require("./oninteractioncreate");
 const onmessagecreate_1 = require("./onmessagecreate");
 let workerData;
+let manager;
 try {
     workerData = {
         debug: process.env.SEYFERT_WORKER_DEBUG === 'true',
@@ -44,7 +44,11 @@ class WorkerClient extends base_1.BaseClient {
             type: 'WORKER_START',
             workerId: workerData.workerId,
         });
-        (node_worker_threads_1.parentPort ?? process).on('message', (data) => this.handleManagerMessages(data));
+        const worker_threads = (0, common_1.lazyLoadPackage)('node:worker_threads');
+        if (worker_threads?.parentPort) {
+            manager = worker_threads?.parentPort;
+        }
+        (manager ?? process).on('message', (data) => this.handleManagerMessages(data));
         this.setServices({
             cache: {
                 adapter: new cache_1.WorkerAdapter(workerData),
@@ -105,8 +109,8 @@ class WorkerClient extends base_1.BaseClient {
         }
     }
     postMessage(body) {
-        if (node_worker_threads_1.parentPort)
-            return node_worker_threads_1.parentPort.postMessage(body);
+        if (manager)
+            return manager.postMessage(body);
         return process.send(body);
     }
     async handleManagerMessages(data) {
@@ -289,12 +293,19 @@ class WorkerClient extends base_1.BaseClient {
             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':
+            case 'GUILD_EMOJIS_UPDATE':
+            case 'GUILD_UPDATE':
+            case 'GUILD_ROLE_UPDATE':
+            case 'GUILD_ROLE_DELETE':
+            case 'THREAD_UPDATE':
+            case 'USER_UPDATE':
+            case 'VOICE_STATE_UPDATE':
+            case 'STAGE_INSTANCE_UPDATE':
+            case 'GUILD_STICKERS_UPDATE':
                 await this.events?.execute(packet.t, packet, this, shardId);
+                await this.cache.onPacket(packet);
                 break;
             //rest of the events
             default:

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

@@ -64,7 +64,7 @@ type ContextOptionsAux<T extends OptionsRecord> = {
     [K in KeysWithoutRequired<T>]?: T[K]['value'] extends (...args: any) => any ? Parameters<Parameters<T[K]['value']>[1]>[0] : T[K] extends SeyfertStringOption | SeyfertNumberOption ? T[K]['choices'] extends NonNullable<SeyfertStringOption['choices'] | SeyfertNumberOption['choices']> ? T[K]['choices'][number]['value'] : ReturnOptionsTypes[T[K]['type']] : ReturnOptionsTypes[T[K]['type']];
 };
 export type ContextOptions<T extends OptionsRecord> = ContextOptionsAux<T>;
-declare class BaseCommand {
+export declare class BaseCommand {
     middlewares: (keyof RegisteredMiddlewares)[];
     __filePath?: string;
     __t?: {

package/lib/commands/applications/chat.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubCommand = exports.Command = void 0;
+exports.SubCommand = exports.Command = exports.BaseCommand = void 0;
 const v10_1 = require("discord-api-types/v10");
 const common_1 = require("../../common");
 class BaseCommand {
@@ -137,6 +137,7 @@ class BaseCommand {
         Object.setPrototypeOf(this, __tempCommand.prototype);
     }
 }
+exports.BaseCommand = BaseCommand;
 class Command extends BaseCommand {
     type = v10_1.ApplicationCommandType.ChatInput;
     groups;

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

@@ -2,7 +2,7 @@ import type { AllChannels, Guild, InferWithPrefix, ReturnCache, WebhookMessage }
 import type { If, UnionToTuple, When } from '../../common';
 import type { InteractionCreateBodyRequest, InteractionMessageUpdateBodyRequest } from '../../common/types/write';
 import { Message, type ChatInputCommandInteraction, type GuildMember, type InteractionGuildMember } from '../../structures';
-import { BaseContext } from '../basecontex';
+import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
 import type { OptionResolver } from '../optionresolver';
 import type { Command, ContextOptions, OptionsRecord, SubCommand } from './chat';

package/lib/commands/applications/chatcontext.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandContext = void 0;
 const v10_1 = require("discord-api-types/v10");
 const structures_1 = require("../../structures");
-const basecontex_1 = require("../basecontex");
-class CommandContext extends basecontex_1.BaseContext {
+const basecontext_1 = require("../basecontext");
+class CommandContext extends basecontext_1.BaseContext {
     client;
     resolver;
     shardId;

package/lib/commands/applications/menu.js

@@ -18,54 +18,6 @@ class ContextMenuCommand {
     dm;
     name_localizations;
     description_localizations;
-    /** @internal */
-    static __runMiddlewares(context, middlewares, global) {
-        if (!middlewares.length) {
-            return Promise.resolve({});
-        }
-        let index = 0;
-        return new Promise(res => {
-            let running = true;
-            const pass = () => {
-                if (!running) {
-                    return;
-                }
-                running = false;
-                return res({ pass: true });
-            };
-            function next(obj) {
-                if (!running) {
-                    return;
-                }
-                // biome-ignore lint/style/noArguments: yes
-                if (arguments.length) {
-                    // @ts-expect-error
-                    context[global ? 'globalMetadata' : 'metadata'][middlewares[index]] = obj;
-                }
-                if (++index >= middlewares.length) {
-                    running = false;
-                    return res({});
-                }
-                context.client.middlewares[middlewares[index]]({ context, next, stop, pass });
-            }
-            const stop = err => {
-                if (!running) {
-                    return;
-                }
-                running = false;
-                return res({ error: err });
-            };
-            context.client.middlewares[middlewares[0]]({ context, next, stop, pass });
-        });
-    }
-    /** @internal */
-    __runMiddlewares(context) {
-        return ContextMenuCommand.__runMiddlewares(context, this.middlewares, false);
-    }
-    /** @internal */
-    __runGlobalMiddlewares(context) {
-        return ContextMenuCommand.__runMiddlewares(context, (context.client.options?.globalMiddlewares ?? []), true);
-    }
     toJSON() {
         return {
             name: this.name,

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

@@ -1,7 +1,7 @@
 import type { ContextMenuCommand, ReturnCache, WebhookMessage } from '../..';
 import { type InteractionCreateBodyRequest, type InteractionMessageUpdateBodyRequest, type ModalCreateBodyRequest, type UnionToTuple, type When } from '../../common';
 import { Message, User, type AllChannels, type Guild, type GuildMember, type MessageCommandInteraction, type UserCommandInteraction } from '../../structures';
-import { BaseContext } from '../basecontex';
+import { BaseContext } from '../basecontext';
 import type { RegisteredMiddlewares } from '../decorators';
 import type { CommandMetadata, ExtendContext, GlobalMetadata, UsingClient } from './shared';
 export type InteractionTarget<T> = T extends MessageCommandInteraction ? Message : User;

package/lib/commands/applications/menucontext.js

@@ -4,8 +4,8 @@ exports.MenuCommandContext = void 0;
 const v10_1 = require("discord-api-types/v10");
 const common_1 = require("../../common");
 const structures_1 = require("../../structures");
-const basecontex_1 = require("../basecontex");
-class MenuCommandContext extends basecontex_1.BaseContext {
+const basecontext_1 = require("../basecontext");
+class MenuCommandContext extends basecontext_1.BaseContext {
     client;
     interaction;
     shardId;
@@ -33,7 +33,7 @@ class MenuCommandContext extends basecontex_1.BaseContext {
         }
     }
     get t() {
-        return this.client.langs.get(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.command.name;

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

@@ -3,6 +3,8 @@ import type { AutocompleteCallback, MenuCommandContext, OnAutocompleteErrorCallb
 import type { MessageCommandInteraction, UserCommandInteraction } from '../../structures';
 import type { CommandContext } from './chatcontext';
 import type { MiddlewareContext } from './shared';
+import type { ModalContext } from '../../components';
+import type { ComponentContext } from '../../components/componentcontext';
 export type SeyfertBasicOption<T extends keyof __TypesWrapper, D = {}> = __TypesWrapper[T] & D;
 export type SeyfertStringOption = SeyfertBasicOption<'String'> & {
     autocomplete?: AutocompleteCallback;
@@ -63,4 +65,4 @@ export declare function createNumberOption<T extends SeyfertNumberOption = Seyfe
 export declare function createAttachmentOption<T extends SeyfertAttachmentOption = SeyfertAttachmentOption>(data: T): T & {
     readonly type: ApplicationCommandOptionType.Attachment;
 };
-export declare function createMiddleware<T = any, C extends CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>> = CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>>>(data: MiddlewareContext<T, C>): MiddlewareContext<T, C>;
+export declare function createMiddleware<T = any, C extends CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>> | ComponentContext | ModalContext = CommandContext | MenuCommandContext<MessageCommandInteraction<boolean> | UserCommandInteraction<boolean>> | ComponentContext | ModalContext>(data: MiddlewareContext<T, C>): MiddlewareContext<T, C>;

package/lib/commands/basecontext.d.ts

@@ -0,0 +1,26 @@
+import type { ModalContext } from '../components';
+import type { ContextComponentCommandInteractionMap, ComponentContext } from '../components/componentcontext';
+import type { MessageCommandInteraction, UserCommandInteraction } from '../structures';
+import type { CommandContext } from './applications/chatcontext';
+import type { MenuCommandContext } from './applications/menucontext';
+import type { UsingClient } from './applications/shared';
+export declare class BaseContext {
+    readonly client: UsingClient;
+    constructor(client: UsingClient);
+    /**
+     * Gets the proxy object.
+     */
+    get proxy(): import("..").APIRoutes;
+    isChat(): this is CommandContext;
+    isMenu(): this is MenuCommandContext<UserCommandInteraction | MessageCommandInteraction>;
+    isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
+    isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
+    isComponent(): this is ComponentContext<keyof ContextComponentCommandInteractionMap>;
+    isModal(): this is ModalContext;
+    isButton(): this is ComponentContext<'Button'>;
+    isChannelSelectMenu(): this is ComponentContext<'ChannelSelect'>;
+    isRoleSelectMenu(): this is ComponentContext<'RoleSelect'>;
+    isMentionableSelectMenu(): this is ComponentContext<'MentionableSelect'>;
+    isUserSelectMenu(): this is ComponentContext<'UserSelect'>;
+    isStringSelectMenu(): this is ComponentContext<'StringSelect'>;
+}

package/lib/commands/{basecontex.js → basecontext.js}

@@ -6,6 +6,9 @@ class BaseContext {
     constructor(client) {
         this.client = client;
     }
+    /**
+     * Gets the proxy object.
+     */
     get proxy() {
         return this.client.proxy;
     }
@@ -24,5 +27,26 @@ class BaseContext {
     isComponent() {
         return false;
     }
+    isModal() {
+        return false;
+    }
+    isButton() {
+        return false;
+    }
+    isChannelSelectMenu() {
+        return false;
+    }
+    isRoleSelectMenu() {
+        return false;
+    }
+    isMentionableSelectMenu() {
+        return false;
+    }
+    isUserSelectMenu() {
+        return false;
+    }
+    isStringSelectMenu() {
+        return false;
+    }
 }
 exports.BaseContext = BaseContext;

package/lib/commands/handler.d.ts

@@ -1,3 +1,4 @@
+import { type APIApplicationCommandOption } from 'discord-api-types/v10';
 import type { Logger } from '../common';
 import { BaseHandler } from '../common';
 import { Command, SubCommand } from './applications/chat';
@@ -11,7 +12,11 @@ export declare class CommandHandler extends BaseHandler {
     constructor(logger: Logger, client: UsingClient);
     reload(resolve: string | Command): Promise<void>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
-    load(commandsDir: string, client: UsingClient): Promise<(Command | ContextMenuCommand)[]>;
+    protected shouldUploadOption(option: APIApplicationCommandOption, cached: APIApplicationCommandOption): boolean | undefined;
+    shouldUpload(file: string): Promise<boolean>;
+    load(commandsDir: string, client: UsingClient, instances?: {
+        new (): Command | ContextMenuCommand;
+    }[]): Promise<(Command | ContextMenuCommand)[]>;
     private __parseCommandLocales;
     setHandlers({ onCommand, onSubCommand, }: {
         onCommand?: CommandHandler['onCommand'];