reciple 1.3.3 → 1.4.0

package/README.md

@@ -61,4 +61,4 @@ reciple
 > The name reciple is from a minecraft bug. The bug was a misspelling of the word `recipe`. [Mojang Reciple](https://bugs.mojang.com/browse/MC-225837)
 
 # Save the Earth
-[![](https://i.imgur.com/GbB1ZuH.png)](https://rebellion.global/)
+[#letTheEarthBreathe](https://rebellion.global/)

package/bin/bin.js

@@ -9,25 +9,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Config_1 = require("./reciple/classes/Config");
 const Client_1 = require("./reciple/classes/Client");
 const fs_1 = require("fs");
 const fallout_utility_1 = require("fallout-utility");
 require("dotenv/config");
+const flags_1 = require("./reciple/flags");
+const version_1 = require("./reciple/version");
+if (flags_1.flags.version) {
+    console.log(`v${version_1.version}`);
+    process.exit(0);
+}
 const allowedFiles = ['node_modules', 'reciple.yml', 'package.json', 'package.lock.json', 'modules.yml', '.rmmcache'];
 if ((0, fs_1.readdirSync)('./').filter(f => !f.startsWith('.') && allowedFiles.indexOf(f)).length > 0 && !(0, fs_1.existsSync)('./reciple.yml')) {
     const ask = (0, fallout_utility_1.input)('This directory does not contain reciple.yml. Would you like to init axis here? [y/n] ');
     if (ask !== 'y')
         process.exit(0);
 }
-const config = new Config_1.RecipleConfig('./reciple.yml').parseConfig().getConfig();
+const config = new Config_1.RecipleConfig((_a = flags_1.flags.config) !== null && _a !== void 0 ? _a : './reciple.yml').parseConfig().getConfig();
 const client = new Client_1.RecipleClient(Object.assign({ config: config }, config.client));
 (() => __awaiter(void 0, void 0, void 0, function* () {
     yield client.startModules();
     client.on('ready', () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        client.logger.warn(`Logged in as ${((_a = client.user) === null || _a === void 0 ? void 0 : _a.tag) || 'Unknown'}!`);
+        var _b;
+        client.logger.warn(`Logged in as ${((_b = client.user) === null || _b === void 0 ? void 0 : _b.tag) || 'Unknown'}!`);
         yield client.loadModules();
         client.addCommandListeners();
     }));

package/bin/index.d.ts

@@ -1,7 +1,10 @@
+import discord from 'discord.js';
+export declare const discordjs: typeof discord;
 export * from './reciple/classes/Client';
 export * from './reciple/classes/Config';
 export * from './reciple/classes/builders/InteractionCommandBuilder';
 export * from './reciple/classes/builders/MessageCommandBuilder';
+export * from './reciple/classes/builders/MessageCommandOptionBuilder';
 export * from './reciple/commandPermissions';
 export * from './reciple/flags';
 export * from './reciple/isIgnoredChannel';

package/bin/index.js

@@ -13,11 +13,18 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.discordjs = void 0;
+const discord_js_1 = __importDefault(require("discord.js"));
+exports.discordjs = discord_js_1.default;
 __exportStar(require("./reciple/classes/Client"), exports);
 __exportStar(require("./reciple/classes/Config"), exports);
 __exportStar(require("./reciple/classes/builders/InteractionCommandBuilder"), exports);
 __exportStar(require("./reciple/classes/builders/MessageCommandBuilder"), exports);
+__exportStar(require("./reciple/classes/builders/MessageCommandOptionBuilder"), exports);
 __exportStar(require("./reciple/commandPermissions"), exports);
 __exportStar(require("./reciple/flags"), exports);
 __exportStar(require("./reciple/isIgnoredChannel"), exports);

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

@@ -1,9 +1,9 @@
 import { ApplicationCommandDataResolvable, 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';
-import { commandBuilders } from '../registerInteractionCommands';
-import { RecipleScript } from '../modules';
+import { recipleCommandBuilders, RecipleScript } from '../modules';
+import { interactionCommandBuilders } from '../registerInteractionCommands';
+import { MessageCommandBuilder, RecipleMessageCommandExecute } from './builders/MessageCommandBuilder';
+import { Logger as LoggerConstructor } from 'fallout-utility';
 import { Config } from './Config';
 export interface RecipleClientOptions extends ClientOptions {
     config: Config;
@@ -23,13 +23,15 @@ export interface RecipleClientEvents extends ClientEvents {
 export declare class RecipleClient extends Client {
     config?: Config;
     commands: RecipleClientCommands;
-    otherApplicationCommandData: (commandBuilders | ApplicationCommandDataResolvable)[];
+    otherApplicationCommandData: (interactionCommandBuilders | ApplicationCommandDataResolvable)[];
     modules: RecipleScript[];
     logger: LoggerConstructor;
     version: string;
     constructor(options: RecipleClientOptions);
     startModules(): Promise<RecipleClient>;
     loadModules(): Promise<RecipleClient>;
+    addModule(script: RecipleScript, registerCommands?: boolean): Promise<void>;
+    addCommand(command: recipleCommandBuilders): RecipleClient;
     addCommandListeners(): RecipleClient;
     messageCommandExecute(message: Message): Promise<RecipleClient>;
     interactionCommandExecute(interaction: Interaction): Promise<RecipleClient>;

package/bin/reciple/classes/Client.js

@@ -17,13 +17,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 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 registerInteractionCommands_1 = require("../registerInteractionCommands");
-const logger_1 = require("../logger");
 const modules_1 = require("../modules");
-const version_1 = require("../version");
+const registerInteractionCommands_1 = require("../registerInteractionCommands");
+const fallout_utility_1 = require("fallout-utility");
 const commandPermissions_1 = require("../commandPermissions");
 const isIgnoredChannel_1 = require("../isIgnoredChannel");
+const version_1 = require("../version");
+const logger_1 = require("../logger");
 class RecipleClient extends discord_js_1.Client {
     constructor(options) {
         super(options);
@@ -49,12 +49,7 @@ class RecipleClient extends discord_js_1.Client {
             for (const command of modules.commands) {
                 if (!command.name)
                     continue;
-                if (command.builder === 'MESSAGE_COMMAND') {
-                    this.commands.MESSAGE_COMMANDS[command.name] = command;
-                }
-                else if (command.builder === 'INTERACTION_COMMAND') {
-                    this.commands.INTERACTION_COMMANDS[command.name] = command;
-                }
+                this.addCommand(command);
             }
             this.logger.info(`${Object.keys(this.commands.MESSAGE_COMMANDS).length} message commands loaded.`);
             this.logger.info(`${Object.keys(this.commands.INTERACTION_COMMANDS).length} interaction commands loaded.`);
@@ -69,11 +64,42 @@ class RecipleClient extends discord_js_1.Client {
                     yield Promise.resolve(module_.onLoad(this));
             }
             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, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
+            if (!((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.interactionCommand.registerCommands))
+                return this;
+            yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
             return this;
         });
     }
+    addModule(script, registerCommands = true) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.modules.push(script);
+            if (typeof (script === null || script === void 0 ? void 0 : script.onLoad) === 'function')
+                yield Promise.resolve(script.onLoad(this));
+            this.logger.info(`${this.modules.length} modules loaded.`);
+            for (const command of (_a = script.commands) !== null && _a !== void 0 ? _a : []) {
+                if (!command.name)
+                    continue;
+                this.addCommand(command);
+            }
+            if (!registerCommands || !((_b = this.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.registerCommands))
+                return;
+            yield (0, registerInteractionCommands_1.registerInteractionCommands)(this, [...Object.values(this.commands.INTERACTION_COMMANDS), ...this.otherApplicationCommandData]);
+        });
+    }
+    addCommand(command) {
+        var _a;
+        if (command.builder === 'MESSAGE_COMMAND') {
+            this.commands.MESSAGE_COMMANDS[command.name] = command;
+        }
+        else if (command.builder === 'INTERACTION_COMMAND') {
+            this.commands.INTERACTION_COMMANDS[command.name] = command;
+        }
+        else {
+            this.logger.error(`Command "${(_a = command.name) !== null && _a !== void 0 ? _a : 'unknown'}" has an invalid builder.`);
+        }
+        return this;
+    }
     addCommandListeners() {
         var _a, _b;
         if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.commands.messageCommand.enabled)

package/bin/reciple/classes/Config.js

@@ -49,20 +49,19 @@ class RecipleConfig {
         return this.config;
     }
     parseToken(askIfNull = true) {
+        var _a, _b;
         let token = flags_1.token || null;
-        if (token)
+        if (!this.config && !token)
             return token;
-        if (!this.config)
-            return token;
-        if (!this.config.token)
+        if (this.config && !((_a = this.config) === null || _a === void 0 ? void 0 : _a.token) && !token)
             return token || (askIfNull ? this.askToken() : null);
-        const envToken = this.config.token.toString().split(':');
+        token = token || ((_b = this.config) === null || _b === void 0 ? void 0 : _b.token) || null;
+        if (!token)
+            return token;
+        const envToken = token.toString().split(':');
         if (envToken.length === 2 && envToken[0].toLocaleLowerCase() === 'env' && envToken[1]) {
             token = process.env[envToken[1]] || null;
         }
-        else {
-            token = this.config.token;
-        }
         return token || (askIfNull ? this.askToken() : null);
     }
     isSupportedConfig() {

package/bin/reciple/commandPermissions.d.ts

@@ -1,5 +1,4 @@
 import { Permissions } from "discord.js";
-import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
-import { MessageCommandBuilder } from './classes/builders/MessageCommandBuilder';
 import { Config } from "./classes/Config";
-export declare function commandPermissions(commandName: string, memberPermissions?: Permissions, configConmmandPermissions?: Config['permissions']['messageCommands'] | Config['permissions']['interactionCommands'], builder?: InteractionCommandBuilder | MessageCommandBuilder): boolean;
+import { recipleCommandBuilders } from './modules';
+export declare function commandPermissions(commandName: string, memberPermissions?: Permissions, configConmmandPermissions?: Config['permissions']['messageCommands'] | Config['permissions']['interactionCommands'], builder?: recipleCommandBuilders): boolean;

package/bin/reciple/flags.js

@@ -4,6 +4,8 @@ exports.token = exports.flags = void 0;
 const commander_1 = require("commander");
 exports.flags = commander_1.program
     .option('-t, --token <token>', 'Replace used bot token')
+    .option('-c, --config <config>', 'Change path to config file')
     .option('-D, --debugmode', 'Enabled debug mode')
+    .option('-v, --version', 'Display version')
     .parse().opts();
 exports.token = exports.flags.token;

package/bin/reciple/modules.d.ts

@@ -1,14 +1,15 @@
 import { RecipleClient } from './classes/Client';
-import { MessageCommandBuilder } from './classes/builders/MessageCommandBuilder';
-import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
-export declare type recipleCommands = (MessageCommandBuilder | InteractionCommandBuilder)[];
+import { MessageCommandBuilder, RecipleMessageCommandExecute } from './classes/builders/MessageCommandBuilder';
+import { InteractionCommandBuilder, RecipleInteractionCommandExecute } from './classes/builders/InteractionCommandBuilder';
+export declare type recipleCommandBuilders = MessageCommandBuilder | InteractionCommandBuilder;
+export declare type recipleCommandBuildersExecute = RecipleInteractionCommandExecute | RecipleMessageCommandExecute;
 export declare type loadedModules = {
-    commands: recipleCommands;
+    commands: recipleCommandBuilders[];
     modules: RecipleModule[];
 };
-export interface RecipleScript {
+export declare class RecipleScript {
     versions: string | string[];
-    commands?: (MessageCommandBuilder | InteractionCommandBuilder)[];
+    commands?: recipleCommandBuilders[];
     onLoad?(reciple: RecipleClient): void | Promise<void>;
     onStart(reciple: RecipleClient): boolean | Promise<boolean>;
 }

package/bin/reciple/registerInteractionCommands.d.ts

@@ -1,6 +1,6 @@
 import { InteractionCommandBuilder } from './classes/builders/InteractionCommandBuilder';
 import { RecipleClient } from "./classes/Client";
-import { ApplicationCommandDataResolvable, GuildResolvable } from 'discord.js';
+import { ApplicationCommandDataResolvable } from 'discord.js';
 import { ContextMenuCommandBuilder, SlashCommandBuilder, SlashCommandSubcommandBuilder, SlashCommandOptionsOnlyBuilder, SlashCommandSubcommandGroupBuilder, SlashCommandSubcommandsOnlyBuilder } from '@discordjs/builders';
-export declare type commandBuilders = InteractionCommandBuilder | ContextMenuCommandBuilder | SlashCommandBuilder | SlashCommandSubcommandBuilder | SlashCommandOptionsOnlyBuilder | SlashCommandSubcommandGroupBuilder | SlashCommandSubcommandsOnlyBuilder;
-export declare function registerInteractionCommands(client: RecipleClient, cmds?: (commandBuilders | ApplicationCommandDataResolvable)[], overwriteGuilds?: GuildResolvable | GuildResolvable[]): Promise<void>;
+export declare type interactionCommandBuilders = InteractionCommandBuilder | ContextMenuCommandBuilder | SlashCommandBuilder | SlashCommandSubcommandBuilder | SlashCommandOptionsOnlyBuilder | SlashCommandSubcommandGroupBuilder | SlashCommandSubcommandsOnlyBuilder;
+export declare function registerInteractionCommands(client: RecipleClient, cmds?: (interactionCommandBuilders | ApplicationCommandDataResolvable)[], overwriteGuilds?: string | string[]): Promise<void>;

package/bin/reciple/registerInteractionCommands.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerInteractionCommands = void 0;
 function registerInteractionCommands(client, cmds, overwriteGuilds) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         let commands = (_a = Object.values(cmds !== null && cmds !== void 0 ? cmds : client.commands.INTERACTION_COMMANDS).map(c => {
             var _a, _b, _c, _d, _e, _f, _g;
@@ -36,16 +36,18 @@ function registerInteractionCommands(client, cmds, overwriteGuilds) {
         const configGuilds = overwriteGuilds !== null && overwriteGuilds !== void 0 ? overwriteGuilds : (_b = client.config) === null || _b === void 0 ? void 0 : _b.commands.interactionCommand.guilds;
         const guilds = typeof configGuilds === 'object' ? configGuilds : [configGuilds];
         if (!guilds || !(guilds === null || guilds === void 0 ? void 0 : guilds.length)) {
-            yield ((_d = (_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands)) === null || _d === void 0 ? void 0 : _d.catch(e => client.logger.error(e)));
-            client.logger.warn('No guilds were specified for interaction commands. Registered commands for all guilds.');
+            (_c = client.application) === null || _c === void 0 ? void 0 : _c.commands.set(commands).then(() => {
+                client.logger.warn('No guilds were specified for interaction commands. Registered commands for all guilds.');
+            }).catch(e => client.logger.error(e));
         }
         else {
             client.logger.warn(`Registering ${commands.length} interaction commands for ${guilds.length} guild(s).`);
             for (const guild of guilds) {
                 if (!guild)
                     continue;
-                yield ((_f = (_e = client.application) === null || _e === void 0 ? void 0 : _e.commands.set(commands, guild)) === null || _f === void 0 ? void 0 : _f.catch(e => client.logger.error(e)));
-                client.logger.warn(`Registered ${commands.length} interaction commands for ${guild}.`);
+                (_d = client.application) === null || _d === void 0 ? void 0 : _d.commands.set(commands, guild).then(() => {
+                    client.logger.warn(`Registered ${commands.length} interaction commands for ${guild}.`);
+                }).catch(e => client.logger.error(e));
             }
         }
     });

package/package.json

@@ -1,39 +1,39 @@
 {
-  "name": "reciple",
-  "version": "1.3.3",
-  "description": "A Discord.js bot",
-  "author": "FalloutStudios",
-  "license": "GPL-3.0",
-  "main": "bin/index.js",
-  "bin": {
-    "reciple": "bin/bin.js"
-  },
-  "files": [
-    "bin",
-    "resource",
-    "package.json",
-    "LICENSE",
-    "README.md"
-  ],
-  "scripts": {
-    "clean": "rimraf bin",
-    "compile": "yarn clean && tsc",
-    "build": "yarn compile && npm un reciple -g && npm i ./ -g",
-    "build:publish": "yarn run build && yarn run changelog && yarn publish",
-    "test": "cd test && reciple",
-    "test:build": "yarn run build && yarn test:run"
-  },
-  "dependencies": {
-    "commander": "^9.3.0",
-    "discord.js": "^13.8.0",
-    "dotenv": "^16.0.1",
-    "fallout-utility": "^1.3.14",
-    "semver": "^7.3.7",
-    "yaml": "^2.1.1"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.41",
-    "@types/semver": "^7.3.9",
-    "typescript": "^4.7.3"
-  }
+    "name": "reciple",
+    "version": "1.4.0",
+    "description": "A Discord.js bot",
+    "author": "FalloutStudios",
+    "license": "GPL-3.0",
+    "main": "bin/index.js",
+    "bin": {
+        "reciple": "bin/bin.js"
+    },
+    "files": [
+        "bin",
+        "resource",
+        "package.json",
+        "LICENSE",
+        "README.md"
+    ],
+    "scripts": {
+        "clean": "rimraf bin",
+        "compile": "yarn clean && tsc",
+        "build": "yarn compile && npm un reciple -g && npm i ./ -g",
+        "build:publish": "yarn run build && yarn run changelog && yarn publish",
+        "test": "cd test && reciple",
+        "test:build": "yarn run build && yarn test:run"
+    },
+    "dependencies": {
+        "commander": "^9.3.0",
+        "discord.js": "^13.8.0",
+        "dotenv": "^16.0.1",
+        "fallout-utility": "^1.3.14",
+        "semver": "^7.3.7",
+        "yaml": "^2.1.1"
+    },
+    "devDependencies": {
+        "@types/node": "^17.0.41",
+        "@types/semver": "^7.3.9",
+        "typescript": "^4.7.3"
+    }
 }

package/resource/reciple.yml

@@ -86,8 +86,7 @@ messages:
     ephemeral: true
 
 # Ignored Files
-ignoredFiles:
-  - 'test.js'
+ignoredFiles: []
 
 
 ###################################################