reciple 1.0.0 → 1.0.1

package/bin/reciple/classes/Client.js

@@ -12,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RecipleClient = void 0;
 const discord_js_1 = require("discord.js");
 const fallout_utility_1 = require("fallout-utility");
-const MessageCommandBuilder_1 = require("./builders/MessageCommandBuilder");
-const InteractionCommandBuilder_1 = require("./builders/InteractionCommandBuilder");
 const registerInteractionCommands_1 = require("../registerInteractionCommands");
 const logger_1 = require("../logger");
 const modules_1 = require("../modules");
@@ -43,10 +41,10 @@ class RecipleClient extends discord_js_1.Client {
             for (const command of modules.commands) {
                 if (!command.name)
                     continue;
-                if (command instanceof MessageCommandBuilder_1.MessageCommandBuilder) {
+                if (command.type === 'MESSAGE_COMMAND') {
                     this.commands.MESSAGE_COMMANDS[command.name] = command;
                 }
-                else if (command instanceof InteractionCommandBuilder_1.InteractionCommandBuilder) {
+                else if (command.type === 'INTERACTION_COMMAND') {
                     this.commands.INTERACTION_COMMANDS[command.name] = command;
                 }
             }

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

@@ -8,6 +8,7 @@ export interface RecipleInteractionCommandExecute {
     client: RecipleClient;
 }
 export declare class InteractionCommandBuilder extends SlashCommandBuilder {
+    readonly type: string;
     allowExecuteInDM: boolean;
     execute: (options: RecipleInteractionCommandExecute) => void;
     setAllowExecuteInDM(allowExecuteInDM: boolean): InteractionCommandBuilder;

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

@@ -5,6 +5,7 @@ const builders_1 = require("@discordjs/builders");
 class InteractionCommandBuilder extends builders_1.SlashCommandBuilder {
     constructor() {
         super(...arguments);
+        this.type = 'INTERACTION_COMMAND';
         this.allowExecuteInDM = true;
         this.execute = (options) => { };
     }

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

@@ -29,6 +29,7 @@ export declare class MessageOption {
     setValidator(validator: (value: any) => boolean): MessageOption;
 }
 export declare class MessageCommandBuilder {
+    readonly type: string;
     name: string;
     description: string;
     options: MessageOption[];

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

@@ -36,6 +36,7 @@ class MessageOption {
 exports.MessageOption = MessageOption;
 class MessageCommandBuilder {
     constructor() {
+        this.type = 'MESSAGE_COMMAND';
         this.name = '';
         this.description = '';
         this.options = [];

package/bin/reciple/modules.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadModules = void 0;
 const fs_1 = require("fs");
 const MessageCommandBuilder_1 = require("./classes/builders/MessageCommandBuilder");
-const InteractionCommandBuilder_1 = require("./classes/builders/InteractionCommandBuilder");
 const path_1 = __importDefault(require("path"));
 function loadModules(client) {
     var _a;
@@ -38,10 +37,8 @@ function loadModules(client) {
                     throw new Error(script + ' onStart is not defined or returned false.');
                 if (module_.commands) {
                     for (const command of module_.commands) {
-                        if (!(command instanceof MessageCommandBuilder_1.MessageCommandBuilder) && !(command instanceof InteractionCommandBuilder_1.InteractionCommandBuilder)) {
-                            continue;
-                        }
-                        commands.push(command);
+                        if (command.type === 'MESSAGE_COMMAND' || command.type === 'INTERACTION_COMMAND')
+                            commands.push(command);
                     }
                 }
             }
@@ -55,7 +52,7 @@ function loadModules(client) {
                     logger.error(`A message command name is not defined in ${script}`);
                     return false;
                 }
-                if (c instanceof MessageCommandBuilder_1.MessageCommandBuilder && c.options.some(o => !o.name)) {
+                if (c instanceof MessageCommandBuilder_1.MessageCommandBuilder && c.options.length && c.options.some(o => !o.name)) {
                     logger.error(`A message command option name is not defined in ${script}`);
                     return false;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",