reciple 3.0.0 → 3.0.3

package/README.md

@@ -1,9 +1,15 @@
 <h1 align="center">
     <img src="https://i.imgur.com/DWM0tJL.png" width="50%">
     <br>
-    <img alt="Lines of code" src="https://img.shields.io/tokei/lines/github/FalloutStudios/Reciple">
-    <img alt="GitHub" src="https://img.shields.io/github/license/FalloutStudios/Reciple">
-    <a href="https://www.codefactor.io/repository/github/falloutstudios/reciple/overview/main"><img src="https://www.codefactor.io/repository/github/falloutstudios/reciple/badge/main" alt="CodeFactor"></a>
+    <a href="https://npmjs.org/package/reciple">
+        <img src="https://img.shields.io/npm/v/reciple?label=latest%20npm%20release%20">
+    </a>
+    <a href="https://github.com/FalloutStudios/Reciple/blob/main/LICENSE">
+        <img src="https://img.shields.io/github/license/FalloutStudios/Reciple">
+    </a>
+    <a href="https://www.codefactor.io/repository/github/falloutstudios/reciple/overview/main">
+        <img src="https://www.codefactor.io/repository/github/falloutstudios/reciple/badge/main">
+    </a>
 </h1>
 
 A simple Dicord.js command handler that just works.

package/bin/bin.js

@@ -11,12 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-const RecipleConfig_1 = require("./reciple/classes/RecipleConfig");
 const RecipleClient_1 = require("./reciple/classes/RecipleClient");
-const fs_1 = require("fs");
-const version_1 = require("./reciple/version");
+const RecipleConfig_1 = require("./reciple/classes/RecipleConfig");
 const flags_1 = require("./reciple/flags");
+const version_1 = require("./reciple/version");
 const fallout_utility_1 = require("fallout-utility");
