Skip to content

Commit

Permalink
feat: backport after and before parameter when fetching a reaction's …
Browse files Browse the repository at this point in the history
…users (#2218)

Commits:
- f40a5e9
- 5cd4269
  • Loading branch information
SpaceEEC authored and iCrawl committed Jan 4, 2018
1 parent b3eb1bb commit db5bdcd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/client/rest/RESTMethods.js
Expand Up @@ -914,8 +914,10 @@ class RESTMethods {
.then(() => message);
}

getMessageReactionUsers(message, emoji, limit = 100) {
return this.rest.makeRequest('get', Endpoints.Message(message).Reaction(emoji, limit), true);
getMessageReactionUsers(message, emoji, options) {
const queryString = (querystring.stringify(options).match(/[^=&?]+=[^=&?]+/g) || []).join('&');

return this.rest.makeRequest('get', `${Endpoints.Message(message).Reaction(emoji)}?${queryString}`, true);
}

getApplication(id) {
Expand Down
9 changes: 5 additions & 4 deletions src/structures/MessageReaction.js
Expand Up @@ -72,19 +72,20 @@ class MessageReaction {
/**
* Fetch all the users that gave this reaction. Resolves with a collection of users, mapped by their IDs.
* @param {number} [limit=100] The maximum amount of users to fetch, defaults to 100
* @param {Object} [options] Options to fetch users
* @param {Snowflake} [options.before] Limit fetching users to those with an id lower than the supplied id
* @param {Snowflake} [options.after] Limit fetching users to those with an id greater than the supplied id
* @returns {Promise<Collection<Snowflake, User>>}
*/
fetchUsers(limit = 100) {
fetchUsers(limit = 100, { after, before } = {}) {
const message = this.message;
return message.client.rest.methods.getMessageReactionUsers(
message, this.emoji.identifier, limit
message, this.emoji.identifier, { after, before, limit }
).then(users => {
this.users = new Collection();
for (const rawUser of users) {
const user = this.message.client.dataManager.newUser(rawUser);
this.users.set(user.id, user);
}
this.count = this.users.size;
return this.users;
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/util/Constants.js
Expand Up @@ -187,8 +187,8 @@ const Endpoints = exports.Endpoints = {
toString: () => mbase,
reactions: `${mbase}/reactions`,
ack: `${mbase}/ack`,
Reaction: (emoji, limit) => {
const rbase = `${mbase}/reactions/${emoji}${limit ? `?limit=${limit}` : ''}`;
Reaction: emoji => {
const rbase = `${mbase}/reactions/${emoji}`;
return {
toString: () => rbase,
User: userID => `${rbase}/${userID}`,
Expand Down

0 comments on commit db5bdcd

Please sign in to comment.