seyfert 2.0.0 → 2.1.1-dev-11310514874.0

package/lib/commands/handle.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleCommand = void 0;
-const types_1 = require("../types");
 const _1 = require(".");
-const structures_1 = require("../structures");
-const components_1 = require("../components");
 const transformers_1 = require("../client/transformers");
+const components_1 = require("../components");
+const structures_1 = require("../structures");
+const types_1 = require("../types");
 class HandleCommand {
     client;
     constructor(client) {
@@ -40,7 +40,7 @@ class HandleCommand {
         return this.contextMenuUser(command, interaction, context);
     }
     async contextMenuUser(command, interaction, context) {
-        if (command.botPermissions && interaction.appPermissions) {
+        if (context.guildId && command.botPermissions && interaction.appPermissions) {
             const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
             if (permissions)
                 return command.onBotPermissionsFail(context, permissions);
@@ -70,11 +70,49 @@ class HandleCommand {
             }
         }
     }
-    async chatInput(command, interaction, resolver, context) {
-        if (command.botPermissions && interaction.appPermissions) {
+    async entryPoint(command, interaction, context) {
+        if (context.guildId && command.botPermissions && interaction.appPermissions) {
             const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
             if (permissions)
-                return command.onBotPermissionsFail?.(context, permissions);
+                return command.onBotPermissionsFail(context, permissions);
+        }
+        const resultGlobal = await this.runGlobalMiddlewares(command, context);
+        if (typeof resultGlobal === 'boolean')
+            return;
+        const resultMiddle = await this.runMiddlewares(command, context);
+        if (typeof resultMiddle === 'boolean')
+            return;
+        try {
+            try {
+                await command.run(context);
+                await command.onAfterRun?.(context, undefined);
+            }
+            catch (error) {
+                await command.onRunError(context, error);
+                await command.onAfterRun?.(context, error);
+            }
+        }
+        catch (error) {
+            try {
+                await command.onInternalError(this.client, command, error);
+            }
+            catch {
+                // pass
+            }
+        }
+    }
+    async chatInput(command, interaction, resolver, context) {
+        if (context.guildId && interaction.appPermissions) {
+            if (command.botPermissions) {
+                const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
+                if (permissions)
+                    return command.onBotPermissionsFail?.(context, permissions);
+            }
+            if (command.defaultMemberPermissions) {
+                const permissions = this.checkPermissions(interaction.member.permissions, command.defaultMemberPermissions);
+                if (permissions)
+                    return command.onPermissionsFail?.(context, permissions);
+            }
         }
         if (!(await this.runOptions(command, context, resolver)))
             return;
@@ -133,8 +171,9 @@ class HandleCommand {
                         const data = this.makeMenuCommand(body, shardId, __reply);
                         if (!data)
                             return;
+                        this.contextMenuMessage(data.command, 
                         // @ts-expect-error
-                        this.contextMenuMessage(data.command, data.interaction, data.context);
+                        data.interaction, data.context);
                         break;
                     }
                     case types_1.ApplicationCommandType.User: {
@@ -145,6 +184,17 @@ class HandleCommand {
                         this.contextMenuUser(data.command, data.interaction, data.context);
                         break;
                     }
+                    case types_1.ApplicationCommandType.PrimaryEntryPoint: {
+                        const command = this.client.commands?.entryPoint;
+                        if (!command?.run)
+                            return;
+                        const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
+                        const context = new _1.EntryPointContext(this.client, interaction, shardId, command);
+                        const extendContext = this.client.options?.context?.(interaction) ?? {};
+                        Object.assign(context, extendContext);
+                        await this.entryPoint(command, interaction, context);
+                        break;
+                    }
                     case types_1.ApplicationCommandType.ChatInput: {
                         const parentCommand = this.getCommand(body.data);
                         const optionsResolver = this.makeResolver(this.client, body.data.options ?? [], parentCommand, body.guild_id, body.data.resolved);
@@ -243,7 +293,7 @@ class HandleCommand {
                 if (command.botPermissions) {
                     const appPermissions = await self.members.permissions(rawMessage.guild_id, self.botId);
                     const permissions = this.checkPermissions(appPermissions, command.botPermissions);
-                    if (!appPermissions.has('Administrator') && permissions) {
+                    if (permissions) {
                         return command.onBotPermissionsFail?.(context, permissions);
                     }
                 }
@@ -269,7 +319,9 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, error);
             }
-            catch { }
+            catch {
+                // http 418
+            }
         }
     }
     argsParser(content, _command, _message) {
@@ -345,34 +397,36 @@ class HandleCommand {
         });
     }
     checkPermissions(app, bot) {
+        if (app.has('Administrator'))
+            return;
         const permissions = app.missings(...app.values([bot]));
-        if (!app.has('Administrator') && permissions.length) {
+        if (permissions.length) {
             return app.keys(permissions);
         }
         return;
     }
-    async fetchChannel(_option, query) {
+    fetchChannel(_option, query) {
         const id = query.match(/[0-9]{17,19}/g)?.[0];
         if (id)
             return this.client.channels.raw(id);
         return null;
     }
-    async fetchUser(_option, query) {
+    fetchUser(_option, query) {
         const id = query.match(/[0-9]{17,19}/g)?.[0];
         if (id)
             return this.client.users.raw(id);
         return null;
     }
-    async fetchMember(_option, query, guildId) {
+    fetchMember(_option, query, guildId) {
         const id = query.match(/[0-9]{17,19}/g)?.[0];
         if (id)
             return this.client.members.raw(guildId, id);
         return null;
     }
-    async fetchRole(_option, query, guildId) {
+    fetchRole(_option, query, guildId) {
         const id = query.match(/[0-9]{17,19}/g)?.[0];
         if (id && guildId)
-            return (await this.client.roles.listRaw(guildId)).find(x => x.id === id);
+            return this.client.roles.raw(guildId, id);
         return null;
     }
     async runGlobalMiddlewares(command, context) {
@@ -391,7 +445,9 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, e);
             }
-            catch { }
+            catch {
+                // http 418
+            }
         }
         return false;
     }
@@ -411,7 +467,9 @@ class HandleCommand {
             try {
                 await command.onInternalError?.(this.client, command, e);
             }
-            catch { }
+            catch {
+                // http 418
+            }
         }
         return false;
     }
@@ -436,7 +494,9 @@ class HandleCommand {
                 try {
                     await command.onInternalError?.(this.client, command, e);
                 }
-                catch { }
+                catch {
+                    // http 418
+                }
             }
             return false;
         }
@@ -471,13 +531,14 @@ class HandleCommand {
                             if (channel) {
                                 if ('channel_types' in i) {
                                     if (!i.channel_types.includes(channel.type)) {
-                                        errors.push({
-                                            name: i.name,
-                                            error: `The entered channel type is not one of ${i
-                                                .channel_types.map(t => types_1.ChannelType[t])
-                                                .join(', ')}`,
-                                            fullError: ['CHANNEL_TYPES', i.channel_types],
-                                        });
+                                        if (i.required)
+                                            errors.push({
+                                                name: i.name,
+                                                error: `The entered channel type is not one of ${i
+                                                    .channel_types.map(t => types_1.ChannelType[t])
+                                                    .join(', ')}`,
+                                                fullError: ['CHANNEL_TYPES', i.channel_types],
+                                            });
                                         break;
                                     }
                                 }
@@ -559,22 +620,24 @@ class HandleCommand {
                             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.`,
-                                        fullError: ['STRING_MIN_LENGTH', option.min_length],
-                                    });
+                                    if (i.required)
+                                        errors.push({
+                                            name: i.name,
+                                            error: `The entered string has less than ${option.min_length} characters. The minimum required is ${option.min_length} characters.`,
+                                            fullError: ['STRING_MIN_LENGTH', option.min_length],
+                                        });
                                     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.`,
-                                        fullError: ['STRING_MAX_LENGTH', option.max_length],
-                                    });
+                                    if (i.required)
+                                        errors.push({
+                                            name: i.name,
+                                            error: `The entered string has more than ${option.max_length} characters. The maximum required is ${option.max_length} characters.`,
+                                            fullError: ['STRING_MAX_LENGTH', option.max_length],
+                                        });
                                     break;
                                 }
                             }
@@ -582,13 +645,14 @@ class HandleCommand {
                                 const choice = option.choices.find(x => x.name === value);
                                 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(', ')}.`,
-                                        fullError: ['STRING_INVALID_CHOICE', option.choices],
-                                    });
+                                    if (i.required)
+                                        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(', ')}.`,
+                                            fullError: ['STRING_INVALID_CHOICE', option.choices],
+                                        });
                                     break;
                                 }
                                 value = choice.value;
@@ -607,32 +671,35 @@ class HandleCommand {
                                 }
                                 if (Number.isNaN(value)) {
                                     value = undefined;
-                                    errors.push({
-                                        name: i.name,
-                                        error: 'The entered choice is an invalid number.',
-                                        fullError: ['NUMBER_NAN', args[i.name]],
-                                    });
+                                    if (i.required)
+                                        errors.push({
+                                            name: i.name,
+                                            error: 'The entered choice is an invalid number.',
+                                            fullError: ['NUMBER_NAN', args[i.name]],
+                                        });
                                     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}`,
-                                            fullError: ['NUMBER_MIN_VALUE', option.min_value],
-                                        });
+                                        if (i.required)
+                                            errors.push({
+                                                name: i.name,
+                                                error: `The entered number is less than ${option.min_value}. The minimum allowed is ${option.min_value}`,
+                                                fullError: ['NUMBER_MIN_VALUE', 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}`,
-                                            fullError: ['NUMBER_MAX_VALUE', option.max_value],
-                                        });
+                                        if (i.required)
+                                            errors.push({
+                                                name: i.name,
+                                                error: `The entered number is greater than ${option.max_value}. The maximum allowed is ${option.max_value}`,
+                                                fullError: ['NUMBER_MAX_VALUE', option.max_value],
+                                            });
                                         break;
                                     }
                                 }
