reciple 6.0.0-dev.1 → 6.0.0-dev.10

package/dist/cjs/bin.js

@@ -30,21 +30,25 @@ catch (err) {
 }
 const config = configParser.getConfig();
 const client = new RecipleClient_1.RecipleClient({ config: config, ...config.client });
-if (config.fileLogging.clientLogs)
+if (!client.isClientLogsSilent)
     client.logger.info('Starting Reciple client v' + version_1.rawVersion);
 (async () => {
     client.addCommandListeners();
-    await client.modules.startModulesFromFiles({
-        files: await client.modules.getModuleFiles()
-    });
+    await client.modules.startModules(await client.modules.getModulesFromFiles({
+        files: await client.modules.getModuleFiles(),
+    }));
     client.on('ready', async () => {
-        await client.modules.loadAll(true);
-        if (client.isClientLogsEnabled())
+        await client.modules.loadModules(client.modules.modules.toJSON(), true);
+        if (!client.isClientLogsSilent)
+            client.logger.log(`Loaded ${client.commands.slashCommands.size} slash commands`, `Loaded ${client.commands.messageCommands.size} message commands`);
+        if (client.config.commands.slashCommand.registerCommands)
+            await client.commands.registerApplicationCommands();
+        if (!client.isClientLogsSilent)
             client.logger.warn(`Logged in as ${client.user?.tag || 'Unknown'}!`);
         client.on('cacheSweep', () => client.cooldowns.clean());
     });
     client.login(config.token).catch(err => {
-        if (client.isClientLogsEnabled())
+        if (!client.isClientLogsSilent)
             client.logger.error(err);
     });
 })();

package/dist/cjs/index.js

@@ -18,17 +18,17 @@ __exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), export
 __exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/SlashCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/managers/ApplicationCommandManager"), exports);
-__exportStar(require("./reciple/classes/managers/CommandCooldownManager"), exports);
 __exportStar(require("./reciple/classes/managers/ClientCommandManager"), exports);
+__exportStar(require("./reciple/classes/managers/ClientModuleManager"), exports);
+__exportStar(require("./reciple/classes/managers/CommandCooldownManager"), exports);
 __exportStar(require("./reciple/classes/managers/MessageCommandOptionManager"), exports);
 __exportStar(require("./reciple/classes/RecipleClient"), exports);
 __exportStar(require("./reciple/classes/RecipleConfig"), exports);
+__exportStar(require("./reciple/classes/RecipleModule"), exports);
 __exportStar(require("./reciple/types/builders"), exports);
 __exportStar(require("./reciple/types/commands"), exports);
 __exportStar(require("./reciple/types/paramOptions"), exports);
 __exportStar(require("./reciple/flags"), exports);
-__exportStar(require("./reciple/logger"), exports);
-__exportStar(require("./reciple/modules"), exports);
 __exportStar(require("./reciple/permissions"), exports);
 __exportStar(require("./reciple/util"), exports);
 __exportStar(require("./reciple/version"), exports);

package/dist/cjs/reciple/classes/RecipleClient.js

@@ -5,22 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
 const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
+const discord_js_1 = require("discord.js");
 const SlashCommandBuilder_1 = require("./builders/SlashCommandBuilder");
 const commands_1 = require("../types/commands");
 const CommandCooldownManager_1 = require("./managers/CommandCooldownManager");
 const permissions_1 = require("../permissions");
 const MessageCommandOptionManager_1 = require("./managers/MessageCommandOptionManager");
 const ApplicationCommandManager_1 = require("./managers/ApplicationCommandManager");
-const builders_1 = require("../types/builders");
 const ClientCommandManager_1 = require("./managers/ClientCommandManager");
+const ClientModuleManager_1 = require("./managers/ClientModuleManager");
+const builders_1 = require("../types/builders");
 const RecipleConfig_1 = require("./RecipleConfig");
 const fallout_utility_1 = require("fallout-utility");
-const logger_1 = require("../logger");
+const util_1 = require("../util");
 const version_1 = require("../version");
 const flags_1 = require("../flags");
 const path_1 = __importDefault(require("path"));
