dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-06-05 07:42:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(BaseManager): BaseManager#valueOf should return cache (#3776)

Browse source 
* BaseManager#valueOf should return cache

* Update Util#flatten to handle valueOf being a Collection

* Update Util.js - typo

Co-Authored-By: Amish Shah <amishshah.2k@gmail.com>

Co-authored-by: Amish Shah <amishshah.2k@gmail.com>
This commit is contained in:
Ryan Munro 2020-02-13 08:26:17 +11:00 committed by GitHub
parent 592021df92
commit 62b227c2bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/managers/BaseManager.js
View file

@ -72,6 +72,10 @@ class BaseManager {
if (typeof idOrInstance === 'string') return idOrInstance; if (typeof idOrInstance === 'string') return idOrInstance;
return null; return null;
} }
valueOf() {
return this.cache;
}
} }
module.exports = BaseManager; module.exports = BaseManager;

4
src/util/Util.js
View file

@ -36,8 +36,10 @@ class Util {
const elemIsObj = isObject(element); const elemIsObj = isObject(element);
const valueOf = elemIsObj && typeof element.valueOf === 'function' ? element.valueOf() : null; const valueOf = elemIsObj && typeof element.valueOf === 'function' ? element.valueOf() : null;
// If it's a collection, make the array of keys // If it's a Collection, make the array of keys
if (element instanceof require('./Collection')) out[newProp] = Array.from(element.keys()); if (element instanceof require('./Collection')) out[newProp] = Array.from(element.keys());
// If the valueOf is a Collection, use its array of keys
else if (valueOf instanceof require('./Collection')) out[newProp] = Array.from(valueOf.keys());
// If it's an array, flatten each element // If it's an array, flatten each element
else if (Array.isArray(element)) out[newProp] = element.map(e => Util.flatten(e)); else if (Array.isArray(element)) out[newProp] = element.map(e => Util.flatten(e));
// If it's an object with a primitive `valueOf`, use that value // If it's an object with a primitive `valueOf`, use that value