Store and Model Refactor (#1618)

* UserStore refactor

* Create ChannelStore, remove redundant methods in ClientDataManager

* Create GuildStore

* Emoji stuff

* Use a Base class where possible to reduce code duplication

* Remove unnecessary comments from ChannelStore

* Add Base._clone();

* Remove unused ClientDataManager methods

* Refactor some more stuff

* ESLint

* Move Client#fetchUser to client.users.fetch

* Remove .has checks and just see if .get is truthy

* Fix guild member chunk error

* ESLint

* Fix typo

* Fix channel storing for user bots

* Remove ClientDataManager

* GuildChannelStore

* Reduce use of Util.cloneObject

* and this one too

* update typings

* Fix MessageUpdate handling (#1507)

* Fix role updates (probably fixes #1525)

* fix for eslint

* Address some of appell's comments

* Use debug constant

* start message store crap if it's ugly tell me later k

* fix that

* message store but works™️

* clean up guild stuff

* clean up channel store stuff

* clean up channel event handling

* does this message stuff work? find out soon in the next episode of dIsCoRd.Js

* eslint

* emojis

* emojis and reactions

* hi my name is eslint and im A LIL SHIT

* so i forgot this huh

* user stuff

* Fix @class

* Fix message stuff

* Fix user store docs

* Document all the bases

* fix the super things

* tidy up remove

* fix textbasedchannel

* fix that too

* fix emoji store

* make voice state stuff less ugly

* make voice states even less ugly

* make members less bad

* fix bug

* fix that too

* fix reactions

* how was this broken for so long

* role store

* remove super._patch from UserConnection

* Rename UserProfile#setup to _patch

* remove unnecessary super calls

* update docgen dep (pls fix travis thx)

* doc messagestore

* fix docs

* message store docs

* things

* DOCS PLS

* more things

* Document TextBasedChannel#messages as a MessageStore

* Rebase

* All the stores!

src/client/Client.js

@@ -3,7 +3,6 @@ const Constants = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 const Util = require('../util/Util');
 const RESTManager = require('./rest/RESTManager');
-const ClientDataManager = require('./ClientDataManager');
 const ClientManager = require('./ClientManager');
 const ClientDataResolver = require('./ClientDataResolver');
 const ClientVoiceManager = require('./voice/ClientVoiceManager');
@@ -13,11 +12,13 @@ const Collection = require('../util/Collection');
 const { Presence } = require('../structures/Presence');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
-const User = require('../structures/User');
 const Invite = require('../structures/Invite');
 const ClientApplication = require('../structures/ClientApplication');
 const ShardClientUtil = require('../sharding/ShardClientUtil');
 const VoiceBroadcast = require('./voice/VoiceBroadcast');
+const UserStore = require('../stores/UserStore');
+const ChannelStore = require('../stores/ChannelStore');
+const GuildStore = require('../stores/GuildStore');
 const { Error, TypeError, RangeError } = require('../errors');
 
 /**
@@ -49,13 +50,6 @@ class Client extends EventEmitter {
      */
     this.rest = new RESTManager(this);
 
-    /**
-     * The data manager of the client
-     * @type {ClientDataManager}
-     * @private
-     */
-    this.dataManager = new ClientDataManager(this);
-
     /**
      * The manager of the client
      * @type {ClientManager}
@@ -100,23 +94,23 @@ class Client extends EventEmitter {
 
     /**
      * All of the {@link User} objects that have been cached at any point, mapped by their IDs
-     * @type {Collection<Snowflake, User>}
+     * @type {UserStore<Snowflake, User>}
      */
-    this.users = new Collection();
+    this.users = new UserStore(this);
 
     /**
      * All of the guilds the client is currently handling, mapped by their IDs -
      * as long as sharding isn't being used, this will be *every* guild the bot is a member of
-     * @type {Collection<Snowflake, Guild>}
+     * @type {GuildStore<Snowflake, Guild>}
      */
-    this.guilds = new Collection();
+    this.guilds = new GuildStore(this);
 
     /**
      * All of the {@link Channel}s that the client is currently handling, mapped by their IDs -
      * as long as sharding isn't being used, this will be *every* channel in *every* guild, and all DM channels
-     * @type {Collection<Snowflake, Channel>}
+     * @type {ChannelStore<Snowflake, Channel>}
      */
-    this.channels = new Collection();
+    this.channels = new ChannelStore(this);
 
     /**
      * Presences that have been received for the client user's friends, mapped by user IDs
@@ -322,20 +316,6 @@ class Client extends EventEmitter {
     });
   }
 
-  /**
-   * Obtains a user from Discord, or the user cache if it's already available.
-   * <warn>This is only available when using a bot account.</warn>
-   * @param {Snowflake} id ID of the user
-   * @param {boolean} [cache=true] Whether to cache the new user object if it isn't already
-   * @returns {Promise<User>}
-   */
-  fetchUser(id, cache = true) {
-    if (this.users.has(id)) return Promise.resolve(this.users.get(id));
-    return this.api.users(id).get().then(data =>
-      cache ? this.dataManager.newUser(data) : new User(this, data)
-    );
-  }
-
   /**
    * Obtains an invite from Discord.
    * @param {InviteResolvable} invite Invite code or URL

src/client/ClientDataManager.js

@@ -1,112 +0,0 @@
-const Constants = require('../util/Constants');
-const Util = require('../util/Util');
-const Guild = require('../structures/Guild');
-const User = require('../structures/User');
-const Channel = require('../structures/Channel');
-const GuildChannel = require('../structures/GuildChannel');
-const Emoji = require('../structures/Emoji');
-
-class ClientDataManager {
-  constructor(client) {
-    this.client = client;
-  }
-
-  get pastReady() {
-    return this.client.ws.connection.status === Constants.Status.READY;
-  }
-
-  newGuild(data) {
-    const already = this.client.guilds.has(data.id);
-    const guild = new Guild(this.client, data);
-    this.client.guilds.set(guild.id, guild);
-    if (!this.client.user.bot && this.client.options.sync) this.client.syncGuilds([guild]);
-    if (this.pastReady && !already) {
-      /**
-       * Emitted whenever the client joins a guild.
-       * @event Client#guildCreate
-       * @param {Guild} guild The created guild
-       */
-      if (this.client.options.fetchAllMembers) {
-        guild.fetchMembers().then(() => { this.client.emit(Constants.Events.GUILD_CREATE, guild); });
-      } else {
-        this.client.emit(Constants.Events.GUILD_CREATE, guild);
-      }
-    }
-
-    return guild;
-  }
-
-  newUser(data) {
-    if (this.client.users.has(data.id)) return this.client.users.get(data.id);
-    const user = new User(this.client, data);
-    this.client.users.set(user.id, user);
-    return user;
-  }
-
-  newChannel(data, guild) {
-    const already = this.client.channels.has(data.id);
-    const channel = Channel.create(this.client, data, guild);
-
-    if (channel) {
-      if (this.pastReady && !already) this.client.emit(Constants.Events.CHANNEL_CREATE, channel);
-      this.client.channels.set(channel.id, channel);
-      return channel;
-    }
-
-    return null;
-  }
-
-  newEmoji(data, guild) {
-    const already = guild.emojis.has(data.id);
-    if (data && !already) {
-      let emoji = new Emoji(guild, data);
-      this.client.emit(Constants.Events.GUILD_EMOJI_CREATE, emoji);
-      guild.emojis.set(emoji.id, emoji);
-      return emoji;
-    } else if (already) {
-      return guild.emojis.get(data.id);
-    }
-
-    return null;
-  }
-
-  killEmoji(emoji) {
-    if (!(emoji instanceof Emoji && emoji.guild)) return;
-    this.client.emit(Constants.Events.GUILD_EMOJI_DELETE, emoji);
-    emoji.guild.emojis.delete(emoji.id);
-  }
-
-  killGuild(guild) {
-    const already = this.client.guilds.has(guild.id);
-    this.client.guilds.delete(guild.id);
-    if (already && this.pastReady) this.client.emit(Constants.Events.GUILD_DELETE, guild);
-  }
-
-  killUser(user) {
-    this.client.users.delete(user.id);
-  }
-
-  killChannel(channel) {
-    this.client.channels.delete(channel.id);
-    if (channel instanceof GuildChannel) channel.guild.channels.delete(channel.id);
-  }
-
-  updateGuild(currentGuild, newData) {
-    const oldGuild = Util.cloneObject(currentGuild);
-    currentGuild.setup(newData);
-    if (this.pastReady) this.client.emit(Constants.Events.GUILD_UPDATE, oldGuild, currentGuild);
-  }
-
-  updateChannel(currentChannel, newData) {
-    currentChannel.setup(newData);
-  }
-
-  updateEmoji(currentEmoji, newData) {
-    const oldEmoji = Util.cloneObject(currentEmoji);
-    currentEmoji.setup(newData);
-    this.client.emit(Constants.Events.GUILD_EMOJI_UPDATE, oldEmoji, currentEmoji);
-    return currentEmoji;
-  }
-}
-
-module.exports = ClientDataManager;

