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

Prevent Guild.fetchMember from messing with fetchMembers

Browse Source
This commit is contained in:
Schuyler Cebulskie
2016-09-07 23:12:32 -04:00
parent 9bdf670a14
commit 465ff074e1
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/ClientDataManager.js
View File

@@ -73,11 +73,6 @@ class ClientDataManager {
return null; return null;
} }
newGuildMember(guild, data) {
if (guild.members.has(data.user.id)) return guild.members.get(data.user.id);
return guild._addMember(data);
}
killGuild(guild) { killGuild(guild) {
const already = this.client.guilds.has(guild.id); const already = this.client.guilds.has(guild.id);
this.client.guilds.delete(guild.id); this.client.guilds.delete(guild.id);

3
src/client/actions/GuildMemberGet.js
View File

@@ -2,8 +2,7 @@ const Action = require('./Action');
class GuildMemberGetAction extends Action { class GuildMemberGetAction extends Action {
handle(guild, data) { handle(guild, data) {
const client = this.client; const member = guild._addMember(data, false);
const member = client.dataManager.newGuildMember(guild, data);
return { return {
member, member,
}; };

2
src/client/websocket/packets/handlers/GuildMembersChunk.js
View File

@@ -11,7 +11,7 @@ class GuildMembersChunkHandler extends AbstractHandler {
const members = []; const members = [];
if (guild) { if (guild) {
for (const member of data.members) members.push(guild._addMember(member, true)); for (const member of data.members) members.push(guild._addMember(member, false));
} }
guild._checkChunks(); guild._checkChunks();

5
src/structures/Guild.js
View File

@@ -426,6 +426,7 @@ class Guild {
* @returns {Promise<GuildMember>} * @returns {Promise<GuildMember>}
*/ */
fetchMember(user) { fetchMember(user) {
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')); if (!user) return Promise.reject(new Error('user is not cached'));
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));
@@ -576,7 +577,7 @@ class Guild {
return this.name; return this.name;
} }
_addMember(guildUser, noEvent) { _addMember(guildUser, emitEvent = true) {
if (!(guildUser.user instanceof User)) guildUser.user = this.client.dataManager.newUser(guildUser.user); if (!(guildUser.user instanceof User)) guildUser.user = this.client.dataManager.newUser(guildUser.user);
guildUser.joined_at = guildUser.joined_at || 0; guildUser.joined_at = guildUser.joined_at || 0;
@@ -600,7 +601,7 @@ class Guild {
* @param {Guild} guild The guild that the user has joined * @param {Guild} guild The guild that the user has joined
* @param {GuildMember} member The member that has joined * @param {GuildMember} member The member that has joined
*/ */
if (this.client.ws.status === Constants.Status.READY && !noEvent) { if (this.client.ws.status === Constants.Status.READY && emitEvent) {
this.client.emit(Constants.Events.GUILD_MEMBER_ADD, this, member); this.client.emit(Constants.Events.GUILD_MEMBER_ADD, this, member);
} }