-const discord_js_1 = require("discord.js");
-const ClientModuleManager_1 = require("./managers/ClientModuleManager");
 class RecipleClient extends discord_js_1.Client {
     /**
      * @param options Client options
@@ -28,25 +28,32 @@ class RecipleClient extends discord_js_1.Client {
     constructor(options) {
         super(options);
         this.config = RecipleConfig_1.RecipleConfig.getDefaultConfig();
-        this.commands = new ClientCommandManager_1.ClientCommandManager({ client: this });
+        this.commands = new ClientCommandManager_1.ClientCommandManager({
+            client: this,
+        });
         this.cooldowns = new CommandCooldownManager_1.CommandCooldownManager();
-        this.modules = new ClientModuleManager_1.ClientModuleManager({ client: this });
+        this.modules = new ClientModuleManager_1.ClientModuleManager({
+            client: this,
+        });
         this.version = version_1.version;
-        this.logger = (0, logger_1.createLogger)(!!options.config?.fileLogging.stringifyLoggedJSON, options.config?.fileLogging.debugmode);
+        this.logger = (0, util_1.createLogger)(!!options.config?.fileLogging.stringifyLoggedJSON, options.config?.fileLogging.debugmode);
         this.config = { ...this.config, ...(options.config ?? {}) };
         if (this.config.fileLogging.enabled)
             this.logger.logFile(path_1.default.join(flags_1.cwd, this.config.fileLogging.logFilePath ?? 'logs/latest.log'), false);
         this.applicationCommands = new ApplicationCommandManager_1.ApplicationCommandManager(this);
     }
+    get isClientLogsSilent() {
+        return !this.config.fileLogging.clientLogs;
+    }
     /**
      * Listed to command executions
      */
     addCommandListeners() {
-        this.on('messageCreate', (message) => {
+        this.on('messageCreate', message => {
             if (this.config.commands.messageCommand.enabled)
                 this.messageCommandExecute(message);
         });
-        this.on('interactionCreate', (interaction) => {
+        this.on('interactionCreate', interaction => {
             if (this.config.commands.slashCommand.enabled)
                 this.slashCommandExecute(interaction);
         });
@@ -61,23 +68,26 @@ class RecipleClient extends discord_js_1.Client {
             return;
         if (!this.config.commands.slashCommand.acceptRepliedInteractions && (interaction.replied || interaction.deferred))
             return;
-        const command = this.commands.get(interaction.commandName, builders_1.CommandBuilderType.SlashCommand);
+        const command = this.commands.get(interaction.commandName, builders_1.CommandType.SlashCommand);
         if (!command)
             return;
         const executeData = {
             interaction,
             builder: command,
-            client: this
+            client: this,
         };
         if ((0, permissions_1.userHasCommandPermissions)({
             builder: command,
             memberPermissions: interaction.memberPermissions ?? undefined,
-            commandPermissions: this.config.commands.slashCommand.permissions
+            commandPermissions: this.config.commands.slashCommand.permissions,
         })) {
             if (!command)
                 return;
             if (interaction.inCachedGuild() && !(0, permissions_1.botHasExecutePermissions)(interaction.channel || interaction.guild, command.requiredBotPermissions)) {
-                if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingBotPermissions })) {
+                if (!(await this._haltCommand(command, {
+                    executeData,
+                    reason: commands_1.CommandHaltReason.MissingBotPermissions,
+                }))) {
                     await interaction.reply(this.getConfigMessage('insufficientBotPerms', 'Insufficient bot permissions.')).catch(er => this._replyError(er));
                 }
                 return;
@@ -87,20 +97,30 @@ class RecipleClient extends discord_js_1.Client {
                 command: command.name,
                 channel: interaction.channel ?? undefined,
                 guild: interaction.guild,
-                type: builders_1.CommandBuilderType.SlashCommand
+                type: builders_1.CommandType.SlashCommand,
             };
             if (this.config.commands.slashCommand.enableCooldown && command.cooldown && !this.cooldowns.isCooledDown(userCooldown)) {
-                this.cooldowns.add({ ...userCooldown, expireTime: Date.now() + command.cooldown });
+                this.cooldowns.add({
+                    ...userCooldown,
+                    expireTime: Date.now() + command.cooldown,
+                });
             }
             else if (this.config.commands.slashCommand.enableCooldown && command.cooldown) {
-                if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.Cooldown, ...this.cooldowns.get(userCooldown) })) {
+                if (!(await this._haltCommand(command, {
+                    executeData,
+                    reason: commands_1.CommandHaltReason.Cooldown,
+                    ...this.cooldowns.get(userCooldown),
+                }))) {
                     await interaction.reply(this.getConfigMessage('cooldown', 'You cannot execute this command right now due to the cooldown.')).catch(er => this._replyError(er));
                 }
                 return;
             }
             return this._executeCommand(command, executeData);
         }
-        else if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingMemberPermissions })) {
+        else if (!(await this._haltCommand(command, {
+            executeData,
+            reason: commands_1.CommandHaltReason.MissingMemberPermissions,
+        }))) {
             await interaction.reply(this.getConfigMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this._replyError(er));
         }
     }
@@ -115,7 +135,7 @@ class RecipleClient extends discord_js_1.Client {
         const parseCommand = (0, fallout_utility_1.getCommand)(message.content, prefix || this.config.commands.messageCommand.prefix || '!', this.config.commands.messageCommand.commandArgumentSeparator || ' ');
         if (!parseCommand || !parseCommand?.command)
             return;
-        const command = this.commands.get(parseCommand.command, builders_1.CommandBuilderType.MessageCommand);
+        const command = this.commands.get(parseCommand.command, builders_1.CommandType.MessageCommand);
         if (!command)
             return;
         const commandOptions = await (0, MessageCommandBuilder_1.validateMessageCommandOptions)(command, parseCommand);
@@ -124,31 +144,42 @@ class RecipleClient extends discord_js_1.Client {
             options: commandOptions,
             command: parseCommand,
             builder: command,
-            client: this
+            client: this,
         };
         if ((0, permissions_1.userHasCommandPermissions)({
             builder: command,
             memberPermissions: message.member?.permissions,
-            commandPermissions: this.config.commands.messageCommand.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))
+            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)) {
-                    if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.InvalidArguments, invalidArguments: new MessageCommandOptionManager_1.MessageCommandOptionManager(...executeData.options.filter(o => o.invalid)) })) {
+                    if (!(await this._haltCommand(command, {
+                        executeData,
+                        reason: commands_1.CommandHaltReason.InvalidArguments,
+                        invalidArguments: new MessageCommandOptionManager_1.MessageCommandOptionManager(...executeData.options.filter(o => o.invalid)),
+                    }))) {
                         message.reply(this.getConfigMessage('invalidArguments', 'Invalid argument(s) given.')).catch(er => this._replyError(er));
                     }
                     return;
                 }
                 if (commandOptions.some(o => o.missing)) {
-                    if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingArguments, missingArguments: new MessageCommandOptionManager_1.MessageCommandOptionManager(...executeData.options.filter(o => o.missing)) })) {
+                    if (!(await this._haltCommand(command, {
+                        executeData,
+                        reason: commands_1.CommandHaltReason.MissingArguments,
+                        missingArguments: new MessageCommandOptionManager_1.MessageCommandOptionManager(...executeData.options.filter(o => o.missing)),
+                    }))) {
                         message.reply(this.getConfigMessage('missingArguments', 'Not enough arguments.')).catch(er => this._replyError(er));
                     }
                     return;
                 }
             }
             if (message.inGuild() && !(0, permissions_1.botHasExecutePermissions)(message.channel || message.guild, command.requiredBotPermissions)) {
-                if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingBotPermissions })) {
+                if (!(await this._haltCommand(command, {
+                    executeData,
+                    reason: commands_1.CommandHaltReason.MissingBotPermissions,
+                }))) {
                     message.reply(this.getConfigMessage('insufficientBotPerms', 'Insufficient bot permissions.')).catch(er => this._replyError(er));
                 }
                 return;
@@ -158,20 +189,30 @@ class RecipleClient extends discord_js_1.Client {
                 command: command.name,
                 channel: message.channel,
                 guild: message.guild,
-                type: builders_1.CommandBuilderType.MessageCommand
+                type: builders_1.CommandType.MessageCommand,
             };
             if (this.config.commands.messageCommand.enableCooldown && command.cooldown && !this.cooldowns.isCooledDown(userCooldown)) {
-                this.cooldowns.add({ ...userCooldown, expireTime: Date.now() + command.cooldown });
+                this.cooldowns.add({
+                    ...userCooldown,
+                    expireTime: Date.now() + command.cooldown,
+                });
             }
             else if (this.config.commands.messageCommand.enableCooldown && command.cooldown) {
-                if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.Cooldown, ...this.cooldowns.get(userCooldown) })) {
+                if (!(await this._haltCommand(command, {
+                    executeData,
+                    reason: commands_1.CommandHaltReason.Cooldown,
+                    ...this.cooldowns.get(userCooldown),
+                }))) {
                     await message.reply(this.getConfigMessage('cooldown', 'You cannot execute this command right now due to the cooldown.')).catch(er => this._replyError(er));
                 }
                 return;
             }
             return this._executeCommand(command, executeData);
         }
