Allow some channel types to not depend on Client

projectdysnomia · Oct 25, 2023 · 22f1ea3 · 22f1ea3
1 parent d42e242
commit 22f1ea3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/structures/GuildChannel.js b/lib/structures/GuildChannel.js
@@ -17,7 +17,7 @@ class GuildChannel extends Channel {
          * The guild that owns the channel
          * @type {Guild}
          */
-        this.guild = client.guilds.get(data.guild_id) || {
+        this.guild = client?.guilds.get(data.guild_id) || {
             id: data.guild_id
         };
 

diff --git a/lib/structures/PrivateChannel.js b/lib/structures/PrivateChannel.js
@@ -3,7 +3,7 @@
 const Channel = require("./Channel");
 const Collection = require("../util/Collection");
 const Message = require("./Message");
-const {ChannelTypes} = require("../Constants");
+const {ChannelTypes, DefaultClientOptions} = require("../Constants");
 const User = require("./User");
 
 /**
@@ -33,7 +33,7 @@ class PrivateChannel extends Channel {
          * Collection of Messages in this channel
          * @type {Collection<Message>}
          */
-        this.messages = new Collection(Message, client.options.messageLimit);
+        this.messages = new Collection(Message, client?.options.messageLimit ?? DefaultClientOptions.messageLimit);
     }
 
     /**

diff --git a/lib/structures/TextChannel.js b/lib/structures/TextChannel.js
@@ -4,6 +4,7 @@ const Collection = require("../util/Collection");
 const GuildChannel = require("./GuildChannel");
 const Message = require("./Message");
 const PermissionOverwrite = require("./PermissionOverwrite");
+const Constants = require("../Constants");
 
 /**
 * Represents a guild text channel. See GuildChannel for more properties and methods.
@@ -18,7 +19,7 @@ class TextChannel extends GuildChannel {
          * Collection of Messages in this channel
          * @type {Collection<Message>}
          */
-        this.messages = new Collection(Message, messageLimit == null ? client.options.messageLimit : messageLimit);
+        this.messages = new Collection(Message, messageLimit == null ? (client?.options.messageLimit ?? Constants.DefaultClientOptions.messageLimit) : messageLimit);
         /**
          * The ID of the last message in this channel
          * @type {String?}

diff --git a/lib/structures/TextVoiceChannel.js b/lib/structures/TextVoiceChannel.js
@@ -3,6 +3,7 @@
 const VoiceChannel = require("./VoiceChannel");
 const Collection = require("../util/Collection");
 const Message = require("./Message");
+const Constants = require("../Constants");
 
 /**
 * Represents a Text-in-Voice channel. See VoiceChannel for more properties and methods.
@@ -17,7 +18,7 @@ class TextVoiceChannel extends VoiceChannel {
          * Collection of Messages in this channel
          * @type {Collection<Message>}
          */
-        this.messages = new Collection(Message, messageLimit == null ? client.options.messageLimit : messageLimit);
+        this.messages = new Collection(Message, messageLimit == null ? (client.options.messageLimit ?? Constants.DefaultClientOptions.messageLimit) : messageLimit);
         /**
          * Whether the channel is an NSFW channel or not
          * @type {Boolean}