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

Some undefined checking

Browse Source
This commit is contained in:
abalabahaha
2016-05-11 16:42:18 -07:00
parent 3221bde4db
commit 0e5a1d2df7
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Client/InternalClient.js
View File

@@ -2127,10 +2127,10 @@ var InternalClient = (function () {
return server.roles.get("id", pid); return server.roles.get("id", pid);
}) : server.memberMap[data.user.id].roles; }) : 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].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].selfMute = data.self_mute === undefined ? server.memberMap[data.user.id].selfMute : data.self_mute;
server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].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; server.memberMap[data.user.id].selfDeaf = data.self_deaf === undefined ? server.memberMap[data.user.id].selfDeaf : data.self_deaf;
server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null; server.memberMap[data.user.id].nick = data.nick === undefined ? server.memberMap[data.user.id].nick : data.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

@@ -161,9 +161,9 @@ var Server = (function (_Equality) {
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] = this.memberMap[_user.id] || {};
this.memberMap[_user.id].mute = voiceState.mute || this.memberMap[_user.id].mute; 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].selfMute = voiceState.self_mute === undefined ? this.memberMap[_user.id].selfMute : voiceState.self_mute;
this.memberMap[_user.id].deaf = voiceState.deaf || this.memberMap[_user.id].deaf; 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; this.memberMap[_user.id].selfDeaf = voiceState.self_deaf === undefined ? this.memberMap[_user.id].selfDeaf : voiceState.self_deaf;
if (_user && channel) { if (_user && channel) {
this.eventVoiceJoin(_user, channel); this.eventVoiceJoin(_user, channel);
} else { } else {

6
src/Client/InternalClient.js
View File

@@ -1821,10 +1821,10 @@ export default class InternalClient {
} }
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].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].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].selfMute = data.self_mute === undefined ? server.memberMap[data.user.id].selfMute : data.self_mute;
server.memberMap[data.user.id].deaf = data.deaf || server.memberMap[data.user.id].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; server.memberMap[data.user.id].selfDeaf = data.self_deaf === undefined ? server.memberMap[data.user.id].selfDeaf : data.self_deaf;
server.memberMap[data.user.id].nick = data.nick || server.memberMap[data.user.id].nick || null; server.memberMap[data.user.id].nick = data.nick === undefined ? server.memberMap[data.user.id].nick : data.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

@@ -96,9 +96,9 @@ export default class Server extends Equality {
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] = this.memberMap[user.id] || {};
this.memberMap[user.id].mute = voiceState.mute || this.memberMap[user.id].mute; 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].selfMute = voiceState.self_mute === undefined ? this.memberMap[user.id].selfMute : voiceState.self_mute;
this.memberMap[user.id].deaf = voiceState.deaf || this.memberMap[user.id].deaf; 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; this.memberMap[user.id].selfDeaf = voiceState.self_deaf === undefined ? this.memberMap[user.id].selfDeaf : voiceState.self_deaf;
if (user && channel) { if (user && channel) {
this.eventVoiceJoin(user, channel); this.eventVoiceJoin(user, channel);
} else { } else {