necord 4.1.0 → 4.2.2

package/dist/context/index.d.ts

@@ -1,3 +1,4 @@
 export * from './necord-arguments-host';
 export * from './necord-execution-context';
+export * from './necord-info-type.enum';
 export * from './necord-params.factory';

package/dist/context/index.js

@@ -12,4 +12,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./necord-arguments-host"), exports);
 __exportStar(require("./necord-execution-context"), exports);
+__exportStar(require("./necord-info-type.enum"), exports);
 __exportStar(require("./necord-params.factory"), exports);

package/dist/context/necord-arguments-host.d.ts

@@ -4,10 +4,12 @@ import { NecordContextType } from './necord-execution-context';
 export interface INecordArgumentsHost extends ArgumentsHost {
     getContext<T = any>(): T;
     getOptions<T = any>(): T;
+    getInfo<T = any>(): T;
 }
 export declare class NecordArgumentsHost extends ExecutionContextHost implements INecordArgumentsHost {
     static create(context: ArgumentsHost): NecordArgumentsHost;
     getType<TContext extends string = NecordContextType>(): TContext;
     getContext<T = any>(): T;
     getOptions<T = any>(): T;
+    getInfo<T = any>(): T;
 }

package/dist/context/necord-arguments-host.js

@@ -18,5 +18,8 @@ class NecordArgumentsHost extends execution_context_host_1.ExecutionContextHost
     getOptions() {
         return this.getArgByIndex(1);
     }
+    getInfo() {
+        return this.getArgByIndex(2);
+    }
 }
 exports.NecordArgumentsHost = NecordArgumentsHost;

package/dist/context/necord-info-type.enum.d.ts

@@ -0,0 +1,7 @@
+export declare enum NecordInfoType {
+    LISTENER = 0,
+    SLASH_COMMANDS = 1,
+    CONTEXT_MENU = 2,
+    MESSAGE_COMPONENT = 3,
+    TEXT_COMMAND = 4
+}

package/dist/context/necord-info-type.enum.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NecordInfoType = void 0;
+var NecordInfoType;
+(function (NecordInfoType) {
+    NecordInfoType[NecordInfoType["LISTENER"] = 0] = "LISTENER";
+    NecordInfoType[NecordInfoType["SLASH_COMMANDS"] = 1] = "SLASH_COMMANDS";
+    NecordInfoType[NecordInfoType["CONTEXT_MENU"] = 2] = "CONTEXT_MENU";
+    NecordInfoType[NecordInfoType["MESSAGE_COMPONENT"] = 3] = "MESSAGE_COMPONENT";
+    NecordInfoType[NecordInfoType["TEXT_COMMAND"] = 4] = "TEXT_COMMAND";
+})(NecordInfoType = exports.NecordInfoType || (exports.NecordInfoType = {}));

package/dist/context/necord-params.factory.d.ts

