reciple 1.0.19 → 1.1.1

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

@@ -1,4 +1,4 @@
-import { Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
+import { ApplicationCommandData, Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
 import { Logger as LoggerConstructor } from 'fallout-utility';
 import { MessageCommandBuilder, RecipleMessageCommandExecute } from './builders/MessageCommandBuilder';
 import { InteractionCommandBuilder, RecipleInteractionCommandExecute } from './builders/InteractionCommandBuilder';
@@ -22,6 +22,7 @@ export interface RecipleClientEvents extends ClientEvents {
 export declare class RecipleClient extends Client {
     config?: Config;
     commands: RecipleClientCommands;
+    otherApplicationCommandData: ApplicationCommandData[];
     modules: RecipleScript[];
     logger: LoggerConstructor;
     version: string;

package/bin/reciple/classes/Client.js

@@ -22,6 +22,7 @@ class RecipleClient extends discord_js_1.Client {
     constructor(options) {
         super(options);
         this.commands = { MESSAGE_COMMANDS: {}, INTERACTION_COMMANDS: {} };
+        this.otherApplicationCommandData = [];
         this.modules = [];
         this.version = version_1.version;
         this.logger = (0, logger_1.logger)(!!options.config.fileLogging.stringifyLoggedJSON, !!options.config.fileLogging.debugmode);
@@ -42,10 +43,10 @@ class RecipleClient extends discord_js_1.Client {
             for (const command of modules.commands) {
                 if (!command.name)
                     continue;
-                if (command.type === 'MESSAGE_COMMAND') {
+                if (command.builder === 'MESSAGE_COMMAND') {
                     this.commands.MESSAGE_COMMANDS[command.name] = command;
                 }
-                else if (command.type === 'INTERACTION_COMMAND') {
+                else if (command.builder === 'INTERACTION_COMMAND') {
                     this.commands.INTERACTION_COMMANDS[command.name] = command;
                 }
             }
@@ -63,7 +64,7 @@ class RecipleClient extends discord_js_1.Client {
             }
             this.logger.info(`${this.modules.length} modules loaded.`);
             if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.registerCommands)
-                yield (0, registerInteractionCommands_1.registerInteractionCommands)(this);
+                yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
             return this;
         });
     }
@@ -137,7 +138,7 @@ class RecipleClient extends discord_js_1.Client {
     _commandExecuteError(err, command) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.error(`An error occured executing ${command.builder.type == 'MESSAGE_COMMAND' ? 'message' : 'interaction'} command "${command.builder.name}"`);
+            this.logger.error(`An error occured executing ${command.builder.builder == 'MESSAGE_COMMAND' ? 'message' : 'interaction'} command "${command.builder.name}"`);
             this.logger.error(err);
             if (!err || !command)
                 return;

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

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

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

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

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

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

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

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

package/bin/reciple/modules.js

@@ -36,7 +36,7 @@ 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.type === 'MESSAGE_COMMAND' || command.type === 'INTERACTION_COMMAND')
+                        if (command.builder === 'MESSAGE_COMMAND' || command.builder === 'INTERACTION_COMMAND')
                             commands.push(command);
                     }
                 }
@@ -51,7 +51,7 @@ function loadModules(client) {
                     logger.error(`A message command name is not defined in ${script}`);
                     return false;
                 }
-                if (c.type === 'MESSAGE_COMMAND' && c.options.length && c.options.some(o => !o.name)) {
+                if (c.builder === 'MESSAGE_COMMAND' && c.options.length && c.options.some(o => !o.name)) {
                     logger.error(`A message command option name is not defined in ${script}`);
                     return false;
                 }

package/bin/reciple/registerInteractionCommands.d.ts

@@ -1,2 +1,5 @@
+import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
+import { SlashCommandBuilder } from '@discordjs/builders';
 import { RecipleClient } from "./classes/Client";
-export declare function registerInteractionCommands(client: RecipleClient): Promise<void>;
+import { ApplicationCommandData } from 'discord.js';
+export declare function registerInteractionCommands(client: RecipleClient, cmds?: (InteractionCommandBuilder | SlashCommandBuilder | ApplicationCommandData)[]): Promise<void>;

package/bin/reciple/registerInteractionCommands.js

@@ -10,23 +10,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerInteractionCommands = void 0;
-function registerInteractionCommands(client) {
-    var _a, _b, _c;
+function registerInteractionCommands(client, cmds) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const commands = Object.values(client.commands.INTERACTION_COMMANDS).map(c => c.toJSON());
+        const commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
+            if (typeof c.toJSON !== 'undefined')
+                return c.toJSON();
+            return c;
+        })) !== null && _a !== void 0 ? _a : [];
         if (!commands.length) {
             client.logger.warn('No interaction commands found.');
             return;
         }
-        if (!((_a = client.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.guilds.length)) {
-            yield ((_b = client.application) === null || _b === void 0 ? void 0 : _b.commands.set(commands).catch(e => client.logger.error(e)));
+        if (!((_b = client.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.guilds.length)) {
+            yield ((_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands).catch(e => client.logger.error(e)));
             client.logger.warn('No guilds were specified for interaction commands. Registered commands for all guilds.');
         }
         else {
             const guilds = typeof client.config.commands.interactionCommand.guilds === 'string' ? [client.config.commands.interactionCommand.guilds] : client.config.commands.interactionCommand.guilds;
             client.logger.warn(`Registering ${commands.length} interaction commands for ${guilds.length} guild(s).`);
             for (const guild of guilds) {
-                yield ((_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands, guild).catch(e => client.logger.error(e)));
+                yield ((_d = client.application) === null || _d === void 0 ? void 0 : _d.commands.set(commands, guild).catch(e => client.logger.error(e)));
                 client.logger.warn(`Registered ${commands.length} interaction commands for ${guild}.`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.0.19",
+  "version": "1.1.1",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -17,11 +17,11 @@
   ],
   "scripts": {
     "clean": "rimraf bin",
-    "compile": "npm run clean && tsc",
-    "build": "npm run compile && npm un reciple -g && npm i ./ -g",
-    "build:publish": "npm run build && npm publish",
+    "compile": "yarn clean && tsc",
+    "build": "yarn compile && npm un reciple -g && npm i ./ -g",
+    "build:publish": "yarn run build && npm publish",
     "test": "cd test && reciple",
-    "test:compile": "npm run build && npm run test:run"
+    "test:compile": "yarn run build && yarn test:run"
   },
   "dependencies": {
     "commander": "^9.2.0",