@somehiddenkey/discord-command-utils 1.0.3 → 1.2.0

package/README.md

@@ -1,20 +1,12 @@
 # DiscordUtilsLibrary
 The purpose of this Library is to hide and abstract many of the common aspects that comes with coding discord bots in javascript. The main focus is configurations as well as registering all types of commands and interactions between different guilds.
-## Installation
-### SSH Installation
-Use this if your GitHub account already has SSH access -> requires SSH key set up
+## Setup
+1. Installation
 ```bash
-npm install git+ssh://git@github.com/studytogether-discord/DiscordUtilsLibrary.git
+npm install @somehiddenkey/discord-command-utils --registry=https://registry.npmjs.org/
 ```
 
-### HTTPS Installation
-If you want to use HTTPS instead, you must use a GitHub Personal Access Token (classic) with repo permissions (replace "TOKEN" with your PAT)
-```bash
-npm install "https://TOKEN@github.com/studytogether-discord/DiscordUtilsLibrary.git"
-```
-
-### Libary Import
-Then import it in your code
+2. Libary Import
 ```c#
 import { Something } from "DiscordUtilsLibrary";
 // or
@@ -137,7 +129,7 @@ bot.on(Events.MessageCreate, async (message) => {
 });
 
 bot.on(Events.InteractionCreate, async (interaction) => 
-  await interactionContainer.call_interaction(message, e => consola.error(e))
+  await interactionContainer.call_interaction(interaction, e => consola.error(e))
 );
 ```
 ### Register slash commands to REST

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@somehiddenkey/discord-command-utils",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "A utility library for building Discord bot commands using discord.js",
   "author": {
     "email": "k3y.throwaway@gmail.com",

package/src/Configs/LocalConfig.js

@@ -1,3 +1,7 @@
+import fs from 'fs';
+import ConfigError from "./ConfigError.js";
+import consola from 'consola';
+
 /**
  * @typedef {string} Snowflake
  */
@@ -22,7 +26,7 @@ export default class LocalConfig {
         this.restOptions = data.rest_options || {};
         this.activity = data.activity || {};
 
-        if(!this.client_id)
+        if(!this.clientId)
             throw new ConfigError('No client_id initialized for LocalConfig');
     }
 
@@ -30,7 +34,7 @@ export default class LocalConfig {
      * Loads the JSON file and returns a GlobalConfig instance.
      * @param {string} path
      * @param {string} environment
-     * @returns {GlobalConfig}
+     * @returns {LocalConfig}
      */
     static async load(path, environment) {
         var json
@@ -38,12 +42,12 @@ export default class LocalConfig {
             const raw = fs.readFileSync(path, { encoding: 'utf8', flag: 'r' });
             json = JSON.parse(raw);
         } catch (error) {
-            consola.error(`Failed to load GlobalConfig from path: ${path}`, error);
+            consola.error(`Failed to load LocalConfig from path: ${path}`, error);
             throw error;
         }
         if (environment == "production") 
-            return new GlobalConfig({...json.production || json.activity});
+            return new LocalConfig({...json.production || json.activity});
         else 
-            return new GlobalConfig({...json.development || json.activity});
+            return new LocalConfig({...json.development || json.activity});
     }
 }

package/src/Interactions/Interaction.js

@@ -44,9 +44,9 @@ export default class Interaction {
      */
     static On(custom_id, type, scope, target) {
         if(Array.isArray(scope))
-            scope.forEach(s => InteractionContainer.add(new Interaction(custom_id, s, type, target)));
+            scope.forEach(s => InteractionContainer.add(new Interaction(custom_id, type, s, target)));
         else;
-            InteractionContainer.add(new Interaction(custom_id, scope, type, target));
+            InteractionContainer.add(new Interaction(custom_id, type, scope, target));
         return custom_id;
     }
 

package/src/Interactions/InteractionContainer.js

@@ -74,7 +74,10 @@ export default class InteractionContainer {
      */
     call_message_interaction(interaction, on_error = async () => {}) {
         if (interaction.author.bot) return;
-        
+
+        if(!interaction.content.startsWith(this.#local_config.prefix))
+            return;
+
         const scope = 
             (interaction.channel.type === ChannelType.DM) ? 
             InteractionScope.DM : this.#global_config.guilds.get_scope(interaction.guild.id); 
@@ -82,7 +85,7 @@ export default class InteractionContainer {
         const customId = interaction.content.slice(this.#local_config.prefix?.length)
 
         return InteractionContainer
-            .#call(InteractionType.Message, scope, customId, interaction)
+            .#call(InteractionType.Message, scope, [customId], interaction)
             .catch(error => {
                 if (error instanceof CommandError)
                     return error.error_as_message()
@@ -137,16 +140,16 @@ export default class InteractionContainer {
      * 
      * @param {InteractionType} type 
      * @param {InteractionScope} scope 
-     * @param {InteractionID} customId 
+     * @param {InteractionID[]} customId 
      * @param {DiscordBaseInteraction} interaction 
      * @returns {Promise<any>}
      * @throws {CommandError}
      */
-    static #call(type, scope, customId, interaction) {
+    static async #call(type, scope, customId, interaction) {
         const interaction_command = InteractionContainer.get(type, scope, customId?.[0]);
         if(!interaction_command) 
-            return consola.error(`No interaction found for id ${customId}`);
+            return consola.error(`No interaction found for id ${customId.join('?')} with type ${type} and scope ${scope}`);
 
-        return interaction_command.interaction_command_function.apply(null, [interaction, ...customId.slice(1)]);
+        return await interaction_command.interaction_command_function.apply(null, [interaction, ...customId.slice(1)]);
     }
 }