reciple 5.4.1 → 5.4.4

package/bin/bin.js

@@ -1,18 +1,8 @@
 #!/usr/bin/env node
 "use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 const RecipleClient_1 = require("./reciple/classes/RecipleClient");
 const RecipleConfig_1 = require("./reciple/classes/RecipleConfig");
@@ -26,37 +16,36 @@ const discord_js_1 = require("discord.js");
 const path_1 = __importDefault(require("path"));
 const allowedFiles = ['node_modules', 'reciple.yml', 'package.json'];
 const configPath = path_1.default.join(flags_1.cwd, './reciple.yml');
-if ((0, fs_1.readdirSync)(flags_1.cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)((_a = flags_1.flags.config) !== null && _a !== void 0 ? _a : configPath)) {
-    const ask = (_c = (_b = (flags_1.flags.yes ? 'y' : null)) !== null && _b !== void 0 ? _b : (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ')) !== null && _c !== void 0 ? _c : '';
+if ((0, fs_1.readdirSync)(flags_1.cwd).filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)(flags_1.flags.config ?? configPath)) {
+    const ask = (flags_1.flags.yes ? 'y' : null) ?? (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ') ?? '';
     if (ask.toString().toLowerCase() !== 'y')
         process.exit(0);
 }
 let configParser;
 try {
-    configParser = new RecipleConfig_1.RecipleConfig((_d = flags_1.flags.config) !== null && _d !== void 0 ? _d : configPath).parseConfig();
+    configParser = new RecipleConfig_1.RecipleConfig(flags_1.flags.config ?? configPath).parseConfig();
 }
 catch (err) {
     console.error(`${chalk_1.default.bold.red('Config Error')}: ${chalk_1.default.white(err.message)}`);
     process.exit(1);
 }
 const config = configParser.getConfig();
-const client = new RecipleClient_1.RecipleClient(Object.assign({ config: config }, config.client));
+const client = new RecipleClient_1.RecipleClient({ config: config, ...config.client });
 if (config.fileLogging.clientLogs)
     client.logger.info('Starting Reciple client v' + version_1.rawVersion);
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    yield client.startModules((0, discord_js_1.normalizeArray)(config.modulesFolder));
-    client.on('ready', () => __awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+(async () => {
+    await client.startModules((0, discord_js_1.normalizeArray)(config.modulesFolder));
+    client.on('ready', async () => {
         if (client.isClientLogsEnabled())
-            client.logger.warn(`Logged in as ${((_e = client.user) === null || _e === void 0 ? void 0 : _e.tag) || 'Unknown'}!`);
+            client.logger.warn(`Logged in as ${client.user?.tag || 'Unknown'}!`);
         client.on('cacheSweep', () => {
             client.cooldowns.clean();
         });
-        yield client.loadModules();
+        await client.loadModules();
         client.addCommandListeners();
-    }));
+    });
     client.login(config.token).catch(err => {
         if (client.isClientLogsEnabled())
             client.logger.error(err);
     });
-}))();
+})();

package/bin/reciple/classes/CommandCooldownManager.js

@@ -44,7 +44,7 @@ class CommandCooldownManager extends Array {
         const data = this.get(options);
         if (!data)
             return false;
-        this.remove(Object.assign(Object.assign({}, data), { channel: undefined, guild: undefined, type: undefined, command: undefined }));
+        this.remove({ ...data, channel: undefined, guild: undefined, type: undefined, command: undefined });
         if (data.expireTime < Date.now())
             return false;
         return true;
@@ -75,16 +75,15 @@ class CommandCooldownManager extends Array {
      * @param data Cooled-down user data
      */
     static checkOptions(options, data) {
-        var _a, _b;
-        if ((options === null || options === void 0 ? void 0 : options.user) && options.user.id !== data.user.id)
+        if (options?.user !== undefined && options.user.id !== data.user.id)
             return false;
-        if ((options === null || options === void 0 ? void 0 : options.guild) && options.guild.id !== ((_a = data.guild) === null || _a === void 0 ? void 0 : _a.id))
+        if (options?.guild !== undefined && options.guild?.id !== data.guild?.id)
             return false;
-        if ((options === null || options === void 0 ? void 0 : options.channel) && options.channel.id !== ((_b = data.channel) === null || _b === void 0 ? void 0 : _b.id))
+        if (options?.channel !== undefined && options.channel.id !== data.channel?.id)
             return false;
-        if ((options === null || options === void 0 ? void 0 : options.command) && options.command !== data.command)
+        if (options?.command !== undefined && options.command !== data.command)
             return false;
-        if ((options === null || options === void 0 ? void 0 : options.type) && options.type !== data.type)
+        if (options?.type !== undefined && options.type !== data.type)
             return false;
         return true;
     }

package/bin/reciple/classes/MessageCommandOptionManager.js

@@ -11,16 +11,15 @@ class MessageCommandOptionManager extends Array {
     }
     get(name, required) {
         const option = this.find(o => o.name == name);
-        if (!(option === null || option === void 0 ? void 0 : option.value) == undefined && required)
+        if (!option?.value == undefined && required)
             throw new TypeError(`Can't find option named ${name}`);
-        return option !== null && option !== void 0 ? option : null;
+        return option ?? null;
     }
     getValue(name, requied) {
-        var _a;
         const option = this.get(name, requied);
-        if (!(option === null || option === void 0 ? void 0 : option.value) && requied)
+        if (!option?.value && requied)
             throw new TypeError(`Value of option named ${name} is undefined`);
-        return (_a = option === null || option === void 0 ? void 0 : option.value) !== null && _a !== void 0 ? _a : null;
+        return option?.value ?? null;
     }
 }
 exports.MessageCommandOptionManager = MessageCommandOptionManager;

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

@@ -39,13 +39,13 @@ export interface RecipleClientEvents extends ClientEvents {
  */
 export interface RecipleClient<Ready extends boolean = boolean> extends Client<Ready> {
     on<E extends keyof RecipleClientEvents>(event: E, listener: (...args: RecipleClientEvents[E]) => Awaitable<void>): this;
-    on<E extends string | symbol>(event: Exclude<E, keyof RecipleClientEvents>, listener: (...args: any) => Awaitable<void>): this;
+    on<E extends string | symbol>(event: E, listener: (...args: any) => Awaitable<void>): this;
     once<E extends keyof RecipleClientEvents>(event: E, listener: (...args: RecipleClientEvents[E]) => Awaitable<void>): this;
-    once<E extends keyof string | symbol>(event: Exclude<E, keyof RecipleClientEvents>, listener: (...args: any) => Awaitable<void>): this;
+    once<E extends keyof string | symbol>(event: E, listener: (...args: any) => Awaitable<void>): this;
     emit<E extends keyof RecipleClientEvents>(event: E, ...args: RecipleClientEvents[E]): boolean;
-    emit<E extends string | symbol>(event: Exclude<E, keyof RecipleClientEvents>, ...args: any): boolean;
+    emit<E extends string | symbol>(event: E, ...args: any): boolean;
     off<E extends keyof RecipleClientEvents>(event: E, listener: (...args: RecipleClientEvents[E]) => Awaitable<void>): this;
-    off<E extends string | symbol>(event: Exclude<E, keyof RecipleClientEvents>, listener: (...args: any) => Awaitable<void>): this;
+    off<E extends string | symbol>(event: E, listener: (...args: any) => Awaitable<void>): this;
     removeAllListeners<E extends keyof RecipleClientEvents>(event?: E): this;
     removeAllListeners(event?: string | symbol): this;
     isReady(): this is RecipleClient<true>;