From 86483eae5b20f01c5f9879ff58dee6f055c4fced Mon Sep 17 00:00:00 2001 From: Awesome Stickz Date: Mon, 26 Oct 2020 01:01:59 +0530 Subject: [PATCH 1/2] fix(ChannelManager): Avoid crash in remove method with uncached channel --- src/managers/ChannelManager.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/managers/ChannelManager.js b/src/managers/ChannelManager.js index 8d7d71e720d9..426f031cc909 100644 --- a/src/managers/ChannelManager.js +++ b/src/managers/ChannelManager.js @@ -41,8 +41,10 @@ class ChannelManager extends BaseManager { remove(id) { const channel = this.cache.get(id); - if (channel.guild) channel.guild.channels.cache.delete(id); - this.cache.delete(id); + if (channel) { + if (channel.guild) channel.guild.channels.cache.delete(id); + this.cache.delete(id); + } } /** From bc54d39d1d94a525fa32123cebfadf0413b3681f Mon Sep 17 00:00:00 2001 From: Awesome Stickz Date: Thu, 10 Dec 2020 21:49:06 +0530 Subject: [PATCH 2/2] Use optional chaining Co-authored-by: Ishmaam Khan --- src/managers/ChannelManager.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/managers/ChannelManager.js b/src/managers/ChannelManager.js index 426f031cc909..4c174b8147e5 100644 --- a/src/managers/ChannelManager.js +++ b/src/managers/ChannelManager.js @@ -41,10 +41,8 @@ class ChannelManager extends BaseManager { remove(id) { const channel = this.cache.get(id); - if (channel) { - if (channel.guild) channel.guild.channels.cache.delete(id); - this.cache.delete(id); - } + channel?.guild?.channels.cache.delete(id); + this.cache.delete(id); } /**