The beginnings of the voiceUserStateChange event

src/Client/InternalClient.js

@@ -1491,25 +1491,39 @@ export default class InternalClient {
 					var user = self.users.get("id", data.user_id);
 					var server = self.servers.get("id", data.guild_id);
 
-					if(user && server){
+					if (user && server) {
 
-						if(data.channel_id){
-							// speaking
+						if (data.channel_id) {
+							// in voice channel
 							var channel = self.channels.get("id", data.channel_id);
-							if(channel){
-								if(server.eventStartSpeaking(user, channel))
+							if (channel && channel.type === "voice") {
+								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{
+								}
+							} else {
 								client.emit("warn", "voice state channel not in cache");
 							}
-						}else{
-							// not speaking
-							client.emit("voiceLeave", user, server.eventStopSpeaking(user));
+						} else {
+							// not in voice channel
+							client.emit("voiceLeave", user, server.eventVoiceLeave(user));
 						}
 
-					}else{
+					} else {
 						client.emit("warn", "voice state update but user or server not in cache");
 					}
 

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,26 +161,17 @@ export default class Server extends Equality {
 		return this.name;
 	}
 
-	eventStartSpeaking(user, channel){
-		channel = this.channels.get("id", channel.id);
-		if(channel && channel.type === "voice"){
-			// good
+	eventVoiceJoin(user, channel) {
+		// removes from other speaking channels first
+		this.eventVoiceLeave(user);
 
-			// removes from other speaking channels first
-			this.eventStopSpeaking(user);
-
-			channel.members.add(user);
-			user.voiceChannel = channel;
-			return true;
-		}else{
-			// bad
-			return false;
-		}
+		channel.members.add(user);
+		user.voiceChannel = channel;
 	}
 
-	eventStopSpeaking(user){
-		for(let chan of this.channels.getAll("type", "voice")){
-			if(chan.members.has(user)){
+	eventVoiceLeave(user) {
+		for (let chan of this.channels.getAll("type", "voice")) {
+			if (chan.members.has(user)) {
 				chan.members.remove(user);
 				user.voiceChannel = null;
 				return chan;

src/Structures/User.js

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