From c2029a66e99df570df196033a5dc52b78a7b9d3e Mon Sep 17 00:00:00 2001 From: bdistin Date: Sun, 24 Sep 2017 10:24:58 -0500 Subject: [PATCH] Rip, fixes a bug we didn't even know to look for... 1870 lives on. (#1931) possibly fixes #1870 --- src/stores/GuildMemberStore.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/stores/GuildMemberStore.js b/src/stores/GuildMemberStore.js index 2a52e3fe2..3691f253e 100644 --- a/src/stores/GuildMemberStore.js +++ b/src/stores/GuildMemberStore.js @@ -90,17 +90,18 @@ class GuildMemberStore extends DataStore { */ fetch(options) { if (!options) return this._fetchMany(); - const user = this.resolveID(options); + const user = this.client.users.resolveID(options); if (user) return this._fetchSingle({ user, cache: true }); if (options.user) { - options.user = this.resolveID(options.user); + options.user = this.client.users.resolveID(options.user); if (options.user) return this._fetchSingle(options); } return this._fetchMany(options); } _fetchSingle({ user, cache }) { - if (this.has(user)) return Promise.resolve(this.get(user)); + const existing = this.get(user); + if (existing) return Promise.resolve(existing); return this.client.api.guilds(this.guild.id).members(user).get() .then(data => this.create(data, cache)); }