From d1d0d75d4a6f5e4ed1a4cd341eb9f46aab6ae7f3 Mon Sep 17 00:00:00 2001 From: SpaceEEC Date: Sun, 5 Jan 2020 18:29:14 +0100 Subject: [PATCH] fix(ChannelDelete): mark messages of a deleted channel as deleted (#3572) --- src/client/actions/ChannelDelete.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/client/actions/ChannelDelete.js b/src/client/actions/ChannelDelete.js index e4e46849b..6def6291e 100644 --- a/src/client/actions/ChannelDelete.js +++ b/src/client/actions/ChannelDelete.js @@ -1,4 +1,5 @@ const Action = require('./Action'); +const DMChannel = require('../../structures/DMChannel'); class ChannelDeleteAction extends Action { constructor(client) { @@ -17,7 +18,14 @@ class ChannelDeleteAction extends Action { } else { channel = this.deleted.get(data.id) || null; } - if (channel) channel.deleted = true; + if (channel) { + if (channel.messages && !(channel instanceof DMChannel)) { + for (const message of channel.messages.values()) { + message.deleted = true; + } + } + channel.deleted = true; + } return { channel }; }