Fixing server updates

This commit is contained in:
abalabahaha
2016-01-25 00:34:16 -08:00
parent 4e9a11d7a9
commit 79039f08a1
2 changed files with 76 additions and 46 deletions

View File

@@ -67,32 +67,50 @@ var Server = (function (_Equality) {
var self = this; var self = this;
data.roles.forEach(function (dataRole) { if (data.roles instanceof _UtilCache2["default"]) {
_this.roles.add(new _Role2["default"](dataRole, _this, client)); data.roles.forEach(function (role) {
}); return _this.roles.add(role);
});
} else {
data.roles.forEach(function (dataRole) {
_this.roles.add(new _Role2["default"](dataRole, _this, client));
});
}
data.members.forEach(function (dataUser) { if (data.members instanceof _UtilCache2["default"]) {
_this.memberMap[dataUser.user.id] = { data.members.forEach(function (member) {
roles: dataUser.roles.map(function (pid) { return _this.members.add(member);
return self.roles.get("id", pid); });
}), } else {
mute: dataUser.mute, data.members.forEach(function (dataUser) {
deaf: dataUser.deaf, _this.memberMap[dataUser.user.id] = {
joinedAt: Date.parse(dataUser.joined_at) roles: dataUser.roles.map(function (pid) {
}; return self.roles.get("id", pid);
var user = client.internal.users.add(new _User2["default"](dataUser.user, client)); }),
_this.members.add(user); mute: dataUser.mute,
}); deaf: dataUser.deaf,
joinedAt: Date.parse(dataUser.joined_at)
};
var user = client.internal.users.add(new _User2["default"](dataUser.user, client));
_this.members.add(user);
});
}
data.channels.forEach(function (dataChannel) { if (data.channels instanceof _UtilCache2["default"]) {
if (dataChannel.type === "text") { data.channels.forEach(function (channel) {
var channel = client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this)); return _this.channels.add(channel);
_this.channels.add(channel); });
} else { } else {
var channel = client.internal.channels.add(new _VoiceChannel2["default"](dataChannel, client, _this)); data.channels.forEach(function (dataChannel) {
_this.channels.add(channel); if (dataChannel.type === "text") {
} var channel = client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this));
}); _this.channels.add(channel);
} else {
var channel = client.internal.channels.add(new _VoiceChannel2["default"](dataChannel, client, _this));
_this.channels.add(channel);
}
});
}
if (data.presences) { if (data.presences) {
for (var _iterator = data.presences, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { for (var _iterator = data.presences, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {

View File

@@ -35,30 +35,42 @@ export default class Server extends Equality {
var self = this; var self = this;
data.roles.forEach((dataRole) => { if (data.roles instanceof Cache) {
this.roles.add(new Role(dataRole, this, client)); data.roles.forEach((role) => this.roles.add(role));
}); } else {
data.roles.forEach((dataRole) => {
this.roles.add(new Role(dataRole, this, client));
});
}
data.members.forEach((dataUser) => { if (data.members instanceof Cache) {
this.memberMap[dataUser.user.id] = { data.members.forEach((member) => this.members.add(member));
roles: dataUser.roles.map((pid) => self.roles.get("id", pid)), } else {
mute: dataUser.mute, data.members.forEach((dataUser) => {
deaf: dataUser.deaf, this.memberMap[dataUser.user.id] = {
joinedAt: Date.parse(dataUser.joined_at) roles: dataUser.roles.map((pid) => self.roles.get("id", pid)),
}; mute: dataUser.mute,
var user = client.internal.users.add(new User(dataUser.user, client)); deaf: dataUser.deaf,
this.members.add(user); joinedAt: Date.parse(dataUser.joined_at)
}); };
var user = client.internal.users.add(new User(dataUser.user, client));
this.members.add(user);
});
}
data.channels.forEach((dataChannel) => { if (data.channels instanceof Cache) {
if (dataChannel.type === "text") { data.channels.forEach((channel) => this.channels.add(channel));
var channel = client.internal.channels.add(new TextChannel(dataChannel, client, this)); } else {
this.channels.add(channel); data.channels.forEach((dataChannel) => {
} else { if (dataChannel.type === "text") {
var channel = client.internal.channels.add(new VoiceChannel(dataChannel, client, this)); var channel = client.internal.channels.add(new TextChannel(dataChannel, client, this));
this.channels.add(channel); this.channels.add(channel);
} } else {
}); var channel = client.internal.channels.add(new VoiceChannel(dataChannel, client, this));
this.channels.add(channel);
}
});
}
if (data.presences) { if (data.presences) {
for (var presence of data.presences) { for (var presence of data.presences) {