reciple 1.1.0 → 1.1.3

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

@@ -1,7 +1,8 @@
-import { Client, ClientEvents, ClientOptions, Interaction, Message } from 'discord.js';
+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 { Config } from './Config';
 export interface RecipleClientOptions extends ClientOptions {
@@ -22,6 +23,7 @@ export interface RecipleClientEvents extends ClientEvents {
 export declare class RecipleClient extends Client {
     config?: Config;
     commands: RecipleClientCommands;
+    otherApplicationCommandData: (commandBuilders | ApplicationCommandDataResolvable)[];
     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);
@@ -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;
         });
     }

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

@@ -1,4 +1,4 @@
-import { ClientOptions, InteractionReplyOptions, MessageOptions, PermissionResolvable } from 'discord.js';
+import { ClientOptions, MessagePayload, PermissionResolvable } from 'discord.js';
 export interface Config {
     token: string;
     prefix: string;
@@ -44,7 +44,7 @@ export interface Config {
     };
     client: ClientOptions;
     messages: {
-        [key: string]: MessageOptions | InteractionReplyOptions | string;
+        [key: string]: MessagePayload | string;
     };
     modulesFolder: string;
     version?: string;

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

@@ -1,13 +1,7 @@
 import { Message, PermissionFlags } from 'discord.js';
 import { Command } from 'fallout-utility';
 import { RecipleClient } from '../Client';
-export interface CommandMessage extends Command {
-    command?: string;
-    args?: string[];
-    raw?: string;
-    prefix?: string;
-    separator?: string;
-}
+export declare type CommandMessage = Command;
 export interface RecipleMessageCommandExecute {
     message: Message;
     command: CommandMessage;

package/bin/reciple/registerInteractionCommands.d.ts

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

package/bin/reciple/registerInteractionCommands.js

@@ -11,26 +11,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerInteractionCommands = void 0;
 function registerInteractionCommands(client, cmds) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
         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) {
+        if (!commands || !commands.length) {
             client.logger.warn('No interaction commands found.');
             return;
         }
         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)));
+            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.');
         }
         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 ((_d = client.application) === null || _d === void 0 ? void 0 : _d.commands.set(commands, guild).catch(e => client.logger.error(e)));
+                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}.`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reciple",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "A Discord.js bot",
   "author": "FalloutStudios",
   "license": "GPL-3.0",
@@ -19,19 +19,19 @@
     "clean": "rimraf bin",
     "compile": "yarn clean && tsc",
     "build": "yarn compile && npm un reciple -g && npm i ./ -g",
-    "build:publish": "yarn run build && npm publish",
+    "build:publish": "yarn run build && yarn publish",
     "test": "cd test && reciple",
     "test:compile": "yarn run build && yarn test:run"
   },
   "dependencies": {
     "commander": "^9.2.0",
-    "discord.js": "^13.6.0",
-    "dotenv": "^16.0.0",
-    "fallout-utility": "^1.3.13",
-    "yaml": "^2.0.1"
+    "discord.js": "^13.7.0",
+    "dotenv": "^16.0.1",
+    "fallout-utility": "^1.3.14",
+    "yaml": "^2.1.0"
   },
   "devDependencies": {
-    "@types/node": "^17.0.24",
-    "typescript": "^4.6.3"
+    "@types/node": "^17.0.33",
+    "typescript": "^4.6.4"
   }
 }

package/resource/reciple.yml

@@ -1,41 +1,69 @@
+# Your bot token here
+# To use env variable as a token just do it like this env:TOKEN_ENV
 token: TOKEN
+
+# Message command prefix
 prefix: '!'
 
+
+# Commands options
 commands:
   messageCommand:
+    # enable message commands
     enabled: true
+    # reply when an error occured
     replyOnError: false
+    # command argument separator
     commandArgumentSeparator: ' '
   interactionCommand:
+    # enable interaction commands
     enabled: true
+    # reply when an error occured
     replyOnError: false
+    # register interaction commands on bot ready
     registerCommands: true
+    # register commands to specific guild(s) empty to make it global
     guilds: []
 
+
+# Commands permissions
 permissions:
   messageCommands:
+    # enable command permissions
     enabled: true
     commands:
       - command: 'stop'
         permissions: ['ADMINISTRATOR']
   interactionCommands:
+    # enable command permissions
     enabled: true
     commands:
       - command: 'stop'
         permissions: ['ADMINISTRATOR']
 
 
+# Ignored channel IDs
 ignoredChannels:
+  # enable ignored channels
   enabled: false
+  # convert to only allowed channels
   convertToAllowList: false
+  # channel IDs
   channels: []
 
+
+# Logger options
 fileLogging:
+  # enable console output to file
   enabled: true
+  # enable debug mode
   debugmode: false
+  # stringify logged JSONs
   stringifyLoggedJSON: false
+  # log file path
   logFilePath: './logs/latest.log'
 
+# Client options
 client:
   intents:
     - 'GUILDS'
@@ -45,6 +73,7 @@ client:
     - 'GUILD_MESSAGES'
     - 'GUILD_MESSAGE_REACTIONS'
 
+# Bot replies
 messages:
   notEnoughArguments: 'Not enough arguments.'
   noPermissions:
@@ -54,6 +83,20 @@ messages:
     content: 'An error occurred.'
     ephemeral: true
 
+
+###################################################
+#                                                 #
+#   #####  #####  #    #   ###   #####  ####      #
+#   #   #  #   #  # #  #  #      #      #   #     #
+#   #   #  #####  #  # #  # ###  ###    ####      #
+#   #  #   #   #  #    #  #   #  #      #   #     #
+#   ###    #   #  #    #   ###   #####  #    #    #
+#                                                 #
+###################################################
+## Modifying these values below can cause errors ##
+
+# Modules folder
 modulesFolder: 'modules'
 
-version: VERSION
+# Current version
+version: VERSION