seyfert 2.1.1-dev-11537652481.0 → 2.1.1-dev-11635725680.0

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/common/it/formatter.d.ts

@@ -1,3 +1,22 @@
+import type { BitFieldResolvable } from '../../structures/extra/BitField';
+import type { OAuth2Scopes, PermissionFlagsBits } from '../../types';
+/**
+ * Represents options for creating a OAuth2 uri
+ */
+export type OAuth2URLOptions = {
+    /**
+     * Oauth2 scopes to be used.
+     */
+    scopes: OAuth2Scopes[];
+    /**
+     * Permissions to be granted to the application.
+     */
+    permissions: BitFieldResolvable<typeof PermissionFlagsBits>;
+    /**
+     * Whether guild select must be disabled in oauth2 interface.
+     */
+    disableGuildSelect?: boolean;
+};
 /**
  * Represents heading levels.
  */
@@ -183,5 +202,14 @@ export declare const Formatter: {
      * @returns The formatted channel link.
      */
     channelLink(channelId: string, guildId?: string): string;
+    /**
+     * Forms a oauth2 invite link for the bot.
+     * @param applicationId The ID of the application.
+     * @param options Options for forming the invite link.
+     * @param options.scopes Oauth2 scopes to be used.
+     * @param options.disableGuildSelect Whether or not guild select must be disabled in oauth2 interface.
+     * @param options.permissions Permissions to be granted to the application.
+     */
+    generateOAuth2URL(applicationId: string, { scopes, permissions, disableGuildSelect }: OAuth2URLOptions): string;
 };
 export {};

package/lib/common/it/formatter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Formatter = exports.TimestampStyle = exports.HeadingLevel = void 0;
+const Permissions_1 = require("../../structures/extra/Permissions");
 /**
  * Represents heading levels.
  */
@@ -222,4 +223,24 @@ exports.Formatter = {
     channelLink(channelId, guildId) {
         return `https://discord.com/channels/${guildId ?? '@me'}/${channelId}`;
     },
+    /**
+     * Forms a oauth2 invite link for the bot.
+     * @param applicationId The ID of the application.
+     * @param options Options for forming the invite link.
+     * @param options.scopes Oauth2 scopes to be used.
+     * @param options.disableGuildSelect Whether or not guild select must be disabled in oauth2 interface.
+     * @param options.permissions Permissions to be granted to the application.
+     */
+    generateOAuth2URL(applicationId, { scopes, permissions, disableGuildSelect = false }) {
+        const queryOptions = new URLSearchParams({
+            client_id: applicationId,
+            scope: scopes.join(' '),
+            disable_guild_select: String(disableGuildSelect),
+        });
+        if (permissions) {
+            permissions = Permissions_1.PermissionsBitField.resolve(permissions);
+            queryOptions.set('permissions', permissions.toString());
+        }
+        return `https://discord.com/oauth2/authorize?${queryOptions.toString()}`;
+    },
 };

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;

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-11537652481.0",
+	"version": "2.1.1-dev-11635725680.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",