@@ -641,13 +708,14 @@ class HandleCommand {
                             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(', ')}.`,
-                                    fullError: ['NUMBER_INVALID_CHOICE', option.choices],
-                                });
+                                if (i.required)
+                                    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(', ')}.`,
+                                        fullError: ['NUMBER_INVALID_CHOICE', option.choices],
+                                    });
                                 break;
                             }
                             value = choice.value;

package/lib/commands/handler.d.ts

@@ -1,6 +1,7 @@
-import { type APIApplicationCommandOption, type LocalizationMap } from '../types';
+import type { EntryPointCommand } from '.';
 import type { Logger, MakeRequired, NulleableCoalising, OmitInsert } from '../common';
 import { BaseHandler } from '../common';
+import { type APIApplicationCommandOption, type LocalizationMap } from '../types';
 import { Command, type CommandOption, SubCommand } from './applications/chat';
 import { ContextMenuCommand } from './applications/menu';
 import type { UsingClient } from './applications/shared';
@@ -8,17 +9,18 @@ export declare class CommandHandler extends BaseHandler {
     protected logger: Logger;
     protected client: UsingClient;
     values: (Command | ContextMenuCommand)[];
-    protected filter: (path: string) => boolean;
+    entryPoint: EntryPointCommand | null;
+    filter: (path: string) => boolean;
     constructor(logger: Logger, client: UsingClient);
     reload(resolve: string | Command): Promise<void>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
     protected shouldUploadLocales(locales?: LocalizationMap | null, cachedLocales?: LocalizationMap | null): boolean;
-    protected shouldUploadOption(option: APIApplicationCommandOption, cached: APIApplicationCommandOption): boolean | undefined;
+    protected shouldUploadOption(option: APIApplicationCommandOption, cached: APIApplicationCommandOption): boolean;
     shouldUpload(file: string, guildId?: string): Promise<boolean>;
     set(commands: SeteableCommand[]): void;
     load(commandsDir: string, client: UsingClient): Promise<(Command | ContextMenuCommand)[]>;
-    parseLocales(command: Command | SubCommand | ContextMenuCommand): Command | ContextMenuCommand | SubCommand;
-    parseGlobalLocales(command: Command | SubCommand | ContextMenuCommand): void;
+    parseLocales(command: InstanceType<HandleableCommand>): Command | ContextMenuCommand | SubCommand | EntryPointCommand;
+    parseGlobalLocales(command: InstanceType<HandleableCommand>): void;
     parseCommandOptionLocales(option: MakeRequired<CommandOption, 'locales'>): void;
     parseCommandLocales(command: Command): void;
     parseContextMenuLocales(command: ContextMenuCommand): ContextMenuCommand;
@@ -29,12 +31,12 @@ export declare class CommandHandler extends BaseHandler {
     }> | false;
     stablishSubCommandDefaults(commandInstance: Command, option: SubCommand): SubCommand;
     onFile(file: FileLoaded): HandleableCommand[] | undefined;
-    onCommand(file: HandleableCommand): Command | SubCommand | ContextMenuCommand | false;
+    onCommand(file: HandleableCommand): InstanceType<HandleableCommand> | false;
     onSubCommand(file: HandleableSubCommand): SubCommand | false;
 }
 export type FileLoaded<T = null> = {
     default?: NulleableCoalising<T, HandleableCommand>;
 } & Record<string, NulleableCoalising<T, HandleableCommand>>;
