reciple 5.0.0-pre.2 → 5.0.0-pre.3

package/bin/bin.js

@@ -46,6 +46,9 @@ if (config.fileLogging.clientLogs)
         var _e;
         if (client.isClientLogsEnabled())
             client.logger.warn(`Logged in as ${((_e = client.user) === null || _e === void 0 ? void 0 : _e.tag) || 'Unknown'}!`);
+        client.on('cacheSweep', () => {
+            client.cooldowns.clean();
+        });
         yield client.loadModules();
         client.addCommandListeners();
     }));

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

@@ -53,7 +53,7 @@ export declare class RecipleClient<Ready extends boolean = boolean> extends Clie
     config: Config;
     commands: RecipleClientCommands;
     otherApplicationCommandData: (ApplicationCommandBuilder | ApplicationCommandData)[];
-    commandCooldowns: CommandCooldownManager;
+    cooldowns: CommandCooldownManager;
     modules: RecipleModule[];
     logger: ILogger;
     version: string;

package/bin/reciple/classes/RecipleClient.js

@@ -13,8 +13,8 @@ exports.RecipleClient = void 0;
 const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
 const SlashCommandBuilder_1 = require("./builders/SlashCommandBuilder");
 const registerApplicationCommands_1 = require("../registerApplicationCommands");
-const permissions_1 = require("../permissions");
 const builders_1 = require("../types/builders");
+const permissions_1 = require("../permissions");
 const CommandCooldownManager_1 = require("./CommandCooldownManager");
 const MessageCommandOptionManager_1 = require("./MessageCommandOptionManager");
 const commands_1 = require("../types/commands");
