From 630b9d51ef36b19ff555685a3aba109d84c0de21 Mon Sep 17 00:00:00 2001 From: Jiralite <33201955+Jiralite@users.noreply.github.com> Date: Tue, 11 Jul 2023 07:32:22 +0100 Subject: [PATCH] fix(ChannelUpdate): Check against unknown channels (#9698) fix(ChannelUpdate): check against unknown channels --- src/client/actions/ChannelUpdate.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/client/actions/ChannelUpdate.js b/src/client/actions/ChannelUpdate.js index 34d1a86a4..3695e0b0a 100644 --- a/src/client/actions/ChannelUpdate.js +++ b/src/client/actions/ChannelUpdate.js @@ -7,14 +7,23 @@ const { ChannelTypes } = require('../../util/Constants'); class ChannelUpdateAction extends Action { handle(data) { const client = this.client; - let channel = client.channels.cache.get(data.id); + if (channel) { const old = channel._update(data); if (ChannelTypes[channel.type] !== data.type) { const newChannel = Channel.create(this.client, data, channel.guild); - for (const [id, message] of channel.messages.cache) newChannel.messages.cache.set(id, message); + + if (!newChannel) { + this.client.channels.cache.delete(channel.id); + return {}; + } + + if (channel.isText() && newChannel.isText()) { + for (const [id, message] of channel.messages.cache) newChannel.messages.cache.set(id, message); + } + channel = newChannel; this.client.channels.cache.set(channel.id, channel); }