Webpack build for branch master: e66fa145d2

This commit is contained in:
Travis CI 2017-05-05 23:05:05 +00:00
parent 34d91e8e85
commit 136946d0b1
2 changed files with 8 additions and 7 deletions

View file

@ -12813,7 +12813,7 @@ class ClientUser extends User {
* @param {Guild|Snowflake} [options.guild] Limit the search to a specific guild * @param {Guild|Snowflake} [options.guild] Limit the search to a specific guild
* @returns {Promise<Message[]>} * @returns {Promise<Message[]>}
*/ */
fetchMentions(options = { limit: 25, roles: true, everyone: true, guild: null }) { fetchMentions(options = {}) {
return this.client.rest.methods.fetchMentions(options); return this.client.rest.methods.fetchMentions(options);
} }
@ -25036,11 +25036,12 @@ class RESTMethods {
} }
fetchMentions(options) { fetchMentions(options) {
if (options.guild) options.guild = options.guild.id ? options.guild.id : options.guild; if (options.guild instanceof Guild) options.guild = options.guild.id;
Util.mergeDefault({ limit: 25, roles: true, everyone: true, guild: null }, options);
return this.rest.makeRequest( return this.rest.makeRequest(
'get', 'get', Endpoints.User('@me').Mentions(options.limit, options.roles, options.everyone, options.guild), true
Endpoints.User('@me').Mentions(options.limit, options.roles, options.everyone, options.guild) ).then(data => data.map(m => new Message(this.client.channels.get(m.channel_id), m, this.client)));
).then(res => res.body.map(m => new Message(this.client.channels.get(m.channel_id), m, this.client)));
} }
addFriend(user) { addFriend(user) {

File diff suppressed because one or more lines are too long