The beginnings of the voiceUserStateChange event

lib/Client/InternalClient.js

@@ -1703,16 +1703,31 @@ var InternalClient = (function () {
 					if (user && server) {
 
 						if (data.channel_id) {
-							// speaking
+							// in voice channel
 							var channel = self.channels.get("id", data.channel_id);
-							if (channel) {
+							if (channel && channel.type === "voice") {
-								if (server.eventStartSpeaking(user, channel)) client.emit("voiceJoin", user, channel);else client.emit("warn", "voice state error occurred in adding");
+								var oldState = {
+									mute: user.voiceState.mute,
+									self_mute: user.voiceState.self_mute,
+									deaf: user.voiceState.deaf,
+									self_deaf: user.voiceState.self_deaf
+								};
+								user.voiceState.mute = data.mute;
+								user.voiceState.self_mute = data.self_mute;
+								user.voiceState.deaf = data.deaf;
+								user.voiceState.self_deaf = data.self_deaf;
+								if ((oldState.mute != user.voiceState.mute || oldState.self_mute != user.voiceState.self_mute || oldState.deaf != user.voiceState.deaf || oldState.self_deaf != user.voiceState.self_deaf) && oldState.mute !== undefined) {
+									client.emit("voiceUserStateChange", user, oldState);
+								} else {
+									server.eventVoiceJoin(user, channel);
+									client.emit("voiceJoin", user, channel);
+								}
 							} else {
 								client.emit("warn", "voice state channel not in cache");
 							}
 						} else {
-							// not speaking
+							// not in voice channel
-							client.emit("voiceLeave", user, server.eventStopSpeaking(user));
+							client.emit("voiceLeave", user, server.eventVoiceLeave(user));
 						}
 					} else {
 						client.emit("warn", "voice state update but user or server not in cache");

lib/Structures/Server.js

@@ -153,7 +153,7 @@ var Server = (function (_Equality) {
 				var _user = this.members.get("id", voiceState.user_id);
 				var channel = this.channels.get("id", voiceState.channel_id);
 				if (_user && channel) {
-					this.eventStartSpeaking(_user, channel);
+					this.eventVoiceJoin(_user, channel);
 				} else {
 					this.client.emit("warn", "user doesn't exist even though READY expects them to");
 				}
@@ -199,24 +199,15 @@ var Server = (function (_Equality) {
 		return this.name;
 	};
 
-	Server.prototype.eventStartSpeaking = function eventStartSpeaking(user, channel) {
+	Server.prototype.eventVoiceJoin = function eventVoiceJoin(user, channel) {
-		channel = this.channels.get("id", channel.id);
-		if (channel && channel.type === "voice") {
-			// good
-
 		// removes from other speaking channels first
-			this.eventStopSpeaking(user);
+		this.eventVoiceLeave(user);
 
 		channel.members.add(user);
 		user.voiceChannel = channel;
-			return true;
-		} else {
-			// bad
-			return false;
-		}
 	};
 
-	Server.prototype.eventStopSpeaking = function eventStopSpeaking(user) {
+	Server.prototype.eventVoiceLeave = function eventVoiceLeave(user) {
 		for (var _iterator3 = this.channels.getAll("type", "voice"), _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
 			var _ref3;
 

lib/Structures/User.js

@@ -37,6 +37,7 @@ var User = (function (_Equality) {
 			channel: null
 		};
 		this.voiceChannel = null;
+		this.voiceState = {};
 	}
 
 	User.prototype.mention = function mention() {

src/Client/InternalClient.js

@@ -1494,19 +1494,33 @@ export default class InternalClient {
 					if (user && server) {
 
 						if (data.channel_id) {
-							// speaking
+							// in voice channel
 							var channel = self.channels.get("id", data.channel_id);
-							if(channel){
+							if (channel && channel.type === "voice") {
-								if(server.eventStartSpeaking(user, channel))
+								var oldState = {
+									mute: user.voiceState.mute,
+									self_mute: user.voiceState.self_mute,
+									deaf: user.voiceState.deaf,
+									self_deaf: user.voiceState.self_deaf
+								};
+								user.voiceState.mute = data.mute;
+								user.voiceState.self_mute = data.self_mute;
+								user.voiceState.deaf = data.deaf;
+								user.voiceState.self_deaf = data.self_deaf;
+								if ((oldState.mute != user.voiceState.mute || oldState.self_mute != user.voiceState.self_mute
+									|| oldState.deaf != user.voiceState.deaf || oldState.self_deaf != user.voiceState.self_deaf)
+									&& oldState.mute !== undefined) {
+									client.emit("voiceUserStateChange", user, oldState);
+								} else {
+									server.eventVoiceJoin(user, channel);
 									client.emit("voiceJoin", user, channel);
-								else
+								}
-									client.emit("warn", "voice state error occurred in adding");
 							} else {
 								client.emit("warn", "voice state channel not in cache");
 							}
 						} else {
-							// not speaking
+							// not in voice channel
-							client.emit("voiceLeave", user, server.eventStopSpeaking(user));
+							client.emit("voiceLeave", user, server.eventVoiceLeave(user));
 						}
 
 					} else {

src/Structures/Server.js

@@ -87,7 +87,7 @@ export default class Server extends Equality {
 				let user = this.members.get("id", voiceState.user_id);
 				let channel = this.channels.get("id", voiceState.channel_id);
 				if (user && channel) {
-					this.eventStartSpeaking(user, channel);
+					this.eventVoiceJoin(user, channel);
 				} else {
 					this.client.emit("warn", "user doesn't exist even though READY expects them to");
 				}
@@ -161,24 +161,15 @@ export default class Server extends Equality {
 		return this.name;
 	}
 
-	eventStartSpeaking(user, channel){
+	eventVoiceJoin(user, channel) {
-		channel = this.channels.get("id", channel.id);
-		if(channel && channel.type === "voice"){
-			// good
-
 		// removes from other speaking channels first
-			this.eventStopSpeaking(user);
+		this.eventVoiceLeave(user);
 
 		channel.members.add(user);
 		user.voiceChannel = channel;
-			return true;
-		}else{
-			// bad
-			return false;
-		}
 	}
 
-	eventStopSpeaking(user){
+	eventVoiceLeave(user) {
 		for (let chan of this.channels.getAll("type", "voice")) {
 			if (chan.members.has(user)) {
 				chan.members.remove(user);

src/Structures/User.js

@@ -19,6 +19,7 @@ export default class User extends Equality{
 			channel : null
 		};
 		this.voiceChannel = null;
+		this.voiceState = {};
 	}
 
 	get avatarURL(){