Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 19:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whoops

Browse Source
This commit is contained in:
abalabahaha
2016-05-08 00:55:48 -07:00
parent 2a1d516a28
commit 42fd07c5e7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Structures/Server.js
View File

@@ -159,6 +159,11 @@ var Server = (function (_Equality) {
var _user = this.members.get("id", voiceState.user_id); var _user = this.members.get("id", voiceState.user_id);
var channel = this.channels.get("id", voiceState.channel_id); var channel = this.channels.get("id", voiceState.channel_id);
this.memberMap[_user.id] = this.memberMap[_user.id] || {};
this.memberMap[_user.id].mute = voiceState.mute || this.memberMap[_user.id].mute;
this.memberMap[_user.id].selfMute = voiceState.self_mute || this.memberMap[_user.id].selfMute;
this.memberMap[_user.id].deaf = voiceState.deaf || this.memberMap[_user.id].deaf;
this.memberMap[_user.id].selfDeaf = voiceState.self_deaf || this.memberMap[_user.id].selfDeaf;
if (_user && channel) { if (_user && channel) {
this.eventVoiceJoin(_user, channel); this.eventVoiceJoin(_user, channel);
} else { } else {
@@ -219,10 +224,6 @@ var Server = (function (_Equality) {
channel.members.add(user); channel.members.add(user);
user.voiceChannel = channel; user.voiceChannel = channel;
this.memberMap[user.id].mute = data.mute || this.memberMap[user.id].mute;
this.memberMap[user.id].selfMute = data.self_mute || this.memberMap[user.id].selfMute;
this.memberMap[user.id].deaf = data.deaf || this.memberMap[user.id].deaf;
this.memberMap[user.id].selfDeaf = data.self_deaf || this.memberMap[user.id].selfDeaf;
this.client.emit("voiceJoin", channel, user); this.client.emit("voiceJoin", channel, user);
}; };

9
src/Structures/Server.js
View File

@@ -94,6 +94,11 @@ export default class Server extends Equality {
for (var voiceState of data.voice_states) { for (var voiceState of data.voice_states) {
let user = this.members.get("id", voiceState.user_id); let user = this.members.get("id", voiceState.user_id);
let channel = this.channels.get("id", voiceState.channel_id); let channel = this.channels.get("id", voiceState.channel_id);
this.memberMap[user.id] = this.memberMap[user.id] || {};
this.memberMap[user.id].mute = voiceState.mute || this.memberMap[user.id].mute;
this.memberMap[user.id].selfMute = voiceState.self_mute || this.memberMap[user.id].selfMute;
this.memberMap[user.id].deaf = voiceState.deaf || this.memberMap[user.id].deaf;
this.memberMap[user.id].selfDeaf = voiceState.self_deaf || this.memberMap[user.id].selfDeaf;
if (user && channel) { if (user && channel) {
this.eventVoiceJoin(user, channel); this.eventVoiceJoin(user, channel);
} else { } else {
@@ -182,10 +187,6 @@ export default class Server extends Equality {
channel.members.add(user); channel.members.add(user);
user.voiceChannel = channel; user.voiceChannel = channel;
this.memberMap[user.id].mute = data.mute || this.memberMap[user.id].mute;
this.memberMap[user.id].selfMute = data.self_mute || this.memberMap[user.id].selfMute;
this.memberMap[user.id].deaf = data.deaf || this.memberMap[user.id].deaf;
this.memberMap[user.id].selfDeaf = data.self_deaf || this.memberMap[user.id].selfDeaf;
this.client.emit("voiceJoin", channel, user); this.client.emit("voiceJoin", channel, user);
} }