Merge branch 'master' into voice-rewrite

src/client/actions/ActionsManager.js

@@ -14,13 +14,11 @@ class ActionsManager {
     this.register(require('./ChannelUpdate'));
     this.register(require('./GuildDelete'));
     this.register(require('./GuildUpdate'));
-    this.register(require('./GuildMemberGet'));
     this.register(require('./GuildMemberRemove'));
     this.register(require('./GuildBanRemove'));
     this.register(require('./GuildRoleCreate'));
     this.register(require('./GuildRoleDelete'));
     this.register(require('./GuildRoleUpdate'));
-    this.register(require('./UserGet'));
     this.register(require('./UserUpdate'));
     this.register(require('./UserNoteUpdate'));
     this.register(require('./GuildSync'));

src/client/actions/GuildMemberGet.js

@@ -1,10 +0,0 @@
-const Action = require('./Action');
-
-class GuildMemberGetAction extends Action {
-  handle(guild, data) {
-    const member = guild.members.create(data);
-    return { member };
-  }
-}
-
-module.exports = GuildMemberGetAction;

src/client/actions/UserGet.js

@@ -1,11 +0,0 @@
-const Action = require('./Action');
-
-class UserGetAction extends Action {
-  handle(data) {
-    const client = this.client;
-    const user = client.users.create(data);
-    return { user };
-  }
-}
-
-module.exports = UserGetAction;

src/structures/Guild.js

@@ -542,7 +542,7 @@ class Guild extends Base {
       }
     }
     return this.client.api.guilds(this.id).members(user.id).put({ data: options })
-      .then(data => this.client.actions.GuildMemberGet.handle(this, data).member);
+      .then(data => this.members.create(data));
   }
 
   /**