-export type HandleableCommand = new () => Command | SubCommand | ContextMenuCommand;
+export type HandleableCommand = new () => Command | SubCommand | ContextMenuCommand | EntryPointCommand;
 export type SeteableCommand = new () => Extract<InstanceType<HandleableCommand>, SubCommand>;
 export type HandleableSubCommand = new () => SubCommand;

package/lib/commands/handler.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandHandler = void 0;
-const types_1 = require("../types");
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const common_1 = require("../common");
+const Permissions_1 = require("../structures/extra/Permissions");
+const types_1 = require("../types");
 const chat_1 = require("./applications/chat");
 const menu_1 = require("./applications/menu");
-const node_fs_1 = require("node:fs");
 class CommandHandler extends common_1.BaseHandler {
     logger;
     client;
     values = [];
+    entryPoint = null;
     filter = (path) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts'));
     constructor(logger, client) {
         super(logger);
@@ -88,22 +90,25 @@ class CommandHandler extends common_1.BaseHandler {
                         return option.channel_types.some(ct => !cached.channel_types.includes(ct));
                     }
                 }
-                return;
+                break;
             case types_1.ApplicationCommandOptionType.Subcommand:
             case types_1.ApplicationCommandOptionType.SubcommandGroup:
-                if (option.options?.length !==
-                    cached.options?.length) {
-                    return true;
-                }
-                if (option.options &&
-                    cached.options)
-                    for (const i of option.options) {
-                        const cachedOption = cached.options.find(x => x.name === i.name);
-                        if (!cachedOption)
-                            return true;
-                        if (this.shouldUploadOption(i, cachedOption))
-                            return true;
+                {
+                    if (option.options?.length !==
+                        cached.options
+                            ?.length) {
+                        return true;
                     }
+                    if (option.options &&
+                        cached.options)
+                        for (const i of option.options) {
+                            const cachedOption = cached.options.find(x => x.name === i.name);
+                            if (!cachedOption)
+                                return true;
+                            if (this.shouldUploadOption(i, cachedOption))
+                                return true;
+                        }
+                }
                 break;
             case types_1.ApplicationCommandOptionType.Integer:
             case types_1.ApplicationCommandOptionType.Number:
@@ -287,8 +292,12 @@ class CommandHandler extends common_1.BaseHandler {
                     }
                 }
                 this.stablishContextCommandDefaults(commandInstance);
-                this.values.push(commandInstance);
                 this.parseLocales(commandInstance);
+                if ('handler' in commandInstance && commandInstance.handler) {
+                    this.entryPoint = commandInstance;
+                }
+                else
+                    this.values.push(commandInstance);
             }
         }
         return this.values;