@@ -2,7 +2,8 @@ import { ParamData } from '@nestjs/common';
 import { ParamsFactory } from '@nestjs/core/helpers/external-context-creator';
 export declare enum NecordParamType {
     CONTEXT = 0,
-    OPTIONS = 1
+    OPTIONS = 1,
+    INFO = 2
 }
 export declare class NecordParamsFactory implements ParamsFactory {
     exchangeKeyForValue(type: number, data: ParamData, args: unknown): any;

package/dist/context/necord-params.factory.js

@@ -5,6 +5,7 @@ var NecordParamType;
 (function (NecordParamType) {
     NecordParamType[NecordParamType["CONTEXT"] = 0] = "CONTEXT";
     NecordParamType[NecordParamType["OPTIONS"] = 1] = "OPTIONS";
+    NecordParamType[NecordParamType["INFO"] = 2] = "INFO";
 })(NecordParamType = exports.NecordParamType || (exports.NecordParamType = {}));
 class NecordParamsFactory {
     exchangeKeyForValue(type, data, args) {
@@ -14,7 +15,9 @@ class NecordParamsFactory {
             case NecordParamType.CONTEXT:
                 return args[0];
             case NecordParamType.OPTIONS:
-                return data ? args[1][data] : args[1];
+                return data && args[1] ? args[1][data] : args[1];
+            case NecordParamType.INFO:
+                return args[2];
             default:
                 return null;
         }

package/dist/decorators/autocomplete.decorator.d.ts

@@ -1,3 +1,3 @@
 import { Type } from '@nestjs/common';
 import { TransformOptions } from '../interfaces';
-export declare const Autocomplete: (autocomplete: Type<TransformOptions>) => MethodDecorator;
+export declare const Autocomplete: (...autocompletes: Type<TransformOptions>[]) => MethodDecorator;

package/dist/decorators/autocomplete.decorator.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Autocomplete = void 0;
 const common_1 = require("@nestjs/common");
 const necord_constants_1 = require("../necord.constants");
-const Autocomplete = (autocomplete) => (0, common_1.SetMetadata)(necord_constants_1.AUTOCOMPLETE_METADATA, autocomplete);
+const Autocomplete = (...autocompletes) => (0, common_1.SetMetadata)(necord_constants_1.AUTOCOMPLETE_METADATA, autocompletes);
 exports.Autocomplete = Autocomplete;

package/dist/decorators/guilds.decorator.d.ts

@@ -1,3 +1,2 @@
-import { ApplicationCommandPermissionData, Snowflake } from 'discord.js';
+import { Snowflake } from 'discord.js';
 export declare const Guilds: (guildIds: Snowflake[]) => ClassDecorator & MethodDecorator;
-export declare const Permissions: (permissions: ApplicationCommandPermissionData[]) => ClassDecorator & MethodDecorator;

package/dist/decorators/guilds.decorator.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Permissions = exports.Guilds = void 0;
+exports.Guilds = void 0;
 const common_1 = require("@nestjs/common");
 const necord_constants_1 = require("../necord.constants");
 const Guilds = (guildIds) => (0, common_1.SetMetadata)(necord_constants_1.GUILDS_METADATA, guildIds);
 exports.Guilds = Guilds;
-const Permissions = (permissions) => (0, common_1.SetMetadata)(necord_constants_1.PERMISSIONS_METADATA, permissions);
-exports.Permissions = Permissions;

package/dist/decorators/index.d.ts

@@ -5,3 +5,4 @@ export * from './guilds.decorator';
 export * from './listeners.decorator';
 export * from './options.decorator';
 export * from './params.decorator';
+export * from './permissions.decorator';

package/dist/decorators/index.js

@@ -17,3 +17,4 @@ __exportStar(require("./guilds.decorator"), exports);
 __exportStar(require("./listeners.decorator"), exports);
 __exportStar(require("./options.decorator"), exports);
 __exportStar(require("./params.decorator"), exports);
+__exportStar(require("./permissions.decorator"), exports);

package/dist/decorators/params.decorator.d.ts

@@ -1,4 +1,5 @@
 export declare const Context: (...pipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
 export declare const Options: (data?: any, ...pipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
+export declare const Info: (data?: any, ...pipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
 export declare const Ctx: (...pipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;
 export declare const Opts: (data?: any, ...pipes: (import("@nestjs/common").PipeTransform<any, any> | import("@nestjs/common").Type<import("@nestjs/common").PipeTransform<any, any>>)[]) => ParameterDecorator;

package/dist/decorators/params.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Opts = exports.Ctx = exports.Options = exports.Context = void 0;
+exports.Opts = exports.Ctx = exports.Info = exports.Options = exports.Context = void 0;
 const context_1 = require("../context");
 const necord_constants_1 = require("../necord.constants");
 const params_util_1 = require("./params.util");
@@ -12,5 +12,6 @@ exports.Options = (0, params_util_1.createNecordPipesParamDecorator)(context_1.N
         Reflect.defineMetadata(necord_constants_1.OPTIONS_METADATA, options, target[propertyKey]);
     }
 ]);
+exports.Info = (0, params_util_1.createNecordPipesParamDecorator)(context_1.NecordParamType.INFO);
 exports.Ctx = exports.Context;
 exports.Opts = exports.Options;

package/dist/decorators/permissions.decorator.d.ts

@@ -0,0 +1,6 @@
+import { ApplicationCommandPermissionData } from 'discord.js';
+export declare const Permissions: (...permissions: TypedPermissions<unknown>) => ClassDecorator & MethodDecorator;
+export declare const UserPermissions: (...permissions: TypedPermissions<string>) => ClassDecorator & MethodDecorator;
+export declare const RolePermissions: (...permissions: TypedPermissions<string>) => ClassDecorator & MethodDecorator;
+declare type TypedPermissions<T> = Omit<ApplicationCommandPermissionData, T extends string ? 'type' : never>[];
+export {};

package/dist/decorators/permissions.decorator.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RolePermissions = exports.UserPermissions = exports.Permissions = void 0;
+const necord_constants_1 = require("../necord.constants");
+exports.Permissions = createNecordPermissionsDecorator();
+exports.UserPermissions = createNecordPermissionsDecorator('USER');
+exports.RolePermissions = createNecordPermissionsDecorator('ROLE');
+function createNecordPermissionsDecorator(type) {
+    return (...permissions) => (target, propertyKey) => {
+        var _a, _b;
+        const metadataTarget = (_a = target[propertyKey]) !== null && _a !== void 0 ? _a : target;
+        const existing = (_b = Reflect.getMetadata(necord_constants_1.PERMISSIONS_METADATA, metadataTarget)) !== null && _b !== void 0 ? _b : [];
+        Reflect.defineMetadata(necord_constants_1.PERMISSIONS_METADATA, existing
+            .concat(permissions)
+            .map(permission => { var _a; return (Object.assign(Object.assign({}, permission), { type: (_a = permission.type) !== null && _a !== void 0 ? _a : type })); }), metadataTarget);
+    };
+}

package/dist/interfaces/necord-events.interface.d.ts

@@ -1,5 +1,9 @@
-import { ClientEvents, DMChannel, Guild, GuildFeatures, GuildMember, Message, NonThreadGuildBasedChannel, PartialMessage, PermissionOverwriteManager, Permissions, PremiumTier, PresenceStatus, Role, ThreadChannel, User, UserFlags, VoiceBasedChannel, VoiceChannel } from 'discord.js';
+import { ClientEvents, CommandInteraction, DMChannel, Guild, GuildFeatures, GuildMember, Message, MessageContextMenuInteraction, NonThreadGuildBasedChannel, PartialMessage, PermissionOverwriteManager, Permissions, PremiumTier, PresenceStatus, Role, ThreadChannel, User, UserContextMenuInteraction, UserFlags, VoiceBasedChannel, VoiceChannel } from 'discord.js';
 export interface NecordEvents extends ClientEvents {
+    textCommand: [Message];
+    slashCommand: [CommandInteraction];
+    messageContextCommand: [MessageContextMenuInteraction];
+    userContextCommand: [UserContextMenuInteraction];
     guildChannelPermissionsUpdate: [
         channel: DMChannel | NonThreadGuildBasedChannel,
         oldPermissions: PermissionOverwriteManager,

package/dist/necord-explorer.js

@@ -48,6 +48,10 @@ let NecordExplorer = class NecordExplorer {
                 {
                     key: necord_constants_1.GUILDS_METADATA,
                     fn: (key, targets) => this.reflector.getAllAndOverride(key, targets)
+                },
+                {
+                    key: necord_constants_1.PERMISSIONS_METADATA,
+                    fn: (key, targets) => this.reflector.getAllAndMerge(key, targets)
                 }
             ];
             for (const command of this.filterProperties(wrapper, metadataKey, optionalKeys)) {
@@ -61,7 +65,7 @@ let NecordExplorer = class NecordExplorer {
                     : subCommands.push(command);
             }
             if (commandGroup) {
-                commandGroup.metadata = this.extractOptionalMetadata([necord_constants_1.GUILDS_METADATA], wrapper.instance);
+                commandGroup.metadata = this.extractOptionalMetadata([necord_constants_1.GUILDS_METADATA, necord_constants_1.PERMISSIONS_METADATA], wrapper.instance);
                 commandGroup.options = [...subGroups.values(), ...subCommands];
             }
             return commands.concat(commandGroup);

package/dist/necord-interaction.update.js

@@ -28,7 +28,7 @@ const decorators_1 = require("./decorators");
 const necord_registry_1 = require("./necord-registry");
 const necord_constants_1 = require("./necord.constants");
 const core_1 = require("@nestjs/core");
-const constants_1 = require("@nestjs/core/injector/constants");
+const context_1 = require("./context");
 let NecordInteractionUpdate = NecordInteractionUpdate_1 = class NecordInteractionUpdate {
     constructor(registry, options) {
         this.registry = registry;
@@ -41,16 +41,41 @@ let NecordInteractionUpdate = NecordInteractionUpdate_1 = class NecordInteractio
             if (client.application.partial) {
                 yield client.application.fetch();
             }
-            const commands = new Map([[undefined, []]]);
+            const clientCommands = client.application.commands;
+            const commandsByGuildMap = new Map([[undefined, []]]);
             for (const command of this.registry.getApplicationCommands()) {
                 const guilds = (_a = command.metadata[necord_constants_1.GUILDS_METADATA]) !== null && _a !== void 0 ? _a : [].concat(this.options.development);
                 for (const guild of guilds) {
-                    const cmds = (_b = commands.get(guild)) !== null && _b !== void 0 ? _b : [];
-                    commands.set(guild, cmds.concat(command));
+                    const visitedCommands = (_b = commandsByGuildMap.get(guild)) !== null && _b !== void 0 ? _b : [];
+                    commandsByGuildMap.set(guild, visitedCommands.concat(command));
                 }
             }
             this.logger.log(`Started refreshing application commands.`);
-            yield Promise.all([...commands.entries()].map(([key, cmds]) => client.application.commands.set(cmds, key)));
+            for (const [guild, commands] of commandsByGuildMap.entries()) {
+                const registeredCommands = yield clientCommands.set(commands, guild);
+                const fullPermissions = commands.map(command => {
+                    var _a;
+                    const applicationCommand = registeredCommands.find(x => x.name === command.name);
+                    return {
+                        id: applicationCommand.id,
+                        permissions: (_a = command.metadata[necord_constants_1.PERMISSIONS_METADATA]) !== null && _a !== void 0 ? _a : []
+                    };
+                });
+                if (guild) {
+                    yield clientCommands.permissions.set({
+                        guild,
+                        fullPermissions
+                    });
+                    continue;
+                }
+                for (const perm of fullPermissions) {
+                    yield clientCommands.permissions.set({
+                        guild,
+                        command: perm.id,
+                        permissions: perm.permissions
+                    });
+                }
+            }
             this.logger.log(`Successfully reloaded application commands.`);
         });
     }
@@ -59,7 +84,7 @@ let NecordInteractionUpdate = NecordInteractionUpdate_1 = class NecordInteractio
         return __awaiter(this, void 0, void 0, function* () {
             if (interaction.isMessageComponent()) {
                 return (_a = this.registry
-                    .getMessageComponent(interaction.componentType, interaction.customId)) === null || _a === void 0 ? void 0 : _a.metadata.execute([interaction], interaction.isSelectMenu() ? interaction.values : undefined);
+                    .getMessageComponent(interaction.componentType, interaction.customId)) === null || _a === void 0 ? void 0 : _a.metadata.execute([interaction], interaction.isSelectMenu() ? interaction.values : undefined, { type: context_1.NecordInfoType.MESSAGE_COMPONENT });
             }
             if (interaction.isContextMenu()) {
                 const options = interaction.isUserContextMenu()
@@ -69,7 +94,9 @@ let NecordInteractionUpdate = NecordInteractionUpdate_1 = class NecordInteractio
                     }
                     : { message: interaction.options.getMessage('message', false) };
                 return (_b = this.registry
-                    .getContextMenu(interaction.targetType, interaction.commandName)) === null || _b === void 0 ? void 0 : _b.metadata.execute([interaction], options);
+                    .getContextMenu(interaction.targetType, interaction.commandName)) === null || _b === void 0 ? void 0 : _b.metadata.execute([interaction], options, {
+                    type: context_1.NecordInfoType.CONTEXT_MENU
+                });
             }
             if (interaction.isCommand() || interaction.isAutocomplete()) {
                 const rootCommand = interaction.commandName;
@@ -79,18 +106,32 @@ let NecordInteractionUpdate = NecordInteractionUpdate_1 = class NecordInteractio
                 if (!command)
                     return;
                 if (interaction.isCommand()) {
-                    return command === null || command === void 0 ? void 0 : command.metadata.execute([interaction], this.transformOptions(command, interaction));
+                    return command.metadata.execute([interaction], this.transformOptions(command, interaction), { type: context_1.NecordInfoType.SLASH_COMMANDS });
                 }
                 const module = command.metadata.host;
-                const autocompleteMetadata = command.metadata[necord_constants_1.AUTOCOMPLETE_METADATA];
+                const instances = command.metadata[necord_constants_1.AUTOCOMPLETE_METADATA];
                 const { instance: moduleRef } = module.getProviderByKey(core_1.ModuleRef);
-                if (!module || !autocompleteMetadata || !moduleRef)
+                if (!module || !instances || !moduleRef)
                     return;
-                const autocomplete = yield moduleRef
-                    .resolve(autocompleteMetadata, constants_1.STATIC_CONTEXT, { strict: true })
-                    .catch(() => moduleRef.create(autocompleteMetadata));
-                const options = yield (autocomplete === null || autocomplete === void 0 ? void 0 : autocomplete.transformOptions(interaction, interaction.options.getFocused(true)));
-                return interaction.respond(options !== null && options !== void 0 ? options : []);
+                const getAutocomplete = (instance) => __awaiter(this, void 0, void 0, function* () {
+                    const provider = module.getProviderByKey(instance);
+                    if (provider) {
+                        return provider.instance;
+                    }
+                    module.addProvider({
+                        provide: instance,
+                        useValue: yield moduleRef.create(instance)
+                    });
+                    return getAutocomplete(instance);
+                });
+                for (const instance of instances) {
+                    const autocomplete = yield getAutocomplete(instance);
+                    const options = yield (autocomplete === null || autocomplete === void 0 ? void 0 : autocomplete.transformOptions(interaction, interaction.options.getFocused(true)));
+                    if (!options || !Array.isArray(options))
+                        continue;
+                    return interaction.respond(options);
+                }
+                return interaction.respond([]);
             }
         });
     }

package/dist/necord-registry.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NecordRegistry = void 0;
 const discord_js_1 = require("discord.js");
 const common_1 = require("@nestjs/common");
+const context_1 = require("./context");
 let NecordRegistry = NecordRegistry_1 = class NecordRegistry {
     constructor(client) {
         this.client = client;
@@ -23,7 +24,7 @@ let NecordRegistry = NecordRegistry_1 = class NecordRegistry {
     }
     registerListeners(listeners) {
         listeners.forEach(listener => {
-            this.client[listener.type](listener.event, (...args) => listener.metadata.execute(args));
+            this.client[listener.type](listener.event, (...args) => listener.metadata.execute(args, null, { type: context_1.NecordInfoType.LISTENER }));
         });
     }
     addTextCommands(textCommands) {

package/dist/necord.update.js

@@ -27,6 +27,7 @@ const decorators_1 = require("./decorators");
 const discord_js_1 = require("discord.js");
 const necord_constants_1 = require("./necord.constants");
 const necord_registry_1 = require("./necord-registry");
+const context_1 = require("./context");
 let NecordUpdate = class NecordUpdate {
     constructor(options, client, registry) {
         var _a;
@@ -38,7 +39,7 @@ let NecordUpdate = class NecordUpdate {
     onMessageCreate([message]) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!message || !((_a = message.content) === null || _a === void 0 ? void 0 : _a.length))
+            if (!message || !((_a = message.content) === null || _a === void 0 ? void 0 : _a.length) || message.webhookId || message.author.bot)
                 return;
             const content = message.content.toLowerCase();
             const prefix = typeof this.prefix !== 'function' ? this.prefix : yield this.prefix(message);
@@ -48,7 +49,8 @@ let NecordUpdate = class NecordUpdate {
             const cmd = args.shift();
             if (!cmd)
                 return;
-            return (_b = this.registry.getTextCommand(cmd)) === null || _b === void 0 ? void 0 : _b.metadata.execute([message], args);
+            return (_b = this.registry
+                .getTextCommand(cmd)) === null || _b === void 0 ? void 0 : _b.metadata.execute([message], args, { type: context_1.NecordInfoType.TEXT_COMMAND });
         });
     }
     emit(event, ...args) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "necord",
 	"description": "A module for creating Discord bots using NestJS, based on Discord.js.",
-	"version": "4.1.0",
+	"version": "4.2.2",
 	"scripts": {
 		"build": "rimraf -rf dist && tsc -p tsconfig.json",
 		"prepublish:npm": "npm run build",
@@ -31,7 +31,7 @@
 		"bot framework"
 	],
 	"license": "MIT",
-	"homepage": "https://github.com/SocketSomeone/necord/wiki",
+	"homepage": "https://necord.org",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SocketSomeone/necord"
@@ -50,7 +50,7 @@
 		"@favware/npm-deprecate": "1.0.4",
 		"@nestjs/common": "8.2.6",
 		"@nestjs/core": "8.2.6",
-		"@types/node": "17.0.10",
+		"@types/node": "17.0.13",
 		"@typescript-eslint/eslint-plugin": "4.33.0",
 		"@typescript-eslint/parser": "4.33.0",
 		"discord.js": "13.6.0",
@@ -60,10 +60,10 @@
 		"husky": "7.0.4",
 		"prettier": "2.5.1",
 		"reflect-metadata": "0.1.13",
-		"release-it": "14.12.3",
+		"release-it": "14.12.4",
 		"rimraf": "3.0.2",
 		"rxjs": "7.5.2",
-		"ts-node": "^10.4.0",
+		"ts-node": "10.4.0",
 		"typescript": "4.5.5"
 	},
 	"peerDependencies": {