-        else if (!await this._haltCommand(command, { executeData, reason: commands_1.CommandHaltReason.MissingMemberPermissions })) {
+        else if (!(await this._haltCommand(command, {
+            executeData,
+            reason: commands_1.CommandHaltReason.MissingMemberPermissions,
+        }))) {
             message.reply(this.getConfigMessage('noPermissions', 'You do not have permission to use this command.')).catch(er => this._replyError(er));
         }
     }
@@ -183,12 +224,6 @@ class RecipleClient extends discord_js_1.Client {
     getConfigMessage(messageKey, defaultMessage) {
         return this.config.messages[messageKey] ?? defaultMessage ?? messageKey;
     }
-    /**
-     * Returns true if client logs is enabled
-     */
-    isClientLogsEnabled() {
-        return !!this.config.fileLogging.clientLogs;
-    }
     /**
      * Emits the {@link RecipleClientEvents["recipleReplyError"]} event
      * @param error Received Error
@@ -199,15 +234,15 @@ class RecipleClient extends discord_js_1.Client {
     async _haltCommand(command, haltData) {
         try {
             const haltResolved = (command.halt
-                ? await Promise.resolve(command.type == builders_1.CommandBuilderType.SlashCommand
-                    ? command.halt(haltData)
-                    : command.halt(haltData)).catch(err => { console.log(err); })
+                ? await Promise.resolve(command.type == builders_1.CommandType.SlashCommand ? command.halt(haltData) : command.halt(haltData)).catch(err => {
+                    console.log(err);
+                })
                 : false) || false;
             this.emit('recipleCommandHalt', haltData);
             return haltResolved;
         }
         catch (err) {
-            if (this.isClientLogsEnabled()) {
+            if (!this.isClientLogsSilent) {
                 this.logger.error(`An error occured executing command halt for "${command.name}"`);
                 this.logger.error(err);
             }
@@ -216,17 +251,23 @@ class RecipleClient extends discord_js_1.Client {
     }
     async _executeCommand(command, executeData) {
         try {
-            await Promise.resolve(command.type === builders_1.CommandBuilderType.SlashCommand
-                ? command.execute(executeData)
-                : command.execute(executeData))
+            await Promise.resolve(command.type === builders_1.CommandType.SlashCommand ? command.execute(executeData) : command.execute(executeData))
                 .then(() => this.emit('recipleCommandExecute', executeData))
-                .catch(async (err) => !await this._haltCommand(command, { executeData: executeData, reason: commands_1.CommandHaltReason.Error, error: err })
+                .catch(async (err) => !(await this._haltCommand(command, {
+                executeData: executeData,
+                reason: commands_1.CommandHaltReason.Error,
+                error: err,
+            }))
                 ? this._commandExecuteError(err, executeData)
                 : void 0);
             return executeData;
         }
         catch (err) {
-            if (await this._haltCommand(command, { executeData: executeData, reason: commands_1.CommandHaltReason.Error, error: err }))
+            if (await this._haltCommand(command, {
+                executeData: executeData,
+                reason: commands_1.CommandHaltReason.Error,
+                error: err,
+            }))
                 return;
             await this._commandExecuteError(err, executeData);
         }
@@ -237,8 +278,8 @@ class RecipleClient extends discord_js_1.Client {
      * @param command Slash/Message command execute data
      */
     async _commandExecuteError(err, command) {
-        if (this.isClientLogsEnabled()) {
-            this.logger.error(`An error occured executing ${command.builder.type == builders_1.CommandBuilderType.MessageCommand ? 'message' : 'slash'} command "${command.builder.name}"`);
+        if (!this.isClientLogsSilent) {
+            this.logger.error(`An error occured executing ${command.builder.type == builders_1.CommandType.MessageCommand ? 'message' : 'slash'} command "${command.builder.name}"`);
             this.logger.error(err);
         }
         if (!err || !command)

package/dist/cjs/reciple/classes/RecipleConfig.js

@@ -84,14 +84,21 @@ class RecipleConfig {
      * Ask for a token
      */
     _askToken() {
-        return flags_1.token || (0, fallout_utility_1.input)({ text: 'Bot Token >>> ', echo: '*', repeatIfEmpty: true, sigint: true }) || null;
+        return (flags_1.token ||
+            (0, fallout_utility_1.input)({
+                text: 'Bot Token >>> ',
+                echo: '*',
+                repeatIfEmpty: true,
+                sigint: true,
+            }) ||
+            null);
     }
     /**
      * Get default config
      */
     static getDefaultConfig() {
         if (!(0, fs_1.existsSync)(this.defaultConfigPath))
-            throw new Error("Default config file does not exists.");
+            throw new Error('Default config file does not exists.');
         return yaml_1.default.parse((0, fs_1.readFileSync)(this.defaultConfigPath, 'utf-8'));
     }
 }

package/dist/cjs/reciple/classes/RecipleModule.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecipleModule = void 0;
+const crypto_1 = require("crypto");
+const discord_js_1 = require("discord.js");
+const builders_1 = require("../types/builders");
+const util_1 = require("../util");
+const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
+const SlashCommandBuilder_1 = require("./builders/SlashCommandBuilder");
+class RecipleModule {
+    constructor(options) {
+        this.commands = [];
+        this.id = (0, crypto_1.randomUUID)();
+        this.client = options.client;
+        this.script = options.script;
+        this.filePath = options.filePath;
+        this.metadata = options.metadata;
+    }
+    get displayName() {
+        return this.filePath ?? this.id;
+    }
+    async start() {
+        return Promise.resolve(this.script.onStart(this.client));
+    }
+    async load(resolveCommands = true) {
+        if (typeof this.script.onLoad === 'function')
+            await this.script.onLoad(this.client);
+        if (resolveCommands)
+            this.resolveCommands();
+    }
+    async unLoad(reason) {
+        if (typeof this.script.onUnLoad === 'function')
+            await this.script.onUnLoad(reason, this.client);
+    }
+    async registerSlashCommands(...guilds) {
+        for (const command of this.commands) {
+            if (command.type !== builders_1.CommandType.SlashCommand)
+                continue;
+            await this.client.applicationCommands.add(command, (0, discord_js_1.normalizeArray)(guilds));
+        }
+    }
+    async unregisterSlashCommands(...guilds) {
+        for (const builder of this.commands) {
+            if (builder.type !== builders_1.CommandType.SlashCommand)
+                continue;
+            if ((0, discord_js_1.normalizeArray)(guilds).length) {
+                for (const guild of (0, discord_js_1.normalizeArray)(guilds)) {
+                    const command = this.client.applicationCommands.get(builder, guild);
+                    if (command)
+                        await this.client.applicationCommands.remove(command, guild);
+                }
+                continue;
+            }
+            const command = this.client.applicationCommands.get(builder);
+            if (command)
+                await this.client.applicationCommands.remove(command);
+        }
+    }
+    async updateSlashCommands(...guilds) {
+        for (const builder of this.commands) {
+            if (builder.type !== builders_1.CommandType.SlashCommand)
+                continue;
+            if ((0, discord_js_1.normalizeArray)(guilds).length) {
+                for (const guild of (0, discord_js_1.normalizeArray)(guilds)) {
+                    const command = this.client.applicationCommands.get(builder, guild);
+                    if (command)
+                        await this.client.applicationCommands.edit(command, builder, guild);
+                }
+                continue;
+            }
+            const command = this.client.applicationCommands.get(builder);
+            if (command)
+                await this.client.applicationCommands.edit(command, builder);
+        }
+    }
+    resolveCommands() {
+        if (!Array.isArray(this.script?.commands))
+            return this.commands;
+        for (const command of this.script.commands) {
+            if (command?.type !== builders_1.CommandType.SlashCommand && command?.type !== builders_1.CommandType.MessageCommand)
+                continue;
+            const builder = command.type === builders_1.CommandType.SlashCommand ? SlashCommandBuilder_1.SlashCommandBuilder.resolveSlashCommand(command) : MessageCommandBuilder_1.MessageCommandBuilder.resolveMessageCommand(command);
+            if (!(0, util_1.validateCommandBuilder)(builder))
+                throw new Error('Invalid command builder, no name or contains option(s) without name');
+            this.commands.push(builder);
+        }
+        this.client.commands.add(this.commands);
+        return this.commands;
+    }
+    toString() {
+        return this.displayName;
+    }
+}
+exports.RecipleModule = RecipleModule;

package/dist/cjs/reciple/classes/builders/MessageCommandBuilder.js

@@ -10,7 +10,7 @@ const MessageCommandOptionBuilder_1 = require("./MessageCommandOptionBuilder");
  */
 class MessageCommandBuilder {
     constructor(data) {
-        this.type = builders_1.CommandBuilderType.MessageCommand;
+        this.type = builders_1.CommandType.MessageCommand;
         this.name = '';
         this.description = '';
         this.cooldown = 0;
@@ -21,7 +21,9 @@ class MessageCommandBuilder {
         this.requiredMemberPermissions = [];
         this.allowExecuteInDM = true;
         this.allowExecuteByBots = false;
-        this.execute = () => { };
+        this.execute = () => {
+            /* Execute */
+        };
         if (data?.name !== undefined)
             this.setName(data.name);
         if (data?.description !== undefined)
@@ -47,7 +49,7 @@ class MessageCommandBuilder {
         if (data?.validateOptions !== undefined)
             this.setValidateOptions(true);
         if (data?.options !== undefined)
-            this.options = data.options.map(o => o instanceof MessageCommandOptionBuilder_1.MessageCommandOptionBuilder ? o : new MessageCommandOptionBuilder_1.MessageCommandOptionBuilder(o));
+            this.options = data.options.map(o => (o instanceof MessageCommandOptionBuilder_1.MessageCommandOptionBuilder ? o : new MessageCommandOptionBuilder_1.MessageCommandOptionBuilder(o)));
     }
     /**
      * Sets the command name
@@ -218,7 +220,7 @@ async function validateMessageCommandOptions(builder, options) {
             value: arg ?? undefined,
             required: option.required,
             invalid: false,
-            missing: false
+            missing: false,
         };
         if (arg == undefined && option.required) {
             value.missing = true;

package/dist/cjs/reciple/classes/builders/SlashCommandBuilder.js

@@ -10,11 +10,13 @@ const discord_js_1 = require("discord.js");
 class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
     constructor(data) {
         super();
-        this.type = builders_1.CommandBuilderType.SlashCommand;
+        this.type = builders_1.CommandType.SlashCommand;
         this.cooldown = 0;
         this.requiredBotPermissions = [];
         this.requiredMemberPermissions = [];
-        this.execute = () => { };
+        this.execute = () => {
+            /* Execute */
+        };
         // TODO: WTH
         if (data?.name !== undefined)
             this.setName(data.name);
@@ -58,9 +60,7 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
     }
     setRequiredMemberPermissions(...permissions) {
         this.requiredMemberPermissions = (0, discord_js_1.normalizeArray)(permissions);
-        this.setDefaultMemberPermissions(this.requiredMemberPermissions.length
-            ? new discord_js_1.PermissionsBitField(this.requiredMemberPermissions).bitfield
-            : undefined);
+        this.setDefaultMemberPermissions(this.requiredMemberPermissions.length ? new discord_js_1.PermissionsBitField(this.requiredMemberPermissions).bitfield : undefined);
         return this;
     }
     setHalt(halt) {
@@ -135,13 +135,10 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
                 builder = new discord_js_1.SlashCommandBooleanOption();
                 break;
             case discord_js_1.ApplicationCommandOptionType.Channel:
-                builder = new discord_js_1.SlashCommandChannelOption()
-                    .addChannelTypes(...(option.channelTypes ?? []));
+                builder = new discord_js_1.SlashCommandChannelOption().addChannelTypes(...(option.channelTypes ?? []));
                 break;
             case discord_js_1.ApplicationCommandOptionType.Integer:
-                builder = new discord_js_1.SlashCommandIntegerOption()
-                    .addChoices(...(option.choices ?? []))
-                    .setAutocomplete(!!option.autocomplete);
+                builder = new discord_js_1.SlashCommandIntegerOption().addChoices(...(option.choices ?? [])).setAutocomplete(!!option.autocomplete);
                 if (option.maxValue)
                     builder.setMaxValue(option.maxValue);
                 if (option.minValue)
@@ -151,9 +148,7 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
                 builder = new discord_js_1.SlashCommandMentionableOption();
                 break;
             case discord_js_1.ApplicationCommandOptionType.Number:
-                builder = new discord_js_1.SlashCommandNumberOption()
-                    .addChoices(...(option.choices ?? []))
-                    .setAutocomplete(!!option.autocomplete);
+                builder = new discord_js_1.SlashCommandNumberOption().addChoices(...(option.choices ?? [])).setAutocomplete(!!option.autocomplete);
                 if (option.maxValue)
                     builder.setMaxValue(option.maxValue);
                 if (option.minValue)
@@ -163,9 +158,7 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
                 builder = new discord_js_1.SlashCommandRoleOption();
                 break;
             case discord_js_1.ApplicationCommandOptionType.String:
-                builder = new discord_js_1.SlashCommandStringOption()
-                    .addChoices(...(option.choices ?? []))
-                    .setAutocomplete(!!option.autocomplete);
+                builder = new discord_js_1.SlashCommandStringOption().addChoices(...(option.choices ?? [])).setAutocomplete(!!option.autocomplete);
                 if (option.maxLength)
                     builder.setMaxLength(option.maxLength);
                 if (option.minLength)
@@ -183,17 +176,13 @@ class SlashCommandBuilder extends discord_js_1.SlashCommandBuilder {
             case discord_js_1.ApplicationCommandOptionType.SubcommandGroup:
                 builder = new discord_js_1.SlashCommandSubcommandGroupBuilder();
                 for (const subCommandData of option.options) {
-                    builder.addSubcommand(subCommandData instanceof discord_js_1.SlashCommandSubcommandBuilder
-                        ? subCommandData
-                        : this.resolveOption(subCommandData));
+                    builder.addSubcommand(subCommandData instanceof discord_js_1.SlashCommandSubcommandBuilder ? subCommandData : this.resolveOption(subCommandData));
                 }
                 break;
             default:
-                throw new TypeError("Unknown option data");
+                throw new TypeError('Unknown option data');
         }
-        if (!(builder instanceof discord_js_1.SlashCommandSubcommandBuilder) && !(builder instanceof discord_js_1.SlashCommandSubcommandGroupBuilder)
-            &&
-                option.type !== discord_js_1.ApplicationCommandOptionType.Subcommand && option.type !== discord_js_1.ApplicationCommandOptionType.SubcommandGroup) {
+        if (!(builder instanceof discord_js_1.SlashCommandSubcommandBuilder) && !(builder instanceof discord_js_1.SlashCommandSubcommandGroupBuilder) && option.type !== discord_js_1.ApplicationCommandOptionType.Subcommand && option.type !== discord_js_1.ApplicationCommandOptionType.SubcommandGroup) {
             builder.setRequired(option.required ?? false);
         }
         return builder