src/client/actions/ChannelCreate.js

@@ -1,9 +1,14 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class ChannelCreateAction extends Action {
   handle(data) {
     const client = this.client;
-    const channel = client.dataManager.newChannel(data);
+    const existing = client.channels.has(data.id);
+    const channel = client.channels.create(data);
+    if (!existing && channel) {
+      client.emit(Constants.Events.CHANNEL_CREATE, channel);
+    }
     return { channel };
   }
 }

src/client/actions/ChannelDelete.js

@@ -1,4 +1,5 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class ChannelDeleteAction extends Action {
   constructor(client) {
@@ -8,22 +9,21 @@ class ChannelDeleteAction extends Action {
 
   handle(data) {
     const client = this.client;
-
     let channel = client.channels.get(data.id);
+
     if (channel) {
-      client.dataManager.killChannel(channel);
-      this.deleted.set(channel.id, channel);
-      this.scheduleForDeletion(channel.id);
-    } else {
-      channel = this.deleted.get(data.id) || null;
+      client.channels.remove(channel.id);
+      client.emit(Constants.Events.CHANNEL_DELETE, channel);
     }
 
     return { channel };
   }
-
-  scheduleForDeletion(id) {
-    this.client.setTimeout(() => this.deleted.delete(id), this.client.options.restWsBridgeTimeout);
-  }
 }
 
+/**
+ * Emitted whenever a channel is deleted.
+ * @event Client#channelDelete
+ * @param {Channel} channel The channel that was deleted
+ */
+
 module.exports = ChannelDeleteAction;

src/client/actions/ChannelUpdate.js

@@ -1,6 +1,4 @@
 const Action = require('./Action');
-const Constants = require('../../util/Constants');
-const Util = require('../../util/Util');
 
 class ChannelUpdateAction extends Action {
   handle(data) {
@@ -8,27 +6,15 @@ class ChannelUpdateAction extends Action {
 
     const channel = client.channels.get(data.id);
     if (channel) {
-      const oldChannel = Util.cloneObject(channel);
-      channel.setup(data);
-      client.emit(Constants.Events.CHANNEL_UPDATE, oldChannel, channel);
+      const old = channel._update(data);
       return {
-        old: oldChannel,
+        old,
         updated: channel,
       };
     }
 
-    return {
-      old: null,
-      updated: null,
-    };
+    return {};
   }
 }
 
-/**
- * Emitted whenever a channel is updated - e.g. name change, topic change.
- * @event Client#channelUpdate
- * @param {Channel} oldChannel The channel before the update
- * @param {Channel} newChannel The channel after the update
- */
-
 module.exports = ChannelUpdateAction;

src/client/actions/GuildBanRemove.js

@@ -5,7 +5,7 @@ class GuildBanRemove extends Action {
   handle(data) {
     const client = this.client;
     const guild = client.guilds.get(data.guild_id);
-    const user = client.dataManager.newUser(data.user);
+    const user = client.users.create(data.user);
     if (guild && user) client.emit(Constants.Events.GUILD_BAN_REMOVE, guild, user);
   }
 }

src/client/actions/GuildDelete.js

@@ -29,7 +29,8 @@ class GuildDeleteAction extends Action {
       }
 
       // Delete guild
-      client.guilds.delete(guild.id);
+      client.guilds.remove(guild.id);
+      client.emit(Constants.Events.GUILD_DELETE, guild);
       this.deleted.set(guild.id, guild);
       this.scheduleForDeletion(guild.id);
     } else {

src/client/actions/GuildEmojiCreate.js

@@ -1,9 +1,10 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class GuildEmojiCreateAction extends Action {
   handle(guild, createdEmoji) {
-    const client = this.client;
-    const emoji = client.dataManager.newEmoji(createdEmoji, guild);
+    const emoji = guild.emojis.create(createdEmoji);
+    this.client.emit(Constants.Events.GUILD_EMOJI_CREATE, emoji);
     return { emoji };
   }
 }

src/client/actions/GuildEmojiDelete.js

@@ -1,9 +1,10 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class GuildEmojiDeleteAction extends Action {
   handle(emoji) {
-    const client = this.client;
-    client.dataManager.killEmoji(emoji);
+    emoji.guild.emojis.remove(emoji.id);
+    this.client.emit(Constants.Events.GUILD_EMOJI_DELETE, emoji);
     return { emoji };
   }
 }

src/client/actions/GuildEmojiUpdate.js

@@ -1,9 +1,11 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class GuildEmojiUpdateAction extends Action {
-  handle(oldEmoji, newEmoji) {
-    const emoji = this.client.dataManager.updateEmoji(oldEmoji, newEmoji);
-    return { emoji };
+  handle(current, data) {
+    const old = current._update(data);
+    this.client.emit(Constants.Events.GUILD_EMOJI_UPDATE, old, current);
+    return { emoji: current };
   }
 }
 

src/client/actions/GuildMemberGet.js

@@ -2,7 +2,7 @@ const Action = require('./Action');
 
 class GuildMemberGetAction extends Action {
   handle(guild, data) {
-    const member = guild._addMember(data, false);
+    const member = guild.members.create(data);
     return { member };
   }
 }

src/client/actions/GuildMemberRemove.js

@@ -2,11 +2,6 @@ const Action = require('./Action');
 const Constants = require('../../util/Constants');
 
 class GuildMemberRemoveAction extends Action {
-  constructor(client) {
-    super(client);
-    this.deleted = new Map();
-  }
-
   handle(data) {
     const client = this.client;
     const guild = client.guilds.get(data.guild_id);
@@ -15,20 +10,12 @@ class GuildMemberRemoveAction extends Action {
       member = guild.members.get(data.user.id);
       if (member) {
         guild.memberCount--;
-        guild._removeMember(member);
-        this.deleted.set(guild.id + data.user.id, member);
+        guild.members.remove(member.id);
         if (client.status === Constants.Status.READY) client.emit(Constants.Events.GUILD_MEMBER_REMOVE, member);
-        this.scheduleForDeletion(guild.id, data.user.id);
-      } else {
-        member = this.deleted.get(guild.id + data.user.id) || null;
       }
     }
     return { guild, member };
   }
-
-  scheduleForDeletion(guildID, userID) {
-    this.client.setTimeout(() => this.deleted.delete(guildID + userID), this.client.options.restWsBridgeTimeout);
-  }
 }
 
 /**

src/client/actions/GuildRoleCreate.js

@@ -1,6 +1,5 @@
 const Action = require('./Action');
 const Constants = require('../../util/Constants');
-const Role = require('../../structures/Role');
 
 class GuildRoleCreate extends Action {
   handle(data) {
@@ -9,8 +8,7 @@ class GuildRoleCreate extends Action {
     let role;
     if (guild) {
       const already = guild.roles.has(data.role.id);
-      role = new Role(guild, data.role);
-      guild.roles.set(role.id, role);
+      role = guild.roles.create(data.role);
       if (!already) client.emit(Constants.Events.GUILD_ROLE_CREATE, role);
     }
     return { role };

src/client/actions/GuildRoleDelete.js

@@ -2,11 +2,6 @@ const Action = require('./Action');
 const Constants = require('../../util/Constants');
 
 class GuildRoleDeleteAction extends Action {
-  constructor(client) {
-    super(client);
-    this.deleted = new Map();
-  }
-
   handle(data) {
     const client = this.client;
     const guild = client.guilds.get(data.guild_id);
@@ -15,21 +10,13 @@ class GuildRoleDeleteAction extends Action {
     if (guild) {
       role = guild.roles.get(data.role_id);
       if (role) {
-        guild.roles.delete(data.role_id);
-        this.deleted.set(guild.id + data.role_id, role);
-        this.scheduleForDeletion(guild.id, data.role_id);
+        guild.roles.remove(data.role_id);
         client.emit(Constants.Events.GUILD_ROLE_DELETE, role);
-      } else {
-        role = this.deleted.get(guild.id + data.role_id) || null;
       }
     }
 
     return { role };
   }
-
-  scheduleForDeletion(guildID, roleID) {
-    this.client.setTimeout(() => this.deleted.delete(guildID + roleID), this.client.options.restWsBridgeTimeout);
-  }
 }
 
 /**

src/client/actions/GuildRoleUpdate.js

@@ -1,6 +1,5 @@
 const Action = require('./Action');
 const Constants = require('../../util/Constants');
-const Util = require('../../util/Util');
 
 class GuildRoleUpdateAction extends Action {
   handle(data) {
@@ -8,18 +7,16 @@ class GuildRoleUpdateAction extends Action {
     const guild = client.guilds.get(data.guild_id);
 
     if (guild) {
-      const roleData = data.role;
-      let oldRole = null;
+      let old = null;
 
-      const role = guild.roles.get(roleData.id);
+      const role = guild.roles.get(data.role.id);
       if (role) {
-        oldRole = Util.cloneObject(role);
-        role.setup(data.role);
-        client.emit(Constants.Events.GUILD_ROLE_UPDATE, oldRole, role);
+        old = role._update(data.role);
+        client.emit(Constants.Events.GUILD_ROLE_UPDATE, old, role);
       }
 
       return {
-        old: oldRole,
+        old,
         updated: role,
       };
     }

src/client/actions/GuildSync.js

@@ -14,9 +14,9 @@ class GuildSync extends Action {
         for (const syncMember of data.members) {
           const member = guild.members.get(syncMember.user.id);
           if (member) {
-            guild._updateMember(member, syncMember);
+            member._patch(syncMember);
           } else {
-            guild._addMember(syncMember, false);
+            guild.members.create(syncMember, false);
           }
         }
       }

src/client/actions/GuildUpdate.js

@@ -1,6 +1,5 @@
 const Action = require('./Action');
 const Constants = require('../../util/Constants');
-const Util = require('../../util/Util');
 
 class GuildUpdateAction extends Action {
   handle(data) {
@@ -8,11 +7,10 @@ class GuildUpdateAction extends Action {
 
     const guild = client.guilds.get(data.id);
     if (guild) {
-      const oldGuild = Util.cloneObject(guild);
-      guild.setup(data);
-      client.emit(Constants.Events.GUILD_UPDATE, oldGuild, guild);
+      const old = guild._update(data);
+      client.emit(Constants.Events.GUILD_UPDATE, old, guild);
       return {
-        old: oldGuild,
+        old,
         updated: guild,
       };
     }

src/client/actions/MessageCreate.js

@@ -1,55 +1,39 @@
 const Action = require('./Action');
-const Message = require('../../structures/Message');
+const Constants = require('../../util/Constants');
 
 class MessageCreateAction extends Action {
   handle(data) {
     const client = this.client;
-
-    const channel = client.channels.get((data instanceof Array ? data[0] : data).channel_id);
-    const user = client.users.get((data instanceof Array ? data[0] : data).author.id);
+    const channel = client.channels.get(data.channel_id);
+    const user = client.users.get(data.author.id);
     if (channel) {
+      const existing = channel.messages.get(data.id);
+      if (existing) return { message: existing };
       const member = channel.guild ? channel.guild.member(user) : null;
-      if (data instanceof Array) {
-        const messages = new Array(data.length);
-        for (let i = 0; i < data.length; i++) {
-          messages[i] = channel._cacheMessage(new Message(channel, data[i], client));
-        }
-        const lastMessage = messages[messages.length - 1];
-        channel.lastMessageID = lastMessage.id;
-        channel.lastMessage = lastMessage;
-        if (user) {
-          user.lastMessageID = lastMessage.id;
-          user.lastMessage = lastMessage;
-        }
-        if (member) {
-          member.lastMessageID = lastMessage.id;
-          member.lastMessage = lastMessage;
-        }
-        return {
-          messages,
-        };
-      } else {
-        const message = channel._cacheMessage(new Message(channel, data, client));
-        channel.lastMessageID = data.id;
-        channel.lastMessage = message;
-        if (user) {
-          user.lastMessageID = data.id;
-          user.lastMessage = message;
-        }
-        if (member) {
-          member.lastMessageID = data.id;
-          member.lastMessage = message;
-        }
-        return {
-          message,
-        };
+      const message = channel.messages.create(data);
+      channel.lastMessageID = data.id;
+      channel.lastMessage = message;
+      if (user) {
+        user.lastMessageID = data.id;
+        user.lastMessage = message;
       }
+      if (member) {
+        member.lastMessageID = data.id;
+        member.lastMessage = message;
+      }
+
+      client.emit(Constants.Events.MESSAGE_CREATE, message);
+      return { message };
     }
 
-    return {
-      message: null,
-    };
+    return {};
   }
 }
 
+/**
+ * Emitted whenever a message is created.
+ * @event Client#message
+ * @param {Message} message The created message
+ */
+
 module.exports = MessageCreateAction;

src/client/actions/MessageDelete.js

@@ -1,11 +1,7 @@
 const Action = require('./Action');
+const Constants = require('../../util/Constants');
 
 class MessageDeleteAction extends Action {
-  constructor(client) {
-    super(client);
-    this.deleted = new Map();
-  }
-
   handle(data) {
     const client = this.client;
     const channel = client.channels.get(data.channel_id);
@@ -15,20 +11,18 @@ class MessageDeleteAction extends Action {
       message = channel.messages.get(data.id);
       if (message) {
         channel.messages.delete(message.id);
-        this.deleted.set(channel.id + message.id, message);
-        this.scheduleForDeletion(channel.id, message.id);
-      } else {
-        message = this.deleted.get(channel.id + data.id) || null;
+        client.emit(Constants.Events.MESSAGE_DELETE, message);
       }
     }
 
     return { message };
   }
-
-  scheduleForDeletion(channelID, messageID) {
-    this.client.setTimeout(() => this.deleted.delete(channelID + messageID),
-      this.client.options.restWsBridgeTimeout);
-  }
 }
 
+/**
+ * Emitted whenever a message is deleted.
+ * @event Client#messageDelete
+ * @param {Message} message The deleted message
+ */
+
 module.exports = MessageDeleteAction;

src/client/actions/MessageDeleteBulk.js

@@ -7,16 +7,25 @@ class MessageDeleteBulkAction extends Action {
     const client = this.client;
     const channel = client.channels.get(data.channel_id);
 
-    const ids = data.ids;
-    const messages = new Collection();
-    for (const id of ids) {
-      const message = channel.messages.get(id);
-      if (message) messages.set(message.id, message);
-    }
+    if (channel) {
+      const ids = data.ids;
+      const messages = new Collection();
+      for (const id of ids) {
+        const message = channel.messages.get(id);
+        if (message) messages.set(message.id, message);
+      }
 
-    if (messages.size > 0) client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages);
-    return { messages };
+      if (messages.size > 0) client.emit(Constants.Events.MESSAGE_BULK_DELETE, messages);
+      return { messages };
+    }
+    return {};
   }
 }
 
+/**
+ * Emitted whenever messages are deleted in bulk.
+ * @event Client#messageDeleteBulk
+ * @param {Collection<Snowflake, Message>} messages The deleted messages, mapped by their ID
+ */
+
 module.exports = MessageDeleteBulkAction;

src/client/actions/MessageReactionAdd.js

@@ -1,5 +1,4 @@
 const Action = require('./Action');
-const Constants = require('../../util/Constants');
 
 /*
 { user_id: 'id',
@@ -10,19 +9,22 @@ const Constants = require('../../util/Constants');
 
 class MessageReactionAdd extends Action {
   handle(data) {
-    const user = this.client.users.get(data.user_id);
+    const user = data.user || this.client.users.get(data.user_id);
     if (!user) return false;
     // Verify channel
-    const channel = this.client.channels.get(data.channel_id);
+    const channel = data.channel || this.client.channels.get(data.channel_id);
     if (!channel || channel.type === 'voice') return false;
     // Verify message
-    const message = channel.messages.get(data.message_id);
+    const message = data.message || channel.messages.get(data.message_id);
     if (!message) return false;
     if (!data.emoji) return false;
     // Verify reaction
-    const reaction = message._addReaction(data.emoji, user);
-    if (reaction) this.client.emit(Constants.Events.MESSAGE_REACTION_ADD, reaction, user);
-
+    const reaction = message.reactions.create({
+      emoji: data.emoji,
+      count: 0,
+      me: user.id === this.client.user.id,
+    });
+    reaction._add(user);
     return { message, reaction, user };
   }
 }

src/client/actions/MessageReactionRemove.js

@@ -20,8 +20,11 @@ class MessageReactionRemove extends Action {
     if (!message) return false;
     if (!data.emoji) return false;
     // Verify reaction
-    const reaction = message._removeReaction(data.emoji, user);
-    if (reaction) this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE, reaction, user);
+    const emojiID = data.emoji.id || decodeURIComponent(data.emoji.name);
+    const reaction = message.reactions.get(emojiID);
+    if (!reaction) return false;
+    reaction._remove(user);
+    this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE, reaction, user);
 
     return { message, reaction, user };
   }

src/client/actions/MessageReactionRemoveAll.js

@@ -9,7 +9,7 @@ class MessageReactionRemoveAll extends Action {
     const message = channel.messages.get(data.message_id);
     if (!message) return false;
 
-    message._clearReactions();
+    message.reactions.clear();
     this.client.emit(Constants.Events.MESSAGE_REACTION_REMOVE_ALL, message);
 
     return { message };

src/client/actions/MessageUpdate.js

@@ -1,5 +1,4 @@
 const Action = require('./Action');
-const Constants = require('../../util/Constants');
 
 class MessageUpdateAction extends Action {
   handle(data) {
@@ -10,31 +9,15 @@ class MessageUpdateAction extends Action {
       const message = channel.messages.get(data.id);
       if (message) {
         message.patch(data);
-        client.emit(Constants.Events.MESSAGE_UPDATE, message._edits[0], message);
         return {
           old: message._edits[0],
           updated: message,
         };
       }
-
-      return {
-        old: message,
-        updated: message,
-      };
     }
 
-    return {
-      old: null,
-      updated: null,
-    };
+    return {};
   }
 }
 
-/**
- * Emitted whenever a message is updated - e.g. embed or content change.
- * @event Client#messageUpdate
- * @param {Message} oldMessage The message before the update
- * @param {Message} newMessage The message after the update
- */
-
 module.exports = MessageUpdateAction;

src/client/actions/UserGet.js

@@ -3,7 +3,7 @@ const Action = require('./Action');
 class UserGetAction extends Action {
   handle(data) {
     const client = this.client;
-    const user = client.dataManager.newUser(data);
+    const user = client.users.create(data);
     return { user };
   }
 }

src/client/actions/UserUpdate.js

@@ -1,6 +1,5 @@
 const Action = require('./Action');
 const Constants = require('../../util/Constants');
-const Util = require('../../util/Util');
 
 class UserUpdateAction extends Action {
   handle(data) {
@@ -14,8 +13,7 @@ class UserUpdateAction extends Action {
         };
       }
 
-      const oldUser = Util.cloneObject(client.user);
-      client.user.patch(data);
+      const oldUser = client.user._update(data);
       client.emit(Constants.Events.USER_UPDATE, oldUser, client.user);
       return {
         old: oldUser,

src/client/websocket/packets/handlers/ChannelCreate.js

@@ -2,9 +2,7 @@ const AbstractHandler = require('./AbstractHandler');
 
 class ChannelCreateHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    client.actions.ChannelCreate.handle(data);
+    this.packetManager.client.actions.ChannelCreate.handle(packet.d);
   }
 }
 

src/client/websocket/packets/handlers/ChannelDelete.js

@@ -1,20 +1,9 @@
 const AbstractHandler = require('./AbstractHandler');
 
-const Constants = require('../../../../util/Constants');
-
 class ChannelDeleteHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    const response = client.actions.ChannelDelete.handle(data);
-    if (response.channel) client.emit(Constants.Events.CHANNEL_DELETE, response.channel);
+    this.packetManager.client.actions.ChannelDelete.handle(packet.d);
   }
 }
 