@@ -34,7 +34,7 @@ class RecipleClient extends discord_js_1.Client {
         this.config = RecipleConfig_1.RecipleConfig.getDefaultConfig();
         this.commands = { messageCommands: {}, slashCommands: {} };
         this.otherApplicationCommandData = [];
-        this.commandCooldowns = new CommandCooldownManager_1.CommandCooldownManager();
+        this.cooldowns = new CommandCooldownManager_1.CommandCooldownManager();
         this.modules = [];
         this.version = version_1.version;
         this.logger = (0, logger_1.createLogger)(!!((_a = options.config) === null || _a === void 0 ? void 0 : _a.fileLogging.stringifyLoggedJSON), (_b = options.config) === null || _b === void 0 ? void 0 : _b.fileLogging.debugmode);
@@ -185,10 +185,7 @@ class RecipleClient extends discord_js_1.Client {
                 memberPermissions: (_a = message.member) === null || _a === void 0 ? void 0 : _a.permissions,
                 commandPermissions: this.config.commands.messageCommand.permissions
             })) {
-                if (!command.allowExecuteInDM && message.channel.type === discord_js_1.ChannelType.DM
-                    || !command.allowExecuteByBots
-                        && (message.author.bot || message.author.system)
-                    || (0, permissions_1.isIgnoredChannel)(message.channelId, this.config.ignoredChannels))
+                if (!command.allowExecuteInDM && message.channel.type === discord_js_1.ChannelType.DM || !command.allowExecuteByBots && (message.author.bot || message.author.system))
                     return;
                 if (command.validateOptions) {
                     if (commandOptions.some(o => o.invalid)) {
@@ -217,11 +214,11 @@ class RecipleClient extends discord_js_1.Client {
                     guild: message.guild,
                     type: builders_1.CommandBuilderType.MessageCommand
                 };
-                if (this.config.commands.messageCommand.enableCooldown && command.cooldown && !this.commandCooldowns.isCooledDown(userCooldown)) {
-                    this.commandCooldowns.add(Object.assign(Object.assign({}, userCooldown), { expireTime: Date.now() + command.cooldown }));
+                if (this.config.commands.messageCommand.enableCooldown && command.cooldown && !this.cooldowns.isCooledDown(userCooldown)) {
+                    this.cooldowns.add(Object.assign(Object.assign({}, userCooldown), { expireTime: Date.now() + command.cooldown }));
                 }
                 else if (this.config.commands.messageCommand.enableCooldown && command.cooldown) {
-                    if (!(yield this._haltCommand(command, Object.assign({ executeData, reason: commands_1.CommandHaltReason.Cooldown }, this.commandCooldowns.get(userCooldown))))) {
+                    if (!(yield this._haltCommand(command, Object.assign({ executeData, reason: commands_1.CommandHaltReason.Cooldown }, this.cooldowns.get(userCooldown))))) {
                         yield message.reply(this.getMessage('cooldown', 'You cannot execute this command right now due to the cooldown.')).catch(er => this._replyError(er));
                     }
                     return;
@@ -265,7 +262,7 @@ class RecipleClient extends discord_js_1.Client {
                 memberPermissions: (_a = interaction.memberPermissions) !== null && _a !== void 0 ? _a : undefined,
                 commandPermissions: this.config.commands.slashCommand.permissions
             })) {
-                if (!command || (0, permissions_1.isIgnoredChannel)(interaction.channelId, this.config.ignoredChannels))
+                if (!command)
                     return;
                 if (interaction.guild && !(0, permissions_1.botHasExecutePermissions)(interaction.guild, command.requiredBotPermissions)) {
                     if (!(yield this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingBotPermissions }))) {
@@ -280,11 +277,11 @@ class RecipleClient extends discord_js_1.Client {
                     guild: interaction.guild,
                     type: builders_1.CommandBuilderType.SlashCommand
                 };
-                if (this.config.commands.slashCommand.enableCooldown && command.cooldown && !this.commandCooldowns.isCooledDown(userCooldown)) {
-                    this.commandCooldowns.add(Object.assign(Object.assign({}, userCooldown), { expireTime: Date.now() + command.cooldown }));
+                if (this.config.commands.slashCommand.enableCooldown && command.cooldown && !this.cooldowns.isCooledDown(userCooldown)) {
+                    this.cooldowns.add(Object.assign(Object.assign({}, userCooldown), { expireTime: Date.now() + command.cooldown }));
                 }
                 else if (this.config.commands.slashCommand.enableCooldown && command.cooldown) {
-                    if (!(yield this._haltCommand(command, Object.assign({ executeData, reason: commands_1.CommandHaltReason.Cooldown }, this.commandCooldowns.get(userCooldown))))) {
+                    if (!(yield this._haltCommand(command, Object.assign({ executeData, reason: commands_1.CommandHaltReason.Cooldown }, this.cooldowns.get(userCooldown))))) {
                         yield interaction.reply(this.getMessage('cooldown', 'You cannot execute this command right now due to the cooldown.')).catch(er => this._replyError(er));
                     }
                     return;

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

@@ -37,11 +37,6 @@ export interface Config {
             };
         };
     };
-    ignoredChannels: {
-        enabled: boolean;
-        convertToAllowList: boolean;
-        channels: string[];
-    };
     fileLogging: {
         enabled: boolean;
         debugmode: boolean;

package/bin/reciple/flags.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.token = exports.flags = void 0;
+const version_1 = require("./version");
 const commander_1 = require("commander");
 /**
  * Used flags
@@ -8,7 +9,7 @@ const commander_1 = require("commander");
 exports.flags = new commander_1.Command()
     .name('reciple')
     .description('Reciple.js - Discord.js handler cli')
-    .version(`v${require('../../package.json').version}`, '-v, --version')
+    .version(`v${version_1.rawVersion}`, '-v, --version')
     .option('-t, --token <token>', 'Replace used bot token')
     .option('-c, --config <config>', 'Change path to config file')
     .option('-D, --debugmode', 'Enabled debug mode')

package/bin/reciple/permissions.d.ts

@@ -1,6 +1,5 @@
 import { UserHasCommandPermissionsOptions } from './types/paramOptions';
 import { Guild, PermissionResolvable } from 'discord.js';
-import { Config } from './classes/RecipleConfig';
 /**
  * Check if the user has permissions to execute the given command name
  * @param options options
@@ -12,9 +11,3 @@ export declare function userHasCommandPermissions(options: UserHasCommandPermiss
  * @param requiredPermissions Required guild bot permissions
  */
 export declare function botHasExecutePermissions(guild?: Guild, requiredPermissions?: PermissionResolvable[]): boolean;
-/**
- * Check if the channel id is ignored in config file
- * @param channelId Check if channel id is in ignore list
- * @param ignoredChannelsConfig Ignored channels config
- */
-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.isIgnoredChannel = exports.botHasExecutePermissions = exports.userHasCommandPermissions = void 0;
+exports.botHasExecutePermissions = exports.userHasCommandPermissions = void 0;
 /**
  * Check if the user has permissions to execute the given command name
  * @param options options
@@ -26,18 +26,3 @@ function botHasExecutePermissions(guild, requiredPermissions) {
     return (guild === null || guild === void 0 ? void 0 : guild.members.me) ? guild.members.me.permissions.has(requiredPermissions) : false;
 }
 exports.botHasExecutePermissions = botHasExecutePermissions;
-/**
- * Check if the channel id is ignored in config file
- * @param channelId Check if channel id is in ignore list
- * @param ignoredChannelsConfig Ignored channels config
- */
-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "5.0.0-pre.2",
+  "version": "5.0.0-pre.3",
   "bin": "bin/bin.js",
   "license": "GPL-3.0",
   "main": "bin/index.js",

package/resource/reciple.yml

@@ -49,16 +49,6 @@ commands:
           permissions: ['Administrator']
 
 
-# Ignored channel IDs
-ignoredChannels:
-  # enable ignored channels
-  enabled: false
-  # convert to only allowed channels
-  convertToAllowList: false
-  # channel IDs
-  channels: []
-
-
 # Logger options
 fileLogging:
   # enable console output to file