Revise member property handling

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

View File

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