Added guild.kick(member) and member.kick()

src/client/actions/ActionsManager.js

@@ -14,6 +14,7 @@ class ActionsManager {
 		this.register('ChannelUpdate');
 		this.register('GuildDelete');
 		this.register('GuildUpdate');
+		this.register('GuildMemberRemove');
 		this.register('UserUpdate');
 	}
 

src/client/actions/GuildMemberRemove.js

@@ -0,0 +1,50 @@
+'use strict';
+
+const Action = require('./Action');
+const Constants = require('../../util/Constants');
+const Message = require('../../structures/Message');
+
+class GuildMemberRemoveAction extends Action {
+
+	constructor(client) {
+		super(client);
+		this.timeouts = [];
+		this.deleted = {};
+	}
+
+	handle(data) {
+		let client = this.client;
+		let guild = client.store.get('guilds', data.guild_id);
+		if (guild) {
+			let member = guild.store.get('members', data.user.id);
+			if (member) {
+				guild._removeMember(member);
+				this.deleted[guild.id + data.user.id] = member;
+				this.scheduleForDeletion(guild.id, data.user.id);
+			}
+
+			if (!member) {
+				member = this.deleted[guild.id + data.user.id];
+			}
+
+			return {
+				g: guild,
+				m: member,
+			};
+		}
+
+		return {
+			g: guild,
+			m: null,
+		};
+	}
+
+	scheduleForDeletion(guildID, userID) {
+		this.timeouts.push(
+			setTimeout(() => delete this.deleted[guildID + userID],
+			this.client.options.rest_ws_bridge_timeout)
+		);
+	}
+};
+
+module.exports = GuildMemberRemoveAction;

src/client/rest/RESTMethods.js

@@ -242,6 +242,19 @@ class RESTMethods{
 				.catch(reject);
 		});
 	}
+
+	KickGuildMember(guild, member) {
+		return new Promise((resolve, reject) => {
+			this.rest.makeRequest('del', Constants.Endpoints.GUILD_MEMBER(guild.id, member.id), true)
+				.then(() => {
+					resolve(this.rest.client.actions.GuildMemberRemove.handle({
+						guild_id : guild.id,
+						user : member.user,
+					}).m);
+				})
+				.catch(reject);
+		});
+	}
 }
 
 module.exports = RESTMethods;

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

@@ -20,13 +20,10 @@ class GuildMemberRemoveHandler extends AbstractHandler {
 		let data = packet.d;
 		let client = this.packetManager.client;
 
-		let guild = client.store.get('guilds', data.guild_id);
+		let response = client.actions.GuildMemberRemove.handle(data);
 
-		if (guild) {
+		if (response.m) {
-			let member = guild.store.get('members', data.user.id);
+			client.emit(Constants.Events.GUILD_MEMBER_REMOVE, response.g, response.m);
-			if (member) {
-				guild._removeMember(member);
-			}
 		}
 	}
 

src/structures/Guild.js

@@ -66,15 +66,16 @@ class Guild {
 
 	_removeMember(guildMember) {
 		this.store.remove('members', guildMember);
-		if (this.client.ws.status === Constants.Status.READY) {
-			this.client.emit(Constants.Events.GUILD_MEMBER_REMOVE, this, guildMember);
-		}
 	}
 
 	toString() {
 		return this.name;
 	}
 
+	kick(member) {
+		return this.member(member).kick();
+	}
+
 	member(user) {
 		return this.client.resolver.ResolveGuildMember(this, user);
 	}

src/structures/GuildMember.js

@@ -62,6 +62,10 @@ class GuildMember {
 	deleteDM() {
 		return this.client.rest.methods.DeleteChannel(this);
 	}
+
+	kick() {
+		return this.client.rest.methods.KickGuildMember(this.guild, this);
+	}
 }
 
 TextBasedChannel.applyToClass(GuildMember);

src/util/Constants.js

@@ -58,6 +58,7 @@ const Endpoints = exports.Endpoints = {
 	GUILD_BANS:         (guildID) => `${Endpoints.GUILD(guildID)}/bans`,
 	GUILD_INTEGRATIONS: (guildID) => `${Endpoints.GUILD(guildID)}/integrations`,
 	GUILD_MEMBERS:      (guildID) => `${Endpoints.GUILD(guildID)}/members`,
+	GUILD_MEMBER:      (guildID, memberID) => `${Endpoints.GUILD_MEMBERS(guildID)}/${memberID}`,
 	GUILD_CHANNELS:     (guildID) => `${Endpoints.GUILD(guildID)}/channels`,
 
 	// channels

test/random.js

@@ -128,6 +128,13 @@ client.on('message', message => {
 			message.author.deleteDM();
 		}
 
+		if (message.content.startsWith('kick')) {
+			message.guild.member(message.mentions[0]).kick().then(member => {
+								console.log(member);
+				message.channel.sendMessage('Kicked!' + member.user.username);
+			}).catch(console.log);
+		}
+
 	}
 });