backport: deleted property

src/client/actions/ChannelDelete.js

@@ -17,6 +17,7 @@ class ChannelDeleteAction extends Action {
     } else {
       channel = this.deleted.get(data.id) || null;
     }
+    if (channel) channel.deleted = true;
 
     return { channel };
   }

src/client/actions/GuildDelete.js

@@ -38,6 +38,7 @@ class GuildDeleteAction extends Action {
     } else {
       guild = this.deleted.get(data.id) || null;
     }
+    if (guild) guild.deleted = true;
 
     return { guild };
   }

src/client/actions/GuildEmojiDelete.js

@@ -4,6 +4,7 @@ class GuildEmojiDeleteAction extends Action {
   handle(emoji) {
     const client = this.client;
     client.dataManager.killEmoji(emoji);
+    emoji.deleted = true;
     return { emoji };
   }
 }

src/client/actions/GuildMemberRemove.js

@@ -22,6 +22,7 @@ class GuildMemberRemoveAction extends Action {
       } else {
         member = this.deleted.get(guild.id + data.user.id) || null;
       }
+      if (member) member.deleted = true;
     }
     return { guild, member };
   }

src/client/actions/GuildRoleDelete.js

@@ -22,6 +22,7 @@ class GuildRoleDeleteAction extends Action {
       } else {
         role = this.deleted.get(guild.id + data.role_id) || null;
       }
+      if (role) role.deleted = true;
     }
 
     return { role };

src/client/actions/MessageDelete.js

@@ -20,6 +20,7 @@ class MessageDeleteAction extends Action {
       } else {
         message = this.deleted.get(channel.id + data.id) || null;
       }
+      if (message) message.deleted = true;
     }
 
     return { message };

src/client/actions/MessageDeleteBulk.js

@@ -11,6 +11,7 @@ class MessageDeleteBulkAction extends Action {
       for (const id of data.ids) {
         const message = channel.messages.get(id);
         if (message) {
+          message.deleted = true;
           messages.set(message.id, message);
           channel.messages.delete(id);
         }

src/structures/Channel.js

@@ -24,6 +24,12 @@ class Channel {
      */
     this.type = null;
 
+    /**
+     * Whether the channel has been deleted
+     * @type {boolean}
+     */
+    this.deleted = false;
+
     if (data) this.setup(data);
   }
 

src/structures/Emoji.js

@@ -22,6 +22,12 @@ class Emoji {
      */
     this.guild = guild;
 
+    /**
+     * Whether this emoji has been deleted
+     * @type {boolean}
+     */
+    this.deleted = false;
+
     this.setup(data);
   }
 

src/structures/Guild.js

@@ -49,6 +49,12 @@ class Guild {
      */
     this.presences = new Collection();
 
+    /**
+     * Whether the bot has been removed from the guild
+     * @type {boolean}
+     */
+    this.deleted = false;
+
     if (!data) return;
     if (data.unavailable) {
       /**

src/structures/GuildMember.js

@@ -51,6 +51,12 @@ class GuildMember {
      * @type {?Message}
      */
     this.lastMessage = null;
+
+    /**
+     * Whether the member has been removed from the guild
+     * @type {boolean}
+     */
+    this.deleted = false;
   }
 
   setup(data) {

src/structures/Message.js

@@ -29,6 +29,12 @@ class Message {
      */
     this.channel = channel;
 
+    /**
+     * Whether this message has been deleted
+     * @type {boolean}
+     */
+    this.deleted = false;
+
     if (data) this.setup(data);
   }
 
@@ -319,9 +325,9 @@ class Message {
    * @readonly
    */
   get deletable() {
-    return this.author.id === this.client.user.id || (this.guild &&
+    return !this.deleted && (this.author.id === this.client.user.id || (this.guild &&
       this.channel.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_MESSAGES)
-    );
+    ));
   }
 
   /**

src/structures/Role.js

@@ -21,6 +21,12 @@ class Role {
      */
     this.guild = guild;
 
+    /**
+     * Whether the role has been deleted
+     * @type {boolean}
+     */
+    this.deleted = false;
+
     if (data) this.setup(data);
   }