-/**
- * Emitted whenever a channel is deleted.
- * @event Client#channelDelete
- * @param {Channel} channel The channel that was deleted
- */
-
 module.exports = ChannelDeleteHandler;

src/client/websocket/packets/handlers/ChannelUpdate.js

@@ -1,11 +1,20 @@
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class ChannelUpdateHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    client.actions.ChannelUpdate.handle(data);
+    const { old, updated } = this.packetManager.client.actions.ChannelUpdate.handle(packet.d);
+    if (old && updated) {
+      this.packetManager.client.emit(Constants.Events.CHANNEL_UPDATE, old, updated);
+    }
   }
 }
 
 module.exports = ChannelUpdateHandler;
+
+/**
+ * Emitted whenever a channel is updated - e.g. name change, topic change.
+ * @event Client#channelUpdate
+ * @param {Channel} oldChannel The channel before the update
+ * @param {Channel} newChannel The channel after the update
+ */

src/client/websocket/packets/handlers/GuildCreate.js

@@ -1,20 +1,31 @@
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class GuildCreateHandler extends AbstractHandler {
-  handle(packet) {
+  async handle(packet) {
     const client = this.packetManager.client;
     const data = packet.d;
 
-    const guild = client.guilds.get(data.id);
+    let guild = client.guilds.get(data.id);
     if (guild) {
       if (!guild.available && !data.unavailable) {
         // A newly available guild
-        guild.setup(data);
+        guild._patch(data);
         this.packetManager.ws.checkIfReady();
       }
     } else {
       // A new guild
-      client.dataManager.newGuild(data);
+      guild = client.guilds.create(data);
+      const emitEvent = client.ws.connection.status === Constants.Status.READY;
+      if (emitEvent) {
+        /**
+         * Emitted whenever the client joins a guild.
+         * @event Client#guildCreate
+         * @param {Guild} guild The created guild
+         */
+        if (client.options.fetchAllMembers) await guild.fetchMembers();
+        client.emit(Constants.Events.GUILD_CREATE, guild);
+      }
     }
   }
 }

src/client/websocket/packets/handlers/GuildDelete.js

@@ -1,12 +1,9 @@
 const AbstractHandler = require('./AbstractHandler');
-const Constants = require('../../../../util/Constants');
 
 class GuildDeleteHandler extends AbstractHandler {
   handle(packet) {
     const client = this.packetManager.client;
-    const data = packet.d;
-    const response = client.actions.GuildDelete.handle(data);
-    if (response.guild) client.emit(Constants.Events.GUILD_DELETE, response.guild);
+    client.actions.GuildDelete.handle(packet.d);
   }
 }
 

src/client/websocket/packets/handlers/GuildMemberAdd.js

@@ -1,6 +1,7 @@
 // ##untested handler##
 
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class GuildMemberAddHandler extends AbstractHandler {
   handle(packet) {
@@ -9,9 +10,18 @@ class GuildMemberAddHandler extends AbstractHandler {
     const guild = client.guilds.get(data.guild_id);
     if (guild) {
       guild.memberCount++;
-      guild._addMember(data);
+      const member = guild.members.create(data);
+      if (client.ws.connection.status === Constants.Status.READY) {
+        client.emit(Constants.Events.GUILD_MEMBER_ADD, member);
+      }
     }
   }
 }
 
 module.exports = GuildMemberAddHandler;
+
+/**
+ * Emitted whenever a user joins a guild.
+ * @event Client#guildMemberAdd
+ * @param {GuildMember} member The member that has joined a guild
+ */

src/client/websocket/packets/handlers/GuildMemberUpdate.js

@@ -1,16 +1,27 @@
 // ##untested handler##
 
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class GuildMemberUpdateHandler extends AbstractHandler {
   handle(packet) {
     const client = this.packetManager.client;
     const data = packet.d;
-
     const guild = client.guilds.get(data.guild_id);
     if (guild) {
       const member = guild.members.get(data.user.id);
-      if (member) guild._updateMember(member, data);
+      if (member) {
+        const old = member._update(data);
+        if (client.ws.connection.status === Constants.Status.READY) {
+          /**
+           * Emitted whenever a guild member changes - i.e. new role, removed role, nickname.
+           * @event Client#guildMemberUpdate
+           * @param {GuildMember} oldMember The member before the update
+           * @param {GuildMember} newMember The member after the update
+           */
+          client.emit(Constants.Events.GUILD_MEMBER_UPDATE, old, member);
+        }
+      }
     }
   }
 }

src/client/websocket/packets/handlers/GuildMembersChunk.js

@@ -10,7 +10,7 @@ class GuildMembersChunkHandler extends AbstractHandler {
     if (!guild) return;
     const members = new Collection();
 
-    for (const member of data.members) members.set(member.user.id, guild._addMember(member, false));
+    for (const member of data.members) members.set(member.user.id, guild.members.create(member));
 
     client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, members, guild);
 

src/client/websocket/packets/handlers/MessageCreate.js

@@ -1,19 +1,9 @@
 const AbstractHandler = require('./AbstractHandler');
-const Constants = require('../../../../util/Constants');
 
 class MessageCreateHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    const response = client.actions.MessageCreate.handle(data);
-    if (response.message) client.emit(Constants.Events.MESSAGE_CREATE, response.message);
+    this.packetManager.client.actions.MessageCreate.handle(packet.d);
   }
 }
 
