voiceSwitch, update user voiceChannel earlier

This commit is contained in:
abalabahaha
2016-06-01 15:57:05 -07:00
parent 0128a88e25
commit 05def5b3f2
2 changed files with 12 additions and 6 deletions

View File

@@ -223,12 +223,15 @@ var Server = (function (_Equality) {
Server.prototype.eventVoiceJoin = function eventVoiceJoin(user, channel) {
// removes from other speaking channels first
var oldChannel = this.eventVoiceLeave(user);
if (oldChannel.id) {
this.client.emit("voiceLeave", oldChannel, user);
}
channel.members.add(user);
user.voiceChannel = channel;
if (oldChannel.id) {
this.client.emit("voiceLeave", oldChannel, user);
this.client.emit("voiceSwitch", oldChannel, channel, user);
}
this.client.emit("voiceJoin", channel, user);
};

View File

@@ -188,12 +188,15 @@ export default class Server extends Equality {
eventVoiceJoin(user, channel) {
// removes from other speaking channels first
var oldChannel = this.eventVoiceLeave(user);
if (oldChannel.id) {
this.client.emit("voiceLeave", oldChannel, user);
}
channel.members.add(user);
user.voiceChannel = channel;
if (oldChannel.id) {
this.client.emit("voiceLeave", oldChannel, user);
this.client.emit("voiceSwitch", oldChannel, channel, user);
}
this.client.emit("voiceJoin", channel, user);
}