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

make fetching members way better (#1124)

Browse Source 
* make fetching members way better

* fix up fetching edge cases yet again

* stop making useless collections

* Update Guild.js

* Update Guild.js

* consistency?

* Update GuildMembersChunk.js

* Update Guild.js

* Update Guild.js

* Open editor to fix issues instead of GH: check
This commit is contained in:
Gus Caplan
2017-05-21 15:09:37 -05:00
committed by Crawl
parent fce15ba33c
commit 694f8278f1
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
const AbstractHandler = require('./AbstractHandler'); const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants'); const Constants = require('../../../../util/Constants');
// Uncomment in v12 const Collection = require('../../../../util/Collection');
// const Collection = require('../../../../util/Collection');
class GuildMembersChunkHandler extends AbstractHandler { class GuildMembersChunkHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@@ -9,13 +8,9 @@ class GuildMembersChunkHandler extends AbstractHandler {
const data = packet.d; const data = packet.d;
const guild = client.guilds.get(data.guild_id); const guild = client.guilds.get(data.guild_id);
if (!guild) return; if (!guild) return;
const members = new Collection();
// Uncomment in v12 for (const member of data.members) members.set(member.id, guild._addMember(member, false));
// const members = new Collection();
//
// for (const member of data.members) members.set(member.id, guild._addMember(member, false));
const members = data.members.map(member => guild._addMember(member, false));
client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, members, guild); client.emit(Constants.Events.GUILD_MEMBERS_CHUNK, members, guild);

19
src/structures/Guild.js
View File

@@ -500,14 +500,12 @@ class Guild {
* this should not be necessary. * this should not be necessary.
* @param {string} [query=''] Limit fetch to members with similar usernames * @param {string} [query=''] Limit fetch to members with similar usernames
* @param {number} [limit=0] Maximum number of members to request * @param {number} [limit=0] Maximum number of members to request
* @returns {Promise<Guild>} * @returns {Promise<Collection<Snowflake, GuildMember>>}
*/ */
fetchMembers(query = '', limit = 0) { fetchMembers(query = '', limit = 0) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.memberCount === this.members.size) { if (this.memberCount === this.members.size) {
// Uncomment in v12 resolve(new Collection());
// resolve(this.members)
resolve(this);
return; return;
} }
this.client.ws.send({ this.client.ws.send({
@@ -518,17 +516,20 @@ class Guild {
limit, limit,
}, },
}); });
const fetchedMembers = new Collection();
const handler = (members, guild) => { const handler = (members, guild) => {
if (guild.id !== this.id) return; if (guild.id !== this.id) return;
if (this.memberCount === this.members.size || members.length < 1000) { for (const member of members.values()) fetchedMembers.set(member.user.id, member);
if (this.memberCount === this.members.size || ((query || limit) && members.size < 1000)) {
this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
// Uncomment in v12 resolve(fetchedMembers);
// resolve(this.members)
resolve(this);
} }
}; };
this.client.on(Constants.Events.GUILD_MEMBERS_CHUNK, handler); this.client.on(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
this.client.setTimeout(() => reject(new Error('Members didn\'t arrive in time.')), 120 * 1000); this.client.setTimeout(() => {
this.client.removeListener(Constants.Events.GUILD_MEMBERS_CHUNK, handler);
reject(new Error('Members didn\'t arrive in time.'));
}, 120 * 1000);
}); });
} }