@somehiddenkey/discord-command-utils 2.0.0 → 2.0.1

package/package.json

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

package/src/Configs/GlobalConfig/GlobalConfigCommunity.js

@@ -2,7 +2,7 @@
  * @typedef {string} Snowflake
  */
 
-import ConfigError from "./ConfigError.js";
+import ConfigError from "../ConfigError.js";
 import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;

package/src/Configs/GlobalConfig/GlobalConfigMain.js

@@ -2,7 +2,7 @@
  * @typedef {string} Snowflake
  */
 
-import ConfigError from "./ConfigError.js";
+import ConfigError from "../ConfigError.js";
 import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;
@@ -22,10 +22,10 @@ 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 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);
     }
 }
 

package/src/Configs/GlobalConfig/GlobalConfigStaff.js

@@ -0,0 +1,38 @@
+/**
+ * @typedef {string} Snowflake
+ */
+
+import ConfigError from "../ConfigError.js";
+import pkg from 'discord.js';
+import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
+const { GuildBasedChannel } = pkg;
+
+export default class Guild extends GuildBased {
+    /** @type {Categories} */
+    categories;
+    /** @type {Channels} */
+    channels;
+    /** @type {Logs} */
+    logs;
+    /** @type {Roles} */
+    roles;
+
+    constructor(data) {
+        if (!data) 
+            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);
+    }
+}
+
+class Categories extends ChannelBased {}
+
+class Channels extends ChannelBased {}
+
+class Logs extends ChannelBased {}
+
+class Roles extends RoleBased {}

package/src/Configs/GlobalConfig/GlobalConfigTutor.js

@@ -2,7 +2,7 @@
  * @typedef {string} Snowflake
  */
 
-import ConfigError from "./ConfigError.js";
+import ConfigError from "../ConfigError.js";
 import pkg from 'discord.js';
 import { GuildBased, ChannelBased, RoleBased } from '../NestedGlobalConfig.js';
 const { GuildBasedChannel } = pkg;

package/src/Configs/NestedGlobalConfig.js

@@ -3,8 +3,10 @@
  */
 
 import Fetchable from './Fetchable.js';
+import {Guild} from 'discord.js';
 
 export class GuildBased extends Fetchable {
+    /** @type {Guild} */
     guild;
     categories;
     channels;
@@ -20,13 +22,17 @@ export class GuildBased extends Fetchable {
     }
 
     constructor(data){
-        this._guild = this._createLazyObject(data.id);
+        this.guild = this._createLazyObject(data.id);
         this._config_keys = Object.keys(data).filter(k => k !== 'id').push('guild');
     }
 }
 
 export class ChannelBased extends Fetchable {
-    constructor(data) {
+    /** @type {Guild} */
+    #guild;
+
+    constructor(data, guild) {
+        this.#guild = guild;
         super(data);
     }
 
@@ -35,12 +41,16 @@ export class ChannelBased extends Fetchable {
      * @returns {Proxy}
      */
     _createLazyObject(id) {
-        return super._createLazyObject(id, async (id) => await bot.channels.fetch(id));
+        return super._createLazyObject(id, async (id) => await this.#guild.fetch().then(guild => guild.channels.fetch(id)));
     }
 }
 
 export class RoleBased extends Fetchable {
+    /** @type {Guild} */
+    #guild;
+
     constructor(data) {
+        this.#guild = guild;
         super(data);
     }
 
@@ -49,6 +59,6 @@ export class RoleBased extends Fetchable {
      * @returns {Proxy}
      */
     _createLazyObject(id) {
-        return super._createLazyObject(id, async (id) => await bot.roles.fetch(id));
+        return super._createLazyObject(id, async (id) => await this.#guild.fetch().then(guild => guild.roles.fetch(id)));
     }
 }