From 249b6f919a5a6a4ef4827f9cddfe229bd02c0013 Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Fri, 29 Apr 2016 19:37:15 -0700
Subject: [PATCH] Null unset nicks

---
 lib/Client/InternalClient.js | 6 +++---
 lib/Structures/Server.js     | 2 +-
 src/Client/InternalClient.js | 6 +++---
 src/Structures/Server.js     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 3c5b82cc5..7f1bc4963 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -2033,7 +2033,7 @@ var InternalClient = (function () {
 							deaf: false,
 							selfDeaf: false,
 							joinedAt: Date.parse(data.joined_at),
-							nick: data.nick
+							nick: data.nick || null
 						};
 
 						server.memberCount++;
@@ -2095,7 +2095,7 @@ var InternalClient = (function () {
 							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;
+							server.memberMap[data.user.id].nick = data.nick || null;
 							client.emit("serverMemberUpdated", server, user);
 						} else {
 							client.emit("warn", "server member removed but user doesn't exist in cache");
@@ -2264,7 +2264,7 @@ var InternalClient = (function () {
 								deaf: user.deaf,
 								selfDeaf: false,
 								joinedAt: Date.parse(user.joined_at),
-								nick: user.nick
+								nick: user.nick || null
 							};
 							server.members.add(self.users.add(new _StructuresUser2["default"](user.user, client)));
 						}
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index 0a97cb9ef..efc606455 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -99,7 +99,7 @@ var Server = (function (_Equality) {
 					deaf: dataUser.deaf,
 					selfDeaf: dataUser.self_deaf,
 					joinedAt: Date.parse(dataUser.joined_at),
-					nick: dataUser.nick
+					nick: dataUser.nick || null
 				};
 				_this.members.add(client.internal.users.add(new _User2["default"](dataUser.user, client)));
 			});
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 4ddfe90da..105a7feb3 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1739,7 +1739,7 @@ export default class InternalClient {
 							deaf: false,
 							selfDeaf: false,
 							joinedAt: Date.parse(data.joined_at),
-							nick: data.nick
+							nick: data.nick || null
 						};
 
 						server.memberCount++;
@@ -1791,7 +1791,7 @@ export default class InternalClient {
 							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;
+							server.memberMap[data.user.id].nick = data.nick || null;
 							client.emit("serverMemberUpdated", server, user);
 						} else {
 							client.emit("warn", "server member removed but user doesn't exist in cache");
@@ -1948,7 +1948,7 @@ export default class InternalClient {
 								deaf: user.deaf,
 								selfDeaf: false,
 								joinedAt: Date.parse(user.joined_at),
-								nick: user.nick
+								nick: user.nick || null
 							};
 							server.members.add(self.users.add(new User(user.user, client)));
 						}
diff --git a/src/Structures/Server.js b/src/Structures/Server.js
index 90ccbdcd8..64f8360af 100644
--- a/src/Structures/Server.js
+++ b/src/Structures/Server.js
@@ -62,7 +62,7 @@ export default class Server extends Equality {
 					deaf: dataUser.deaf,
 					selfDeaf: dataUser.self_deaf,
 					joinedAt: Date.parse(dataUser.joined_at),
-					nick: dataUser.nick
+					nick: dataUser.nick || null
 				};
 				this.members.add(client.internal.users.add(new User(dataUser.user, client)));
 			});