@@ -465,8 +474,8 @@ class CommandHandler extends common_1.BaseHandler {
             option.onPermissionsFail?.bind(option) ??
                 commandInstance.onPermissionsFail?.bind(commandInstance) ??
                 this.client.options.commands?.defaults?.onPermissionsFail;
-        option.botPermissions ??= commandInstance.botPermissions;
-        option.defaultMemberPermissions ??= commandInstance.defaultMemberPermissions;
+        option.botPermissions = new Permissions_1.PermissionsBitField().add(option.botPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.botPermissions);
+        option.defaultMemberPermissions ??= new Permissions_1.PermissionsBitField().add(option.defaultMemberPermissions ?? Permissions_1.PermissionsBitField.None, commandInstance.defaultMemberPermissions);
         option.contexts ??= commandInstance.contexts;
         option.integrationTypes ??= commandInstance.integrationTypes;
         option.props ??= commandInstance.props;

package/lib/commands/index.d.ts

@@ -4,5 +4,7 @@ export * from './applications/chatcontext';
 export * from './applications/menu';
 export * from './applications/menucontext';
 export * from './applications/options';
+export * from './applications/entryPoint';
+export * from './applications/entrycontext';
 export * from './decorators';
 export * from './optionresolver';

package/lib/commands/index.js

@@ -21,5 +21,7 @@ __exportStar(require("./applications/chatcontext"), exports);
 __exportStar(require("./applications/menu"), exports);
 __exportStar(require("./applications/menucontext"), exports);
 __exportStar(require("./applications/options"), exports);
+__exportStar(require("./applications/entryPoint"), exports);
+__exportStar(require("./applications/entrycontext"), exports);
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./optionresolver"), exports);

package/lib/commands/optionresolver.d.ts

@@ -1,10 +1,10 @@
-import { type APIApplicationCommandInteractionDataOption, type APIAttachment, type APIGuildMember, type APIInteractionDataResolvedChannel, type APIInteractionGuildMember, type APIRole, type APIUser, ApplicationCommandOptionType } from '../types';
+import { Attachment } from '../builders';
+import { type GuildMemberStructure, type GuildRoleStructure, type InteractionGuildMemberStructure, type UserStructure } from '../client/transformers';
 import type { MakeRequired } from '../common';
 import { type AllChannels } from '../structures';
+import { type APIApplicationCommandInteractionDataOption, type APIAttachment, type APIGuildMember, type APIInteractionDataResolvedChannel, type APIInteractionGuildMember, type APIRole, type APIUser, ApplicationCommandOptionType } from '../types';
 import type { Command, CommandAutocompleteOption, SubCommand } from './applications/chat';
 import type { UsingClient } from './applications/shared';
-import { type GuildMemberStructure, type GuildRoleStructure, type InteractionGuildMemberStructure, type UserStructure } from '../client/transformers';
-import { Attachment } from '../builders';
 export type ContextOptionsResolved = {
     members?: Record<string, APIGuildMember | Omit<APIGuildMember, 'user'> | APIInteractionGuildMember>;
     users?: Record<string, APIUser>;
@@ -31,7 +31,7 @@ export declare class OptionResolver {
     getGroup(): string | null;
     get(name: string): OptionResolved | undefined;
     getHoisted(name: string): OptionResolved | undefined;
-    getValue(name: string): string | number | boolean | import("../structures").GuildMember | import("../structures").User | import("../structures").BaseChannel<import("../types").ChannelType> | import("../structures").DMChannel | import("../structures").CategoryChannel | Attachment | import("../structures").InteractionGuildMember | import("../structures").GuildRole | undefined;
+    getValue(name: string): string | number | boolean | import("../structures").BaseChannel<import("../types").ChannelType> | import("../structures").DMChannel | import("../structures").CategoryChannel | import("../structures").User | import("../structures").GuildMember | import("../structures").InteractionGuildMember | import("../structures").GuildRole | Attachment | undefined;
     private getTypedOption;
     getChannel(name: string, required?: true): AllChannels;
     getString(name: string, required?: true): string;

package/lib/commands/optionresolver.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptionResolver = void 0;
-const types_1 = require("../types");
-const structures_1 = require("../structures");
-const transformers_1 = require("../client/transformers");
 const builders_1 = require("../builders");
+const transformers_1 = require("../client/transformers");
+const structures_1 = require("../structures");
+const types_1 = require("../types");
 class OptionResolver {
     client;
     parent;
@@ -43,7 +43,7 @@ class OptionResolver {
         return this.hoistedOptions.find(option => option.focused)?.value;
     }
     getAutocomplete() {
-        return (this.getCommand()?.options).find(option => option.name === this.hoistedOptions.find(x => x.focused)?.name);
+        return this.getCommand()?.options?.find(option => option.name === this.hoistedOptions.find(x => x.focused)?.name);
     }
     getParent() {
         return this.parent?.name;

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'> {
+export interface WatcherOptions extends MakePartial<Omit<ShardManager['options'], 'handlePayload' | 'info' | 'token' | 'intents'>, 'compress' | 'presence' | 'properties' | 'shardEnd' | 'shardStart' | 'spawnShardDelay' | 'totalShards' | 'url' | 'version' | 'resharding' | 'debug'> {
     filePath: string;
     transpileCommand: string;
     srcPath: string;