seyfert 2.1.1-dev-11535421049.0 → 2.1.1-dev-11566750568.0

package/lib/builders/SelectMenu.d.ts

@@ -1,5 +1,5 @@
-import type { EmojiResolvable, RestOrArray, ToClass } from '../common';
-import type { ChannelSelectMenuInteraction, ComponentInteraction, MentionableSelectMenuInteraction, RoleSelectMenuInteraction, StringSelectMenuInteraction, UserSelectMenuInteraction } from '../structures';
+import type { EmojiResolvable, RestOrArray } from '../common';
+import type { ChannelSelectMenuInteraction, ComponentInteraction, MentionableSelectMenuInteraction, RoleSelectMenuInteraction, UserSelectMenuInteraction } from '../structures';
 import { type APIChannelSelectComponent, type APIMentionableSelectComponent, type APIRoleSelectComponent, type APISelectMenuComponent, type APISelectMenuOption, type APIStringSelectComponent, type APIUserSelectComponent, type ChannelType, SelectMenuDefaultValueType } from '../types';
 import { BaseComponentBuilder, type OptionValuesLength } from './Base';
 export type BuilderSelectMenus = RoleSelectMenu | UserSelectMenu | MentionableSelectMenu | ChannelSelectMenu | StringSelectMenu;
@@ -11,9 +11,6 @@ export type BuilderSelectMenus = RoleSelectMenu | UserSelectMenu | MentionableSe
  * const selectMenu = new SelectMenu<APIUserSelectComponent, UserSelectMenuInteraction>();
  * selectMenu.setCustomId("user-select-menu");
  * selectMenu.setPlaceholder("Select a user");
- * selectMenu.run((interaction) => {
- *   // Handle select menu interaction
- * });
  */
 export declare class SelectMenu<Select extends APISelectMenuComponent = APISelectMenuComponent, Interaction = ComponentInteraction> extends BaseComponentBuilder<Select> {
     /**
@@ -139,7 +136,6 @@ export declare class ChannelSelectMenu extends SelectMenu<APIChannelSelectCompon
      */
     setChannelTypes(types: ChannelType[]): this;
 }
-declare const StringSelectMenu_base: ToClass<Omit<SelectMenu<APIStringSelectComponent, StringSelectMenuInteraction<string[]>>, "data" | "toJSON">, StringSelectMenu>;
 /**
  * Represents a Select Menu for selecting string options.
  * @example
@@ -151,7 +147,7 @@ declare const StringSelectMenu_base: ToClass<Omit<SelectMenu<APIStringSelectComp
  *   { label: "Option 3", value: "option_3" },
  * ]);
  */
