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

voiceStateUpdate stored per-server, some docs

Browse Source
This commit is contained in:
abalabahaha
2016-01-30 14:11:21 -08:00
parent 46807bf1c1
commit cd25848bdc
12 changed files with 134 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Client/Client.js
View File

@@ -344,8 +344,8 @@ export default class Client extends EventEmitter {
}
// def addUserToRole
userHasRole(member, role, callback = (/*err, {}*/) => { }) {
return this.memberHasRole(member, role, callback);
userHasRole(member, role) {
return this.memberHasRole(member, role);
}
// def removeMemberFromRole

23
src/Client/InternalClient.js
View File

@@ -1373,7 +1373,9 @@ export default class InternalClient {
server.memberMap[data.user.id] = {
roles: data.roles.map(pid => server.roles.get("id", pid)),
mute: false,
self_mute: false,
deaf: false,
self_deaf: false,
joinedAt: Date.parse(data.joined_at)
};
@@ -1409,7 +1411,9 @@ export default class InternalClient {
if (user) {
server.memberMap[data.user.id].roles = data.roles.map(pid => server.roles.get("id", pid));
server.memberMap[data.user.id].mute = data.mute;
server.memberMap[data.user.id].self_mute = data.self_mute;
server.memberMap[data.user.id].deaf = data.deaf;
server.memberMap[data.user.id].self_deaf = data.self_deaf;
client.emit("serverMemberUpdated", server, user);
} else {
client.emit("warn", "server member removed but user doesn't exist in cache");
@@ -1500,24 +1504,7 @@ export default class InternalClient {
// in voice channel
var channel = self.channels.get("id", data.channel_id);
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("voiceStateUpdate", channel, user, oldState);
} else {
server.eventVoiceJoin(user, channel);
client.emit("voiceJoin", channel, user);
}
server.eventVoiceStateUpdate(channel, user, data);
} else {
client.emit("warn", "voice state channel not in cache");
}

31
src/Structures/Server.js
View File

@@ -50,7 +50,9 @@ export default class Server extends Equality {
this.memberMap[dataUser.user.id] = {
roles: dataUser.roles.map((pid) => self.roles.get("id", pid)),
mute: dataUser.mute,
self_mute: dataUser.self_mute,
deaf: dataUser.deaf,
self_deaf: dataUser.self_deaf,
joinedAt: Date.parse(dataUser.joined_at)
};
var user = client.internal.users.add(new User(dataUser.user, client));
@@ -108,6 +110,10 @@ export default class Server extends Equality {
return this.detailsOf(user);
}
detailsOfMember(user) {
return this.detailsOf(user);
}
details(user) {
return this.detailsOf(user);
}
@@ -169,6 +175,31 @@ export default class Server extends Equality {
user.voiceChannel = channel;
}
eventVoiceStateUpdate(channel, user, data) {
// removes from other speaking channels first
if (!this.memberMap[user.id]) {
this.memberMap[user.id] = {};
}
var oldState = {
mute: this.memberMap[user.id].mute,
self_mute: this.memberMap[user.id].self_mute,
deaf: this.memberMap[user.id].deaf,
self_deaf: this.memberMap[user.id].self_deaf
};
this.memberMap[user.id].mute = data.mute;
this.memberMap[user.id].self_mute = data.self_mute;
this.memberMap[user.id].deaf = data.deaf;
this.memberMap[user.id].self_deaf = data.self_deaf;
if ((oldState.mute != data.mute || oldState.self_mute != data.self_mute
|| oldState.deaf != data.deaf || oldState.self_deaf != data.self_deaf)
&& oldState.mute !== undefined) {
this.client.emit("voiceStateUpdate", channel, user, oldState, this.memberMap[user.id]);
} else {
this.eventVoiceJoin(user, channel);
this.client.emit("voiceJoin", channel, user);
}
}
eventVoiceLeave(user) {
for (let chan of this.channels.getAll("type", "voice")) {
if (chan.members.has(user)) {