Use alternatives to .find() because that's not polyfilled

This commit is contained in:
abalabahaha
2016-04-03 04:41:57 -07:00
parent b3a65a4ed6
commit ad66991f36
4 changed files with 54 additions and 16 deletions

View File

@@ -155,9 +155,7 @@ var Resolver = (function () {
var server = _ref; var server = _ref;
if (role = server.roles.find(function (r) { if (role = server.roles.get("id", resource)) {
return r.id == resource;
})) {
return role; return role;
} }
} }

View File

@@ -49,9 +49,15 @@ var Message = (function (_Equality) {
this.everyoneMentioned = data.mention_everyone || data.everyoneMentioned; this.everyoneMentioned = data.mention_everyone || data.everyoneMentioned;
this.id = data.id; this.id = data.id;
if (data.edited_timestamp) this.editedTimestamp = Date.parse(data.edited_timestamp); if (data.edited_timestamp) {
this.editedTimestamp = Date.parse(data.edited_timestamp);
}
if (data.author instanceof _User2["default"]) this.author = data.author;else this.author = client.internal.users.add(new _User2["default"](data.author, client)); if (data.author instanceof _User2["default"]) {
this.author = data.author;
} else {
this.author = client.internal.users.add(new _User2["default"](data.author, client));
}
this.content = data.content; this.content = data.content;
@@ -63,15 +69,38 @@ var Message = (function (_Equality) {
// this is .add and not .get because it allows the bot to cache // this is .add and not .get because it allows the bot to cache
// users from messages from logs who may have left the server and were // users from messages from logs who may have left the server and were
// not previously cached. // not previously cached.
if (mention instanceof _User2["default"]) _this.mentions.push(mention);else _this.mentions.push(client.internal.users.add(new _User2["default"](mention, client))); if (mention instanceof _User2["default"]) {
_this.mentions.push(mention);
} else {
_this.mentions.push(client.internal.users.add(new _User2["default"](mention, client)));
}
}); });
} }
Message.prototype.isMentioned = function isMentioned(user) { Message.prototype.isMentioned = function isMentioned(user) {
user = this.client.internal.resolver.resolveUser(user); user = this.client.internal.resolver.resolveUser(user);
return !!(user && this.mentions.find(function (m) { if (!user) {
return m.id == user.id; return false;
})); }
for (var _iterator = this.mentions, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var mention = _ref;
if (mention.id == user.id) {
return true;
}
}
return false;
}; };
Message.prototype.toString = function toString() { Message.prototype.toString = function toString() {

View File

@@ -97,7 +97,7 @@ export default class Resolver {
if (resource instanceof String || typeof resource === "string") { if (resource instanceof String || typeof resource === "string") {
var role = null; var role = null;
for (var server of this.internal.servers) { for (var server of this.internal.servers) {
if (role = server.roles.find(r => r.id == resource)) { if (role = server.roles.get("id", resource)) {
return role; return role;
} }
} }

View File

@@ -24,13 +24,15 @@ export default class Message extends Equality{
this.everyoneMentioned = data.mention_everyone || data.everyoneMentioned; this.everyoneMentioned = data.mention_everyone || data.everyoneMentioned;
this.id = data.id; this.id = data.id;
if(data.edited_timestamp) if(data.edited_timestamp) {
this.editedTimestamp = Date.parse(data.edited_timestamp); this.editedTimestamp = Date.parse(data.edited_timestamp);
}
if(data.author instanceof User) if(data.author instanceof User) {
this.author = data.author; this.author = data.author;
else } else {
this.author = client.internal.users.add(new User(data.author, client)); this.author = client.internal.users.add(new User(data.author, client));
}
this.content = data.content; this.content = data.content;
@@ -42,10 +44,11 @@ export default class Message extends Equality{
// this is .add and not .get because it allows the bot to cache // this is .add and not .get because it allows the bot to cache
// users from messages from logs who may have left the server and were // users from messages from logs who may have left the server and were
// not previously cached. // not previously cached.
if(mention instanceof User) if(mention instanceof User) {
this.mentions.push(mention); this.mentions.push(mention);
else } else {
this.mentions.push(client.internal.users.add(new User(mention, client))); this.mentions.push(client.internal.users.add(new User(mention, client)));
}
}); });
} }
@@ -55,7 +58,15 @@ export default class Message extends Equality{
isMentioned(user){ isMentioned(user){
user = this.client.internal.resolver.resolveUser(user); user = this.client.internal.resolver.resolveUser(user);
return !!(user && this.mentions.find(m => m.id == user.id)); if (!user) {
return false
}
for (var mention of this.mentions) {
if (mention.id == user.id) {
return true;
}
}
return false;
} }
toString(){ toString(){