-/**
- * Emitted whenever a message is created.
- * @event Client#message
- * @param {Message} message The created message
- */
-
 module.exports = MessageCreateHandler;

src/client/websocket/packets/handlers/MessageDelete.js

@@ -10,10 +10,4 @@ class MessageDeleteHandler extends AbstractHandler {
   }
 }
 
-/**
- * Emitted whenever a message is deleted.
- * @event Client#messageDelete
- * @param {Message} message The deleted message
- */
-
 module.exports = MessageDeleteHandler;

src/client/websocket/packets/handlers/MessageDeleteBulk.js

@@ -2,16 +2,8 @@ const AbstractHandler = require('./AbstractHandler');
 
 class MessageDeleteBulkHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    client.actions.MessageDeleteBulk.handle(data);
+    this.packetManager.client.actions.MessageDeleteBulk.handle(packet.d);
   }
 }
 
-/**
- * Emitted whenever messages are deleted in bulk.
- * @event Client#messageDeleteBulk
- * @param {Collection<Snowflake, Message>} messages The deleted messages, mapped by their ID
- */
-
 module.exports = MessageDeleteBulkHandler;

src/client/websocket/packets/handlers/MessageReactionAdd.js

@@ -1,10 +1,12 @@
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class MessageReactionAddHandler extends AbstractHandler {
   handle(packet) {
     const client = this.packetManager.client;
     const data = packet.d;
-    client.actions.MessageReactionAdd.handle(data);
+    const { user, reaction } = client.actions.MessageReactionAdd.handle(data);
+    if (reaction) client.emit(Constants.Events.MESSAGE_REACTION_ADD, reaction, user);
   }
 }
 

