From 81cdb093630df85eece897d534a7ea9fef8662ae Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Fri, 13 May 2016 20:14:01 -0700
Subject: [PATCH] Null roles fix

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

diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 2e7d40aa7..bdeb803d7 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -1719,7 +1719,9 @@ var InternalClient = (function () {
 					self.intervals.kai = setInterval(function () {
 						return self.sendWS({ op: 1, d: Date.now() });
 					}, data.heartbeat_interval);
-
+					console.log(data.read_state.filter(function (s) {
+						return s.mention_count > 0;
+					}));
 					self.user = self.users.add(new _StructuresUser2["default"](data.user, client));
 
 					_this41.forceFetchCount = {};
diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js
index 5c7ea8a75..d559aafa3 100644
--- a/lib/Structures/Server.js
+++ b/lib/Structures/Server.js
@@ -179,7 +179,7 @@ var Server = (function (_Equality) {
 			var result = this.memberMap[user.id] || {};
 			if (result && result.roles) {
 				result.roles = result.roles.map(function (pid) {
-					return _this2.roles.get("id", pid);
+					return _this2.roles.get("id", pid) || pid;
 				});
 			}
 			return result;
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 67130ccd2..c1168f90e 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -1459,7 +1459,7 @@ export default class InternalClient {
 				case PacketType.READY:
 					var startTime = Date.now();
 					self.intervals.kai = setInterval(() => self.sendWS({ op: 1, d: Date.now() }), data.heartbeat_interval);
-
+console.log(data.read_state.filter(s=>s.mention_count>0));
 					self.user = self.users.add(new User(data.user, client));
 
 					this.forceFetchCount = {};
diff --git a/src/Structures/Server.js b/src/Structures/Server.js
index 7ada522e1..a3545cec5 100644
--- a/src/Structures/Server.js
+++ b/src/Structures/Server.js
@@ -113,7 +113,7 @@ export default class Server extends Equality {
 		if (user) {
 			var result = this.memberMap[user.id] || {};
 			if(result && result.roles) {
-				result.roles = result.roles.map(pid => this.roles.get("id", pid));
+				result.roles = result.roles.map(pid => this.roles.get("id", pid) || pid);
 			}
 			return result;
 		} else {