Null roles fix

This commit is contained in:
abalabahaha
2016-05-13 20:14:01 -07:00
parent e7882a38ee
commit 81cdb09363
4 changed files with 6 additions and 4 deletions

View File

@@ -1719,7 +1719,9 @@ var InternalClient = (function () {
self.intervals.kai = setInterval(function () { self.intervals.kai = setInterval(function () {
return self.sendWS({ op: 1, d: Date.now() }); return self.sendWS({ op: 1, d: Date.now() });
}, data.heartbeat_interval); }, 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)); self.user = self.users.add(new _StructuresUser2["default"](data.user, client));
_this41.forceFetchCount = {}; _this41.forceFetchCount = {};

View File

@@ -179,7 +179,7 @@ var Server = (function (_Equality) {
var result = this.memberMap[user.id] || {}; var result = this.memberMap[user.id] || {};
if (result && result.roles) { if (result && result.roles) {
result.roles = result.roles.map(function (pid) { result.roles = result.roles.map(function (pid) {
return _this2.roles.get("id", pid); return _this2.roles.get("id", pid) || pid;
}); });
} }
return result; return result;

View File

@@ -1459,7 +1459,7 @@ export default class InternalClient {
case PacketType.READY: case PacketType.READY:
var startTime = Date.now(); var startTime = Date.now();
self.intervals.kai = setInterval(() => self.sendWS({ op: 1, d: Date.now() }), data.heartbeat_interval); 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)); self.user = self.users.add(new User(data.user, client));
this.forceFetchCount = {}; this.forceFetchCount = {};

View File

@@ -113,7 +113,7 @@ export default class Server extends Equality {
if (user) { if (user) {
var result = this.memberMap[user.id] || {}; var result = this.memberMap[user.id] || {};
if(result && result.roles) { 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; return result;
} else { } else {