@somehiddenkey/discord-command-utils 2.1.1 → 2.1.2

package/package.json

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

package/src/Configs/GlobalConfig/GlobalConfig.js

@@ -5,17 +5,21 @@
 import fs from 'fs';
 import consola from 'consola';
 import { InteractionScope } from "../../Utils/enums.js";
-import {default as GuildMain} from './GlobalConfigMain.js';
-import {default as GuildCommunity} from './GlobalConfigCommunity.js';
-import {default as GuildTutor} from './GlobalConfigTutor.js';
-import {default as GuildStaff} from './GlobalConfigStaff.js';
+import GuildMain from './GlobalConfigMain.js';
+import GuildCommunity from './GlobalConfigCommunity.js';
+import GuildTutor from './GlobalConfigTutor.js';
+import GuildStaff from './GlobalConfigStaff.js';
 import { GuildBased } from '../NestedGlobalConfig.js';
 import { Client } from 'discord.js';
 
 export default class GlobalConfig {
+    /** @type {GuildMain} */
     main
+    /** @type {GuildCommunity} */
     community
+    /** @type {GuildTutor} */
     tutor
+    /** @type {GuildStaff} */
     staff
     
     /**

package/src/Configs/GlobalConfig/GlobalConfigCommunity.js

@@ -7,14 +7,14 @@ import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;
 
-export default class Guild extends GuildBased {
-    /** @type {Categories} */
+export default class GuildCommunity extends GuildBased {
+    /** @type {CategoriesCommunity} */
     categories;
-    /** @type {Channels} */
+    /** @type {ChannelsCommunity} */
     channels;
-    /** @type {Logs} */
+    /** @type {LogsCommunity} */
     logs;
-    /** @type {Roles} */
+    /** @type {RolesCommunity} */
     roles;
 
     constructor(data) {
@@ -22,17 +22,17 @@ export default class Guild extends GuildBased {
             throw new ConfigError('No data initialized for GlobalConfig');
 
         super(data);
-        this.categories = new Categories(data.categories, data.id);
-        this.channels = new Channels(data.channels, data.id);
-        this.logs = new Logs(data.logs, data.id);
-        this.roles = new Roles(data.roles, data.id);
+        this.categories = new CategoriesCommunity(data.categories, data.id);
+        this.channels = new ChannelsCommunity(data.channels, data.id);
+        this.logs = new LogsCommunity(data.logs, data.id);
+        this.roles = new RolesCommunity(data.roles, data.id);
     }
 }
 
-class Categories extends ChannelBased {}
+class CategoriesCommunity extends ChannelBased {}
 
 class Channels extends ChannelBased {}
 
-class Logs extends ChannelBased {}
+class LogsCommunity extends ChannelBased {}
 
-class Roles extends RoleBased {}
+class RolesCommunity extends RoleBased {}

package/src/Configs/GlobalConfig/GlobalConfigMain.js

@@ -7,14 +7,14 @@ import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;
 
-export default class Guild extends GuildBased {
-    /** @type {Categories} */
+export default class GuildMain extends GuildBased {
+    /** @type {CategoriesMain} */
     categories;
-    /** @type {Channels} */
+    /** @type {ChannelsMain} */
     channels;
-    /** @type {Logs} */
+    /** @type {LogsMain} */
     logs;
-    /** @type {Roles} */
+    /** @type {RolesMain} */
     roles;
 
     constructor(data, bot) {
@@ -22,14 +22,14 @@ export default class Guild extends GuildBased {
             throw new ConfigError('No data initialized for GlobalConfig');
 
         super(data, bot);
-        this.categories = new Categories(data.categories, this.guild);
-        this.channels = new Channels(data.channels, this.guild);
-        this.logs = new Logs(data.logs, this.guild);
-        this.roles = new Roles(data.roles, this.guild);
+        this.categories = new CategoriesMain(data.categories, this.guild);
+        this.channels = new ChannelsMain(data.channels, this.guild);
+        this.logs = new LogsMain(data.logs, this.guild);
+        this.roles = new RolesMain(data.roles, this.guild);
     }
 }
 
-class Categories extends ChannelBased {
+class CategoriesMain extends ChannelBased {
     /** @type {Set<Snowflake>} */
     custom_rooms;       
     /** @type {Set<Snowflake>} */
@@ -72,7 +72,7 @@ class Categories extends ChannelBased {
     }
 }
 
-class Channels extends ChannelBased {
+class ChannelsMain extends ChannelBased {
     /** @type {GuildBasedChannel} */
     timer_control;
     /** @type {GuildBasedChannel} */
@@ -101,7 +101,7 @@ class Channels extends ChannelBased {
     welcome;
 }
 
-class Logs extends ChannelBased {
+class LogsMain extends ChannelBased {
     /** @type {GuildBasedChannel} */
     error;
     /** @type {GuildBasedChannel} */
@@ -118,7 +118,7 @@ class Logs extends ChannelBased {
     communities;
 }
 
-class Roles extends RoleBased {
+class RolesMain extends RoleBased {
     /** @type {Snowflake} */
     cuckoo_ping;
     /** @type {Snowflake} */

package/src/Configs/GlobalConfig/GlobalConfigStaff.js

@@ -7,14 +7,14 @@ import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;
 
-export default class Guild extends GuildBased {
-    /** @type {Categories} */
+export default class GuildStaff extends GuildBased {
+    /** @type {CategoriesStaff} */
     categories;
-    /** @type {Channels} */
+    /** @type {ChannelsStaff} */
     channels;
-    /** @type {Logs} */
+    /** @type {LogsStaff} */
     logs;
-    /** @type {Roles} */
+    /** @type {RolesStaff} */
     roles;
 
     constructor(data, bot) {
@@ -22,17 +22,17 @@ export default class Guild extends GuildBased {
             throw new ConfigError('No data initialized for GlobalConfig');
 
         super(data, bot);
-        this.categories = new Categories(data.categories, data.id);
-        this.channels = new Channels(data.channels, data.id);
-        this.logs = new Logs(data.logs, data.id);
-        this.roles = new Roles(data.roles, data.id);
+        this.categories = new CategoriesStaff(data.categories, data.id);
+        this.channels = new ChannelsStaff(data.channels, data.id);
+        this.logs = new LogsStaff(data.logs, data.id);
+        this.roles = new RolesStaff(data.roles, data.id);
     }
 }
 
-class Categories extends ChannelBased {}
+class CategoriesStaff extends ChannelBased {}
 
-class Channels extends ChannelBased {}
+class ChannelsStaff extends ChannelBased {}
 
-class Logs extends ChannelBased {}
+class LogsStaff extends ChannelBased {}
 
-class Roles extends RoleBased {}
+class RolesStaff extends RoleBased {}

package/src/Configs/GlobalConfig/GlobalConfigTutor.js

@@ -7,14 +7,14 @@ import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;
 
-export default class Guild extends GuildBased {
-    /** @type {Categories} */
+export default class GuildTutor extends GuildBased {
+    /** @type {CategoriesTutor} */
     categories;
-    /** @type {Channels} */
+    /** @type {ChannelsTutor} */
     channels;
-    /** @type {Logs} */
+    /** @type {LogsTutor} */
     logs;
-    /** @type {Roles} */
+    /** @type {RolesTutor} */
     roles;
 
     constructor(data, bot) {
@@ -22,17 +22,17 @@ export default class Guild extends GuildBased {
             throw new ConfigError('No data initialized for GlobalConfig');
 
         super(data, bot);
-        this.categories = new Categories(data.categories, data.id);
-        this.channels = new Channels(data.channels, data.id);
-        this.logs = new Logs(data.logs, data.id);
-        this.roles = new Roles(data.roles, data.id);
+        this.categories = new CategoriesTutor(data.categories, data.id);
+        this.channels = new ChannelsTutor(data.channels, data.id);
+        this.logs = new LogsTutor(data.logs, data.id);
+        this.roles = new RolesTutor(data.roles, data.id);
     }
 }
 
-class Categories extends ChannelBased {}
+class CategoriesTutor extends ChannelBased {}
 
-class Channels extends ChannelBased {}
+class ChannelsTutor extends ChannelBased {}
 
-class Logs extends ChannelBased {}
+class LogsTutor extends ChannelBased {}
 
-class Roles extends RoleBased {}
+class RolesTutor extends RoleBased {}

package/src/Configs/SecretConfig.js

@@ -27,7 +27,7 @@ export default class SecretConfig {
         this.token = env.TOKEN;
 
         var databaseConfigs = [];
-        for (let index = 0, section = "DATABASE__"+index; !!env[section+"__NAME"]; index++) {
+        for (let index = 0, section = "DATABASE__"+index; !!env[section+"__NAME"]; index++, section = "DATABASE__"+index) {
             try {
                 let db_config = {
                     client: 'mysql',