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

Webpack build for branch master: 694f8278f1

Browse source
This commit is contained in:
Travis CI 2017-05-21 20:13:21 +00:00
parent 83373dcdbd
commit 7d03971c77
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
discord.master.js
View file

@ -5727,14 +5727,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({
@ -5745,17 +5743,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);
}); });
} }
@ -25026,8 +25027,7 @@ module.exports = GuildMemberUpdateHandler;
const AbstractHandler = __webpack_require__(1); const AbstractHandler = __webpack_require__(1);
const Constants = __webpack_require__(0); const Constants = __webpack_require__(0);
// Uncomment in v12 const Collection = __webpack_require__(3);
// const Collection = require('../../../../util/Collection');
class GuildMembersChunkHandler extends AbstractHandler { class GuildMembersChunkHandler extends AbstractHandler {
handle(packet) { handle(packet) {
@ -25035,13 +25035,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);

4
discord.master.min.js vendored
View file

File diff suppressed because one or more lines are too long