+const fs_1 = require("fs");
 require("dotenv/config");
 if (flags_1.flags.version) {
     console.log(`v${version_1.version}`);

package/bin/index.d.ts

@@ -1,14 +1,15 @@
 export * from './reciple/classes/RecipleClient';
 export * from './reciple/classes/RecipleConfig';
+export * from './reciple/classes/CommandCooldownManager';
 export * from './reciple/classes/MessageCommandOptionManager';
 export * from './reciple/classes/builders/InteractionCommandBuilder';
 export * from './reciple/classes/builders/MessageCommandBuilder';
 export * from './reciple/classes/builders/MessageCommandOptionBuilder';
 export * from './reciple/types/builders';
 export * from './reciple/types/commands';
+export * from './reciple/types/paramOptions';
 export * from './reciple/permissions';
 export * from './reciple/flags';
-export * from './reciple/isIgnoredChannel';
 export * from './reciple/logger';
 export * from './reciple/modules';
 export * from './reciple/registerInteractionCommands';

package/bin/index.js

@@ -16,15 +16,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./reciple/classes/RecipleClient"), exports);
 __exportStar(require("./reciple/classes/RecipleConfig"), exports);
+__exportStar(require("./reciple/classes/CommandCooldownManager"), exports);
 __exportStar(require("./reciple/classes/MessageCommandOptionManager"), exports);
 __exportStar(require("./reciple/classes/builders/InteractionCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder"), exports);
 __exportStar(require("./reciple/types/builders"), exports);
 __exportStar(require("./reciple/types/commands"), exports);
+__exportStar(require("./reciple/types/paramOptions"), exports);
 __exportStar(require("./reciple/permissions"), exports);
 __exportStar(require("./reciple/flags"), exports);
-__exportStar(require("./reciple/isIgnoredChannel"), exports);
 __exportStar(require("./reciple/logger"), exports);
 __exportStar(require("./reciple/modules"), exports);
 __exportStar(require("./reciple/registerInteractionCommands"), exports);

package/bin/reciple/classes/RecipleClient.d.ts

@@ -1,13 +1,13 @@
+import { RecipleModule } from '../modules';
+import { InteractionBuilder } from '../registerInteractionCommands';
 import { RecipleCommandBuilders, RecipleCommandBuilderType } from '../types/builders';
+import { AddModuleOptions } from '../types/paramOptions';
 import { InteractionCommandBuilder, RecipleInteractionCommandExecuteData } from './builders/InteractionCommandBuilder';
 import { MessageCommandBuilder, RecipleMessageCommandExecuteData } from './builders/MessageCommandBuilder';
-import { InteractionBuilder } from '../registerInteractionCommands';
 import { CommandCooldownManager } from './CommandCooldownManager';
-import { Logger as ILogger } from 'fallout-utility';
-import { AddModuleOptions } from '../types/paramOptions';
-import { RecipleModule } from '../modules';
 import { Config } from './RecipleConfig';
 import { ApplicationCommandData, Awaitable, Client, ClientEvents, ClientOptions, CommandInteraction, Interaction, Message } from 'discord.js';
+import { Logger as ILogger } from 'fallout-utility';
 export interface RecipleClientOptions extends ClientOptions {
     config?: Config;
 }

package/bin/reciple/classes/RecipleClient.js

@@ -1,5 +1,4 @@
 "use strict";
-// Not cool code
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -11,19 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
-const builders_1 = require("../types/builders");
-const registerInteractionCommands_1 = require("../registerInteractionCommands");
+// Not cool code
+const logger_1 = require("../logger");
+const modules_1 = require("../modules");
 const permissions_1 = require("../permissions");
+const registerInteractionCommands_1 = require("../registerInteractionCommands");
+const builders_1 = require("../types/builders");
+const commands_1 = require("../types/commands");
+const version_1 = require("../version");
 const CommandCooldownManager_1 = require("./CommandCooldownManager");
 const MessageCommandOptionManager_1 = require("./MessageCommandOptionManager");
-const fallout_utility_1 = require("fallout-utility");
-const commands_1 = require("../types/commands");
-const modules_1 = require("../modules");
 const RecipleConfig_1 = require("./RecipleConfig");
-const isIgnoredChannel_1 = require("../isIgnoredChannel");
-const version_1 = require("../version");
-const logger_1 = require("../logger");
 const discord_js_1 = require("discord.js");
+const fallout_utility_1 = require("fallout-utility");
 class RecipleClient extends discord_js_1.Client {
     constructor(options) {
         var _a, _b, _c;
@@ -176,7 +175,7 @@ class RecipleClient extends discord_js_1.Client {
                 if (!command.allowExecuteInDM && message.channel.type === discord_js_1.ChannelType.DM
                     || !command.allowExecuteByBots
                         && (message.author.bot || message.author.system)
-                    || (0, isIgnoredChannel_1.isIgnoredChannel)(message.channelId, this.config.ignoredChannels))
+                    || (0, permissions_1.isIgnoredChannel)(message.channelId, this.config.ignoredChannels))
                     return;
                 if (command.validateOptions) {
                     if (commandOptions.some(o => o.invalid)) {
@@ -237,7 +236,7 @@ class RecipleClient extends discord_js_1.Client {
     interactionCommandExecute(interaction) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!interaction || interaction.type !== discord_js_1.InteractionType.ApplicationCommand || !this.isReady())
+            if (!interaction || interaction.type !== discord_js_1.InteractionType.ApplicationCommand || !interaction.isChatInputCommand() || !this.isReady())
                 return;
             const command = this.findCommand(interaction.commandName, builders_1.RecipleCommandBuilderType.InteractionCommand);
             if (!command)
@@ -248,7 +247,7 @@ class RecipleClient extends discord_js_1.Client {
                 client: this
             };
             if ((0, permissions_1.userHasCommandPermissions)(command.name, (_a = interaction.memberPermissions) !== null && _a !== void 0 ? _a : undefined, this.config.commands.interactionCommand.permissions, command)) {
-                if (!command || (0, isIgnoredChannel_1.isIgnoredChannel)(interaction.channelId, this.config.ignoredChannels))
+                if (!command || (0, permissions_1.isIgnoredChannel)(interaction.channelId, this.config.ignoredChannels))
                     return;
                 if (interaction.guild && !(0, permissions_1.botHasExecutePermissions)(interaction.guild, command.requiredBotPermissions)) {
                     if (!command.halt || !(yield command.halt({ executeData, reason: commands_1.RecipleHaltedCommandReason.MissingBotPermissions }))) {

package/bin/reciple/classes/RecipleConfig.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleConfig = void 0;
-const fs_1 = require("fs");
+const flags_1 = require("../flags");
 const version_1 = require("../version");
 const fallout_utility_1 = require("fallout-utility");
-const flags_1 = require("../flags");
+const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
 class RecipleConfig {

package/bin/reciple/classes/builders/InteractionCommandBuilder.d.ts

@@ -1,10 +1,10 @@
-import { Awaitable, CommandInteraction, PermissionResolvable } from 'discord.js';
+import { RecipleCommandBuilderType } from '../../types/builders';
 import { RecipleHaltedCommandData } from '../../types/commands';
-import { SlashCommandBuilder } from '@discordjs/builders';
 import { RecipleClient } from '../RecipleClient';
-import { RecipleCommandBuilderType } from '../../types/builders';
+import { SlashCommandBuilder } from '@discordjs/builders';
+import { Awaitable, ChatInputCommandInteraction, PermissionResolvable } from 'discord.js';
 export interface RecipleInteractionCommandExecuteData {
-    interaction: CommandInteraction;
+    interaction: ChatInputCommandInteraction;
     builder: InteractionCommandBuilder;
     client: RecipleClient<true>;
 }
@@ -21,6 +21,10 @@ export declare class InteractionCommandBuilder extends SlashCommandBuilder {
      * - `0` means no cooldown
      */
     setCooldown(cooldown: number): InteractionCommandBuilder;
+    /**
+     * Set required bot permissions to execute the command
+     */
+    setRequiredBotPermissions(...permissions: PermissionResolvable[]): InteractionCommandBuilder;
     /**
      * Set required permissions to execute the command
      */

package/bin/reciple/classes/builders/InteractionCommandBuilder.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InteractionCommandBuilder = void 0;
-const builders_1 = require("@discordjs/builders");
-const builders_2 = require("../../types/builders");
-class InteractionCommandBuilder extends builders_1.SlashCommandBuilder {
+const builders_1 = require("../../types/builders");
+const builders_2 = require("@discordjs/builders");
+class InteractionCommandBuilder extends builders_2.SlashCommandBuilder {
     constructor() {
         super(...arguments);
-        this.builder = builders_2.RecipleCommandBuilderType.InteractionCommand;
+        this.builder = builders_1.RecipleCommandBuilderType.InteractionCommand;
         this.cooldown = 0;
         this.requiredBotPermissions = [];
         this.RequiredUserPermissions = [];
@@ -21,6 +21,13 @@ class InteractionCommandBuilder extends builders_1.SlashCommandBuilder {
         this.cooldown = cooldown;
         return this;
     }
+    /**
+     * Set required bot permissions to execute the command
+     */
+    setRequiredBotPermissions(...permissions) {
+        this.requiredBotPermissions = permissions;
+        return this;
+    }
     /**
      * Set required permissions to execute the command
      */

package/bin/reciple/classes/builders/MessageCommandBuilder.d.ts

@@ -1,10 +1,10 @@
-import { MessageCommandOptionBuilder } from './MessageCommandOptionBuilder';
+import { RecipleCommandBuilderType } from '../../types/builders';
+import { RecipleHaltedCommandData } from '../../types/commands';
 import { MessageCommandOptionManager } from '../MessageCommandOptionManager';
+import { RecipleClient } from '../RecipleClient';
+import { MessageCommandOptionBuilder } from './MessageCommandOptionBuilder';
 import { Awaitable, Message, PermissionResolvable } from 'discord.js';
-import { RecipleHaltedCommandData } from '../../types/commands';
 import { Command as CommandMessage } from 'fallout-utility';
-import { RecipleClient } from '../RecipleClient';
-import { RecipleCommandBuilderType } from '../../types/builders';
 export interface RecipleMessageCommandExecuteData {
     message: Message;
     options: MessageCommandOptionManager;
@@ -51,7 +51,7 @@ export declare class MessageCommandBuilder {
      */
     addAliases(...aliases: string[]): MessageCommandBuilder;
     /**
-     * Set required per
+     * Set required bot permissions to execute the command
      */
     setRequiredBotPermissions(...permissions: PermissionResolvable[]): MessageCommandBuilder;
     /**

package/bin/reciple/classes/builders/MessageCommandBuilder.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageCommandBuilder = void 0;
-const MessageCommandOptionBuilder_1 = require("./MessageCommandOptionBuilder");
 const builders_1 = require("../../types/builders");
+const MessageCommandOptionBuilder_1 = require("./MessageCommandOptionBuilder");
 class MessageCommandBuilder {
     constructor() {
         this.builder = builders_1.RecipleCommandBuilderType.MessageCommand;
@@ -58,7 +58,7 @@ class MessageCommandBuilder {
         return this;
     }
     /**
-     * Set required per
+     * Set required bot permissions to execute the command
      */
     setRequiredBotPermissions(...permissions) {
         this.requiredBotPermissions = permissions;

package/bin/reciple/logger.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = void 0;
-const fallout_utility_1 = require("fallout-utility");
 const flags_1 = require("./flags");
 const chalk_1 = __importDefault(require("chalk"));
+const fallout_utility_1 = require("fallout-utility");
 /**
  * Create new logger
  */

package/bin/reciple/modules.d.ts

@@ -1,5 +1,5 @@
-import { RecipleCommandBuilders } from './types/builders';
 import { RecipleClient } from './classes/RecipleClient';
+import { RecipleCommandBuilders } from './types/builders';
 export declare type LoadedModules = {
     commands: RecipleCommandBuilders[];
     modules: RecipleModule[];

package/bin/reciple/modules.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadModules = void 0;
 const builders_1 = require("./types/builders");
-const fs_1 = require("fs");
 const version_1 = require("./version");
-const wildcard_match_1 = __importDefault(require("wildcard-match"));
+const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const wildcard_match_1 = __importDefault(require("wildcard-match"));
 /**
  * Load modules from folder
  */

package/bin/reciple/permissions.d.ts

@@ -1,8 +1,15 @@
-import { Guild, PermissionResolvable, PermissionsBitField } from 'discord.js';
-import { RecipleCommandBuilders } from './types/builders';
 import { Config } from './classes/RecipleConfig';
+import { RecipleCommandBuilders } from './types/builders';
+import { Guild, PermissionResolvable, PermissionsBitField } from 'discord.js';
 /**
  * Check if the user has permissions to execute the given command name
  */
 export declare function userHasCommandPermissions(commandName: string, memberPermissions?: PermissionsBitField, configConmmandPermissions?: Config['commands']['messageCommand']['permissions'] | Config['commands']['interactionCommand']['permissions'], builder?: RecipleCommandBuilders): boolean;
+/**
+ * Check if the bot has the required permissions in a guild
+ */
 export declare function botHasExecutePermissions(guild?: Guild, requiredPermissions?: PermissionResolvable[]): boolean;
+/**
+ * Check if the channel id is ignored in config file
+ */
+export declare function isIgnoredChannel(channelId: string, ignoredChannelsConfig?: Config["ignoredChannels"]): boolean;

package/bin/reciple/permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.botHasExecutePermissions = exports.userHasCommandPermissions = void 0;
+exports.isIgnoredChannel = exports.botHasExecutePermissions = exports.userHasCommandPermissions = void 0;
 /**
  * Check if the user has permissions to execute the given command name
  */
@@ -14,6 +14,9 @@ function userHasCommandPermissions(commandName, memberPermissions, configConmman
     return memberPermissions ? memberPermissions.has(command.permissions) : false;
 }
 exports.userHasCommandPermissions = userHasCommandPermissions;
+/**
+ * Check if the bot has the required permissions in a guild
+ */
 function botHasExecutePermissions(guild, requiredPermissions) {
     var _a;
     if (!(requiredPermissions === null || requiredPermissions === void 0 ? void 0 : requiredPermissions.length))
@@ -21,3 +24,16 @@ function botHasExecutePermissions(guild, requiredPermissions) {
     return (guild === null || guild === void 0 ? void 0 : guild.members.me) ? (_a = guild.members.me) === null || _a === void 0 ? void 0 : _a.permissions.has(requiredPermissions) : false;
 }
 exports.botHasExecutePermissions = botHasExecutePermissions;
+/**
+ * Check if the channel id is ignored in config file
+ */
+function isIgnoredChannel(channelId, ignoredChannelsConfig) {
+    if (!(ignoredChannelsConfig === null || ignoredChannelsConfig === void 0 ? void 0 : ignoredChannelsConfig.enabled))
+        return false;
+    if (ignoredChannelsConfig.channels.includes(channelId) && !ignoredChannelsConfig.convertToAllowList)
+        return true;
+    if (!ignoredChannelsConfig.channels.includes(channelId) && ignoredChannelsConfig.convertToAllowList)
+        return true;
+    return false;
+}
+exports.isIgnoredChannel = isIgnoredChannel;

package/bin/reciple/registerInteractionCommands.d.ts

@@ -1,6 +1,6 @@
 import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
-import { ContextMenuCommandBuilder, SlashCommandBuilder } from '@discordjs/builders';
 import { RegisterInteractionCommandsOptions } from './types/paramOptions';
+import { ContextMenuCommandBuilder, SlashCommandBuilder } from '@discordjs/builders';
 export declare type InteractionBuilder = ContextMenuCommandBuilder | InteractionCommandBuilder | SlashCommandBuilder;
 /**
  * Register interaction commands

package/bin/reciple/registerInteractionCommands.js

@@ -17,8 +17,8 @@ const InteractionCommandBuilder_1 = require("./classes/builders/InteractionComma
 function registerInteractionCommands(options) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        let { client, guilds } = options;
-        guilds = typeof guilds == 'string' ? [guilds] : guilds;
+        const client = options.client;
+        const guilds = typeof options.guilds == 'string' ? [options.guilds] : options.guilds;
         const commands = (_b = Object.values((_a = options.commands) !== null && _a !== void 0 ? _a : client.commands.interactionCommands).map(cmd => {
             var _a, _b;
             if (typeof (cmd === null || cmd === void 0 ? void 0 : cmd.toJSON) == 'undefined')

package/bin/reciple/types/commands.d.ts

@@ -1,7 +1,7 @@
 import { InteractionCommandBuilder, RecipleInteractionCommandExecuteData } from '../classes/builders/InteractionCommandBuilder';
 import { RecipleMessageCommandExecuteData } from '../classes/builders/MessageCommandBuilder';
-import { MessageCommandOptionManager } from '../classes/MessageCommandOptionManager';
 import { CooledDownUser } from '../classes/CommandCooldownManager';
+import { MessageCommandOptionManager } from '../classes/MessageCommandOptionManager';
 import { RecipleCommandBuilders } from '../types/builders';
 export declare type RecipleHaltedCommandData<Builder extends RecipleCommandBuilders> = CommandErrorData<Builder> | CommandCooldownData<Builder> | (Builder extends InteractionCommandBuilder ? never : CommandInvalidArguments<Builder> | CommandMissingArguments<Builder>) | CommandMissingMemberPermissions<Builder> | CommandMissingBotPermissions<Builder>;
 export interface CommandHaltBaseData<Builder extends RecipleCommandBuilders> {

package/bin/reciple/types/paramOptions.d.ts

@@ -1,6 +1,6 @@
-import { InteractionBuilder } from '../registerInteractionCommands';
-import { RecipleModule, RecipleScript } from '../modules';
 import { RecipleClient } from '../classes/RecipleClient';
+import { RecipleModule, RecipleScript } from '../modules';
+import { InteractionBuilder } from '../registerInteractionCommands';
 import { ApplicationCommandData } from 'discord.js';
 export interface AddModuleOptions {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "Handler for Discord.js",
   "author": "FalloutStudios",
   "homepage": "https://reciple.js.org",

package/bin/reciple/isIgnoredChannel.d.ts

@@ -1,5 +0,0 @@
-import { Config } from './classes/RecipleConfig';
-/**
- * Check if the channel id is ignored in config file
- */
-export declare function isIgnoredChannel(channelId: string, ignoredChannelsConfig?: Config["ignoredChannels"]): boolean;

package/bin/reciple/isIgnoredChannel.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIgnoredChannel = void 0;
-/**
- * Check if the channel id is ignored in config file
- */
-function isIgnoredChannel(channelId, ignoredChannelsConfig) {
-    if (!(ignoredChannelsConfig === null || ignoredChannelsConfig === void 0 ? void 0 : ignoredChannelsConfig.enabled))
-        return false;
-    if (ignoredChannelsConfig.channels.includes(channelId) && !ignoredChannelsConfig.convertToAllowList)
-        return true;
-    if (!ignoredChannelsConfig.channels.includes(channelId) && ignoredChannelsConfig.convertToAllowList)
-        return true;
-    return false;
-}
-exports.isIgnoredChannel = isIgnoredChannel;