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

Revise member property handling

Browse Source
This commit is contained in:
abalabahaha
2016-05-08 00:21:36 -07:00
parent af333ef4cc
commit 68c1e122c0
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Client/InternalClient.js
View File

@@ -2101,14 +2101,14 @@ var InternalClient = (function () {
} else { } else {
server.memberMap[data.user.id] = {}; server.memberMap[data.user.id] = {};
} }
server.memberMap[data.user.id].roles = data.roles.map(function (pid) { server.memberMap[data.user.id].roles = data.roles ? data.roles.map(function (pid) {
return server.roles.get("id", pid); return server.roles.get("id", pid);
}); }) : server.memberMap[data.user.id].roles;
server.memberMap[data.user.id].mute = data.mute; server.memberMap[data.user.id].mute = data.mute || server.memberMap[data.user.id].mute;
server.memberMap[data.user.id].selfMute = data.self_mute; server.memberMap[data.user.id].selfMute = data.self_mute || server.memberMap[data.user.id].selfMute;
server.memberMap[data.user.id].deaf = data.deaf; server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].deaf;
server.memberMap[data.user.id].selfDeaf = data.self_deaf; server.memberMap[data.user.id].selfDeaf = data.self_deaf || server.memberMap[data.user.id].selfDeaf;
server.memberMap[data.user.id].nick = data.nick || null; server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null;
client.emit("serverMemberUpdated", server, user, oldMember); client.emit("serverMemberUpdated", server, user, oldMember);
} else { } else {
client.emit("warn", "server member removed but user doesn't exist in cache"); client.emit("warn", "server member removed but user doesn't exist in cache");

4
lib/Structures/Server.js
View File

@@ -219,6 +219,10 @@ 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);
}; };

12
src/Client/InternalClient.js
View File

@@ -1799,12 +1799,12 @@ export default class InternalClient {
} else { } else {
server.memberMap[data.user.id] = {}; server.memberMap[data.user.id] = {};
} }
server.memberMap[data.user.id].roles = data.roles.map(pid => server.roles.get("id", pid)); server.memberMap[data.user.id].roles = data.roles ? data.roles.map(pid => server.roles.get("id", pid)) : server.memberMap[data.user.id].roles;
server.memberMap[data.user.id].mute = data.mute; server.memberMap[data.user.id].mute = data.mute || server.memberMap[data.user.id].mute;
server.memberMap[data.user.id].selfMute = data.self_mute; server.memberMap[data.user.id].selfMute = data.self_mute || server.memberMap[data.user.id].selfMute;
server.memberMap[data.user.id].deaf = data.deaf; server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].deaf;
server.memberMap[data.user.id].selfDeaf = data.self_deaf; server.memberMap[data.user.id].selfDeaf = data.self_deaf || server.memberMap[data.user.id].selfDeaf;
server.memberMap[data.user.id].nick = data.nick || null; server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null;
client.emit("serverMemberUpdated", server, user, oldMember); client.emit("serverMemberUpdated", server, user, oldMember);
} else { } else {
client.emit("warn", "server member removed but user doesn't exist in cache"); client.emit("warn", "server member removed but user doesn't exist in cache");

4
src/Structures/Server.js
View File

@@ -182,6 +182,10 @@ 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);
} }