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

Fixing server updates

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Structures/Server.js
View File

@@ -67,10 +67,21 @@ var Server = (function (_Equality) {
var self = this; var self = this;
if (data.roles instanceof _UtilCache2["default"]) {
data.roles.forEach(function (role) {
return _this.roles.add(role);
});
} else {
data.roles.forEach(function (dataRole) { data.roles.forEach(function (dataRole) {
_this.roles.add(new _Role2["default"](dataRole, _this, client)); _this.roles.add(new _Role2["default"](dataRole, _this, client));
}); });
}
if (data.members instanceof _UtilCache2["default"]) {
data.members.forEach(function (member) {
return _this.members.add(member);
});
} else {
data.members.forEach(function (dataUser) { data.members.forEach(function (dataUser) {
_this.memberMap[dataUser.user.id] = { _this.memberMap[dataUser.user.id] = {
roles: dataUser.roles.map(function (pid) { roles: dataUser.roles.map(function (pid) {
@@ -83,7 +94,13 @@ var Server = (function (_Equality) {
var user = client.internal.users.add(new _User2["default"](dataUser.user, client)); var user = client.internal.users.add(new _User2["default"](dataUser.user, client));
_this.members.add(user); _this.members.add(user);
}); });
}
if (data.channels instanceof _UtilCache2["default"]) {
data.channels.forEach(function (channel) {
return _this.channels.add(channel);
});
} else {
data.channels.forEach(function (dataChannel) { data.channels.forEach(function (dataChannel) {
if (dataChannel.type === "text") { if (dataChannel.type === "text") {
var channel = client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this)); var channel = client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this));
@@ -93,6 +110,7 @@ var Server = (function (_Equality) {
_this.channels.add(channel); _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]();;) {

12
src/Structures/Server.js
View File

@@ -35,10 +35,17 @@ export default class Server extends Equality {
var self = this; var self = this;
if (data.roles instanceof Cache) {
data.roles.forEach((role) => this.roles.add(role));
} else {
data.roles.forEach((dataRole) => { data.roles.forEach((dataRole) => {
this.roles.add(new Role(dataRole, this, client)); this.roles.add(new Role(dataRole, this, client));
}); });
}
if (data.members instanceof Cache) {
data.members.forEach((member) => this.members.add(member));
} else {
data.members.forEach((dataUser) => { data.members.forEach((dataUser) => {
this.memberMap[dataUser.user.id] = { this.memberMap[dataUser.user.id] = {
roles: dataUser.roles.map((pid) => self.roles.get("id", pid)), roles: dataUser.roles.map((pid) => self.roles.get("id", pid)),
@@ -49,7 +56,11 @@ export default class Server extends Equality {
var user = client.internal.users.add(new User(dataUser.user, client)); var user = client.internal.users.add(new User(dataUser.user, client));
this.members.add(user); this.members.add(user);
}); });
}
if (data.channels instanceof Cache) {
data.channels.forEach((channel) => this.channels.add(channel));
} else {
data.channels.forEach((dataChannel) => { data.channels.forEach((dataChannel) => {
if (dataChannel.type === "text") { if (dataChannel.type === "text") {
var channel = client.internal.channels.add(new TextChannel(dataChannel, client, this)); var channel = client.internal.channels.add(new TextChannel(dataChannel, client, this));
@@ -59,6 +70,7 @@ export default class Server extends Equality {
this.channels.add(channel); this.channels.add(channel);
} }
}); });
}
if (data.presences) { if (data.presences) {
for (var presence of data.presences) { for (var presence of data.presences) {