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

Rebuild lib after @enebe-nb's changes

Browse Source
This commit is contained in:
meew0
2016-01-15 15:15:25 +01:00
parent b3d5197013
commit 6f31130726
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Client/Resolver/Resolver.js
View File

@@ -208,9 +208,27 @@ var Resolver = (function () {
}
if (resource instanceof _StructuresUser2["default"]) {
// see if a PM exists
var chatFound = this.internal.private_channels.find(function (pmchat) {
return pmchat.recipient.equals(resource);
});
var chatFound = false;
for (var _iterator2 = this.internal.private_channels, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var pmchat = _ref2;
if (pmchat.recipient.equals(resource)) {
chatFound = pmchat;
break;
}
}
if (chatFound) {
// a PM already exists!
return Promise.resolve(chatFound);

6
lib/Util/Cache.js
View File

@@ -77,7 +77,11 @@ var Cache = (function (_Array) {
if (item) {
var index = this.indexOf(item);
Object.assign(this[index], data);
for (var dataIndex in data) {
if (data.hasOwnProperty(dataIndex)) {
this[index][dataIndex] = data[dataIndex];
}
}
this[discrimCacheS][data[this[discrimS]]] = this[index];
return this[index];
} else {