Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 12:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow users and members to not be cached (#1097)

Browse Source
This commit is contained in:
Gus Caplan
2017-01-14 15:20:09 -06:00
committed by Amish Shah
parent e216fc7a81
commit 78bf402e8e
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/Client.js
View File

@@ -270,11 +270,12 @@ class Client extends EventEmitter {
* Caches a user, or obtains it from the cache if it's already cached. * Caches a user, or obtains it from the cache if it's already cached.
* <warn>This is only available when using a bot account.</warn> * <warn>This is only available when using a bot account.</warn>
* @param {string} id The ID of the user to obtain * @param {string} id The ID of the user to obtain
* @param {boolean} [cache=true] Insert the user into the users cache
* @returns {Promise<User>} * @returns {Promise<User>}
*/ */
fetchUser(id) { fetchUser(id, cache = true) {
if (this.users.has(id)) return Promise.resolve(this.users.get(id)); if (this.users.has(id)) return Promise.resolve(this.users.get(id));
return this.rest.methods.getUser(id); return this.rest.methods.getUser(id, cache);
} }
/** /**

24
src/client/rest/RESTMethods.js
View File

@@ -258,10 +258,14 @@ class RESTMethods {
); );
} }
getUser(userID) { getUser(userID, cache) {
return this.rest.makeRequest('get', Constants.Endpoints.user(userID), true).then(data => return this.rest.makeRequest('get', Constants.Endpoints.user(userID), true).then(data => {
this.client.actions.UserGet.handle(data).user if (cache) {
); return this.client.actions.UserGet.handle(data).user;
} else {
return new User(this.client, data);
}
});
} }
updateCurrentUser(_data, password) { updateCurrentUser(_data, password) {
@@ -351,10 +355,14 @@ class RESTMethods {
return this.rest.makeRequest('get', Constants.Endpoints.channelMessage(channel.id, messageID), true); return this.rest.makeRequest('get', Constants.Endpoints.channelMessage(channel.id, messageID), true);
} }
getGuildMember(guild, user) { getGuildMember(guild, user, cache) {
return this.rest.makeRequest('get', Constants.Endpoints.guildMember(guild.id, user.id), true).then(data => return this.rest.makeRequest('get', Constants.Endpoints.guildMember(guild.id, user.id), true).then(data => {
this.client.actions.GuildMemberGet.handle(guild, data).member if (cache) {
); return this.client.actions.GuildMemberGet.handle(guild, data).member;
} else {
return new GuildMember(guild, data);
}
});
} }
updateGuildMember(member, data) { updateGuildMember(member, data) {

5
src/structures/Guild.js
View File

@@ -325,14 +325,15 @@ class Guild {
/** /**
* Fetch a single guild member from a user. * Fetch a single guild member from a user.
* @param {UserResolvable} user The user to fetch the member for * @param {UserResolvable} user The user to fetch the member for
* @param {boolean} [cache=true] Insert the user into the users cache
* @returns {Promise<GuildMember>} * @returns {Promise<GuildMember>}
*/ */
fetchMember(user) { fetchMember(user, cache = true) {
if (this._fetchWaiter) return Promise.reject(new Error('Already fetching guild members.')); if (this._fetchWaiter) return Promise.reject(new Error('Already fetching guild members.'));
user = this.client.resolver.resolveUser(user); user = this.client.resolver.resolveUser(user);
if (!user) return Promise.reject(new Error('User is not cached. Use Client.fetchUser first.')); if (!user) return Promise.reject(new Error('User is not cached. Use Client.fetchUser first.'));
if (this.members.has(user.id)) return Promise.resolve(this.members.get(user.id)); if (this.members.has(user.id)) return Promise.resolve(this.members.get(user.id));
return this.client.rest.methods.getGuildMember(this, user); return this.client.rest.methods.getGuildMember(this, user, cache);
} }
/** /**