Fix login, clone objects when firing x-Updated events

This commit is contained in:
abalabahaha
2016-01-24 16:41:35 -08:00
parent 2c6cbb6675
commit 2c17eaed02
12 changed files with 39 additions and 37 deletions

View File

@@ -40,7 +40,7 @@ var Message = (function (_Equality) {
this.tts = data.tts;
this.embeds = data.embeds;
this.timestamp = Date.parse(data.timestamp);
this.everyoneMentioned = data.mention_everyone;
this.everyoneMentioned = data.mention_everyone || data.everyoneMentioned;
this.id = data.id;
if (data.edited_timestamp) this.editedTimestamp = Date.parse(data.edited_timestamp);

View File

@@ -33,7 +33,7 @@ var PMChannel = (function (_Channel) {
_Channel.call(this, data, client);
this.type = data.type || "text";
this.lastMessageId = data.last_message_id;
this.lastMessageId = data.last_message_id || data.lastMessageId;
this.messages = new _UtilCache2["default"]("id", 1000);
this.recipient = this.client.internal.users.add(new _User2["default"](data.recipient, this.client));
}

View File

@@ -54,7 +54,7 @@ var Server = (function (_Equality) {
this.client = client;
this.region = data.region;
this.ownerID = data.owner_id;
this.ownerID = data.owner_id || data.ownerID;
this.name = data.name;
this.id = data.id;
this.members = new _UtilCache2["default"]();
@@ -62,7 +62,7 @@ var Server = (function (_Equality) {
this.roles = new _UtilCache2["default"]();
this.icon = data.icon;
this.afkTimeout = data.afkTimeout;
this.afkChannelID = data.afk_channel_id;
this.afkChannelID = data.afk_channel_id || data.afkChannelID;
this.memberMap = {};
var self = this;

View File

@@ -38,11 +38,13 @@ var ServerChannel = (function (_Channel) {
this.name = data.name;
this.type = data.type;
this.position = data.position;
this.permissionOverwrites = new _UtilCache2["default"]();
this.permissionOverwrites = data.permissionOverwrites || new _UtilCache2["default"]();
this.server = server;
data.permission_overwrites.forEach(function (permission) {
_this.permissionOverwrites.add(new _PermissionOverwrite2["default"](permission));
});
if (!data.permissionOverwrites) {
data.permission_overwrites.forEach(function (permission) {
_this.permissionOverwrites.add(new _PermissionOverwrite2["default"](permission));
});
}
}
ServerChannel.prototype.permissionsOf = function permissionsOf(user) {

View File

@@ -29,7 +29,7 @@ var TextChannel = (function (_ServerChannel) {
_ServerChannel.call(this, data, client, server);
this.topic = data.topic;
this.lastMessageID = data.last_message_id;
this.lastMessageID = data.last_message_id || data.lastMessageID;
this.messages = new _UtilCache2["default"]("id", client.options.maximumMessages);
}