-export declare class StringSelectMenu extends StringSelectMenu_base {
+export declare class StringSelectMenu extends SelectMenu {
     data: Omit<APIStringSelectComponent, 'options'> & {
         options: StringSelectOption[];
     };
@@ -214,4 +210,3 @@ export declare class StringSelectOption {
      */
     toJSON(): APISelectMenuOption;
 }
-export {};

package/lib/builders/SelectMenu.js

@@ -22,9 +22,6 @@ function mappedDefault(ids, type) {
  * const selectMenu = new SelectMenu<APIUserSelectComponent, UserSelectMenuInteraction>();
  * selectMenu.setCustomId("user-select-menu");
  * selectMenu.setPlaceholder("Select a user");
- * selectMenu.run((interaction) => {
- *   // Handle select menu interaction
- * });
  */
 class SelectMenu extends Base_1.BaseComponentBuilder {
     /**
@@ -219,7 +216,7 @@ exports.ChannelSelectMenu = ChannelSelectMenu;
 class StringSelectMenu extends SelectMenu {
     constructor(data = {}) {
         super({ ...data, type: types_1.ComponentType.StringSelect });
-        this.data.options = (data.options ?? []).map(x => new StringSelectOption(x));
+        this.data.options = data.options?.map(x => new StringSelectOption(x)) ?? [];
     }
     /**
      * Adds options to the string select menu.
@@ -243,7 +240,7 @@ class StringSelectMenu extends SelectMenu {
         const { options, ...raw } = this.data;
         return {
             ...raw,
-            options: this.data.options.map(x => x.toJSON()),
+            options: options.map(x => x.toJSON()),
         };
     }
 }

package/lib/client/base.js

@@ -299,10 +299,13 @@ class BaseClient {
         };
         for (const i in locations) {
             const key = i;
-            const location = locations[i];
-            if (!location || locationsFullPaths[key])
+            const location = locations[key];
+            if (key in locationsFullPaths)
                 continue;
-            locationsFullPaths[key] = (0, node_path_1.join)(process.cwd(), locations.output, location);
+            if (typeof location === 'string')
+                locationsFullPaths[key] = (0, node_path_1.join)(process.cwd(), locations.output, location);
+            else
+                locationsFullPaths[key] = location;
         }
         const obj = {
             debug: !!debug,

package/lib/commands/handle.d.ts

@@ -16,6 +16,7 @@ export declare class HandleCommand {
     client: UsingClient;
     constructor(client: UsingClient);
     autocomplete(interaction: AutocompleteInteraction, optionsResolver: OptionResolverStructure, command?: CommandAutocompleteOption): Promise<void>;
+    contextMenu(command: ContextMenuCommand, interaction: MessageCommandInteraction | UserCommandInteraction, context: MenuCommandContext<MessageCommandInteraction | UserCommandInteraction>): Promise<any>;
     contextMenuMessage(command: ContextMenuCommand, interaction: MessageCommandInteraction, context: MenuCommandContext<MessageCommandInteraction>): Promise<any>;
     contextMenuUser(command: ContextMenuCommand, interaction: UserCommandInteraction, context: MenuCommandContext<UserCommandInteraction>): Promise<any>;
     entryPoint(command: EntryPointCommand, interaction: EntryPointInteraction, context: EntryPointContext): Promise<any>;

package/lib/commands/handle.js

@@ -36,12 +36,8 @@ class HandleCommand {
             // pass
         }
     }
-    async contextMenuMessage(command, interaction, context) {
-        // @ts-expect-error
-        return this.contextMenuUser(command, interaction, context);
-    }
-    async contextMenuUser(command, interaction, context) {
-        if (context.guildId && command.botPermissions && interaction.appPermissions) {
+    async contextMenu(command, interaction, context) {
+        if (context.guildId && command.botPermissions) {
             const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
             if (permissions)
                 return command.onBotPermissionsFail(context, permissions);
@@ -71,8 +67,14 @@ class HandleCommand {
             }
         }
     }
+    contextMenuMessage(command, interaction, context) {
+        return this.contextMenu(command, interaction, context);
+    }
+    contextMenuUser(command, interaction, context) {
+        return this.contextMenu(command, interaction, context);
+    }
     async entryPoint(command, interaction, context) {
-        if (context.guildId && command.botPermissions && interaction.appPermissions) {
+        if (context.guildId && command.botPermissions) {
             const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
             if (permissions)
                 return command.onBotPermissionsFail(context, permissions);
@@ -103,7 +105,7 @@ class HandleCommand {
         }
     }
     async chatInput(command, interaction, resolver, context) {
-        if (context.guildId && interaction.appPermissions) {
+        if (context.guildId) {
             if (command.botPermissions) {
                 const permissions = this.checkPermissions(interaction.appPermissions, command.botPermissions);
                 if (permissions)
@@ -172,17 +174,14 @@ class HandleCommand {
                         const data = this.makeMenuCommand(body, shardId, __reply);
                         if (!data)
                             return;
-                        this.contextMenuMessage(data.command, 
-                        // @ts-expect-error
-                        data.interaction, data.context);
+                        await this.contextMenuMessage(data.command, data.interaction, data.context);
                         break;
                     }
                     case types_1.ApplicationCommandType.User: {
                         const data = this.makeMenuCommand(body, shardId, __reply);
                         if (!data)
                             return;
-                        // @ts-expect-error
-                        this.contextMenuUser(data.command, data.interaction, data.context);
+                        await this.contextMenuUser(data.command, data.interaction, data.context);
                         break;
                     }
                     case types_1.ApplicationCommandType.PrimaryEntryPoint: {
@@ -199,10 +198,10 @@ class HandleCommand {
                     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);
-                        const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
                         const command = optionsResolver.getCommand();
                         if (!command?.run)
                             return this.client.logger.warn(`${optionsResolver.fullCommandName} command does not have 'run' callback`);
+                        const interaction = structures_1.BaseInteraction.from(this.client, body, __reply);
                         const context = new _1.CommandContext(this.client, interaction, optionsResolver, shardId, command);
                         const extendContext = this.client.options?.context?.(interaction) ?? {};
                         Object.assign(context, extendContext);

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

@@ -1,4 +1,4 @@
 import type { UsingClient } from '../../commands';
 import { BaseInteraction } from '../../structures';
 import type { GatewayInteractionCreateDispatchData } from '../../types';
-export declare const INTERACTION_CREATE: (self: UsingClient, data: GatewayInteractionCreateDispatchData) => import("../../structures").RoleSelectMenuInteraction | import("../../structures").UserSelectMenuInteraction | import("../../structures").MentionableSelectMenuInteraction | import("../../structures").ChannelSelectMenuInteraction | import("../../structures").StringSelectMenuInteraction<string[]> | import("../../structures").ChatInputCommandInteraction<boolean> | import("../../structures").UserCommandInteraction<boolean> | import("../../structures").MessageCommandInteraction<boolean> | import("../../structures").ButtonInteraction | import("../../structures").ModalSubmitInteraction<boolean> | import("../../structures").AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../../types").APIPingInteraction>;
+export declare const INTERACTION_CREATE: (self: UsingClient, data: GatewayInteractionCreateDispatchData) => import("../../structures").RoleSelectMenuInteraction | import("../../structures").UserSelectMenuInteraction | import("../../structures").MentionableSelectMenuInteraction | import("../../structures").ChannelSelectMenuInteraction | import("../../structures").ChatInputCommandInteraction<boolean> | import("../../structures").UserCommandInteraction<boolean> | import("../../structures").MessageCommandInteraction<boolean> | import("../../structures").ButtonInteraction | import("../../structures").StringSelectMenuInteraction<string[]> | import("../../structures").ModalSubmitInteraction<boolean> | import("../../structures").AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../../types").APIPingInteraction>;

package/lib/structures/Interaction.d.ts

@@ -29,7 +29,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     channel?: AllChannels;
     message?: MessageStructure;
     replied?: Promise<boolean | RESTPostAPIInteractionCallbackResult | undefined> | boolean;
-    appPermissions?: PermissionsBitField;
+    appPermissions: PermissionsBitField;
     entitlements: EntitlementStructure[];
     constructor(client: UsingClient, interaction: Type, __reply?: __InternalReplyFunction | undefined);
     static transformBodyRequest(body: ReplyInteractionBody, files: RawFile[] | undefined, self: UsingClient): APIInteractionResponse;
@@ -49,7 +49,7 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     isAutocomplete(): this is AutocompleteInteraction;
     isModal(): this is ModalSubmitInteraction;
     isEntryPoint(): this is EntryPointInteraction;
-    static from(client: UsingClient, gateway: GatewayInteractionCreateDispatchData, __reply?: __InternalReplyFunction): RoleSelectMenuInteraction | UserSelectMenuInteraction | MentionableSelectMenuInteraction | ChannelSelectMenuInteraction | StringSelectMenuInteraction<string[]> | ChatInputCommandInteraction<boolean> | UserCommandInteraction<boolean> | MessageCommandInteraction<boolean> | ButtonInteraction | ModalSubmitInteraction<boolean> | AutocompleteInteraction<boolean> | BaseInteraction<boolean, import("../types").APIPingInteraction>;
+    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;
 }
 export type AllInteractions = AutocompleteInteraction | ChatInputCommandInteraction | UserCommandInteraction | MessageCommandInteraction | ComponentInteraction | SelectMenuInteraction | ModalSubmitInteraction | EntryPointInteraction | BaseInteraction;

package/lib/structures/Interaction.js

@@ -35,9 +35,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
         if (interaction.message) {
             this.message = transformers_1.Transformers.Message(client, interaction.message);
         }
-        if (interaction.app_permissions) {
-            this.appPermissions = new Permissions_1.PermissionsBitField(Number(interaction.app_permissions));
-        }
+        this.appPermissions = new Permissions_1.PermissionsBitField(Number(interaction.app_permissions));
         if (interaction.channel) {
             this.channel = (0, _1.channelFrom)(interaction.channel, client);
         }

package/package.json

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