add channel to voiceStateUpdate, reorder args

This commit is contained in:
abalabahaha
2016-01-29 21:45:49 -08:00
parent dad570a4ec
commit 8b392f359a
2 changed files with 6 additions and 6 deletions

View File

@@ -1719,17 +1719,17 @@ var InternalClient = (function () {
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("voiceStateUpdate", user, oldState);
client.emit("voiceStateUpdate", channel, user, oldState);
} else {
server.eventVoiceJoin(user, channel);
client.emit("voiceJoin", user, channel);
client.emit("voiceJoin", channel, user);
}
} else {
client.emit("warn", "voice state channel not in cache");
}
} else {
// not in voice channel
client.emit("voiceLeave", user, server.eventVoiceLeave(user));
client.emit("voiceLeave", server.eventVoiceLeave(user), user);
}
} else {
client.emit("warn", "voice state update but user or server not in cache");

View File

@@ -1511,17 +1511,17 @@ export default class InternalClient {
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("voiceStateUpdate", user, oldState);
client.emit("voiceStateUpdate", channel, user, oldState);
} else {
server.eventVoiceJoin(user, channel);
client.emit("voiceJoin", user, channel);
client.emit("voiceJoin", channel, user);
}
} else {
client.emit("warn", "voice state channel not in cache");
}
} else {
// not in voice channel
client.emit("voiceLeave", user, server.eventVoiceLeave(user));
client.emit("voiceLeave", server.eventVoiceLeave(user), user);
}
} else {