src/client/websocket/packets/handlers/MessageUpdate.js

@@ -1,10 +1,12 @@
 const AbstractHandler = require('./AbstractHandler');
+const Constants = require('../../../../util/Constants');
 
 class MessageUpdateHandler extends AbstractHandler {
   handle(packet) {
-    const client = this.packetManager.client;
-    const data = packet.d;
-    client.actions.MessageUpdate.handle(data);
+    const { old, updated } = this.packetManager.client.actions.MessageUpdate.handle(packet.d);
+    if (old && updated) {
+      this.packetManager.client.emit(Constants.Events.MESSAGE_UPDATE, old, updated);
+    }
   }
 }
 

src/client/websocket/packets/handlers/PresenceUpdate.js

@@ -12,14 +12,13 @@ class PresenceUpdateHandler extends AbstractHandler {
     // Step 1
     if (!user) {
       if (data.user.username) {
-        user = client.dataManager.newUser(data.user);
+        user = client.users.create(data.user);
       } else {
         return;
       }
     }
 
-    const oldUser = Util.cloneObject(user);
-    user.patch(data.user);
+    const oldUser = user._update(data.user);
     if (!user.equals(oldUser)) {
       client.emit(Constants.Events.USER_UPDATE, oldUser, user);
     }
@@ -27,12 +26,12 @@ class PresenceUpdateHandler extends AbstractHandler {
     if (guild) {
       let member = guild.members.get(user.id);
       if (!member && data.status !== 'offline') {
-        member = guild._addMember({
+        member = guild.members.create({
           user,
           roles: data.roles,
           deaf: false,
           mute: false,
-        }, false);
+        });
         client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, member);
       }
       if (member) {
@@ -40,7 +39,7 @@ class PresenceUpdateHandler extends AbstractHandler {
           guild._setPresence(user.id, data);
           return;
         }
-        const oldMember = Util.cloneObject(member);
+        const oldMember = member._clone();
         if (member.presence) {
           oldMember.frozenPresence = Util.cloneObject(member.presence);
         }

src/client/websocket/packets/handlers/Ready.js

@@ -17,11 +17,11 @@ class ReadyHandler extends AbstractHandler {
     client.readyAt = new Date();
     client.users.set(clientUser.id, clientUser);
 
-    for (const guild of data.guilds) client.dataManager.newGuild(guild);
-    for (const privateDM of data.private_channels) client.dataManager.newChannel(privateDM);
+    for (const guild of data.guilds) client.guilds.create(guild);
+    for (const privateDM of data.private_channels) client.channels.create(privateDM);
 
     for (const relation of data.relationships) {
-      const user = client.dataManager.newUser(relation.user);
+      const user = client.users.create(relation.user);
       if (relation.type === 1) {
         client.user.friends.set(user.id, user);
       } else if (relation.type === 2) {
@@ -31,7 +31,7 @@ class ReadyHandler extends AbstractHandler {
 
     data.presences = data.presences || [];
     for (const presence of data.presences) {
-      client.dataManager.newUser(presence.user);
+      client.users.create(presence.user);
       client._setPresence(presence.user.id, presence);
     }
 
@@ -45,7 +45,7 @@ class ReadyHandler extends AbstractHandler {
     }
 
     if (!client.users.has('1')) {
-      client.dataManager.newUser({
+      client.users.create({
         id: '1',
         username: 'Clyde',
         discriminator: '0000',

src/client/websocket/packets/handlers/VoiceStateUpdate.js

@@ -1,7 +1,6 @@
 const AbstractHandler = require('./AbstractHandler');
 
 const Constants = require('../../../../util/Constants');
-const Util = require('../../../../util/Util');
 
 class VoiceStateUpdateHandler extends AbstractHandler {
   handle(packet) {
@@ -12,28 +11,16 @@ class VoiceStateUpdateHandler extends AbstractHandler {
     if (guild) {
       const member = guild.members.get(data.user_id);
       if (member) {
-        const oldVoiceChannelMember = Util.cloneObject(member);
-        if (member.voiceChannel && member.voiceChannel.id !== data.channel_id) {
-          member.voiceChannel.members.delete(oldVoiceChannelMember.id);
-        }
-
-        // If the member left the voice channel, unset their speaking property
-        if (!data.channel_id) member.speaking = null;
+        const oldMember = member._clone();
+        oldMember._frozenVoiceState = oldMember.voiceState;
 
         if (member.user.id === client.user.id && data.channel_id) {
           client.emit('self.voiceStateUpdate', data);
         }
 
-        const newChannel = client.channels.get(data.channel_id);
-        if (newChannel) newChannel.members.set(member.user.id, member);
+        guild.voiceStates.set(member.user.id, data);
 
-        member.serverMute = data.mute;
-        member.serverDeaf = data.deaf;
-        member.selfMute = data.self_mute;
-        member.selfDeaf = data.self_deaf;
-        member.voiceSessionID = data.session_id;
-        member.voiceChannelID = data.channel_id;
-        client.emit(Constants.Events.VOICE_STATE_UPDATE, oldVoiceChannelMember, member);
+        client.emit(Constants.Events.VOICE_STATE_UPDATE, oldMember, member);
       }
     }
   }