Merge remote-tracking branch 'origin/indev' into indev-voice

This commit is contained in:
Amish Shah
2016-10-24 12:50:40 +01:00
6 changed files with 46 additions and 32 deletions

View File

@@ -372,26 +372,27 @@ class RESTMethods {
});
}
banGuildMember(guild, member, deleteDays) {
banGuildMember(guild, member, deleteDays = 0) {
return new Promise((resolve, reject) => {
const id = this.rest.client.resolver.resolveUserID(member);
if (!id) throw new Error('Couldn\'t resolve the user ID to ban.');
this.rest.makeRequest('put', `${Constants.Endpoints.guildBans(guild.id)}/${id}`, true, {
'delete-message-days': deleteDays,
}).then(() => {
if (member instanceof GuildMember) {
resolve(member);
return;
}
const user = this.rest.client.resolver.resolveUser(id);
if (user) {
member = this.rest.client.resolver.resolveGuildMember(guild, user);
resolve(member || user);
return;
}
resolve(id);
}).catch(reject);
this.rest.makeRequest('put',
`${Constants.Endpoints.guildBans(guild.id)}/${id}?delete-message-days=${deleteDays}`, true, {
'delete-message-days': deleteDays,
}).then(() => {
if (member instanceof GuildMember) {
resolve(member);
return;
}
const user = this.rest.client.resolver.resolveUser(id);
if (user) {
member = this.rest.client.resolver.resolveGuildMember(guild, user);
resolve(member || user);
return;
}
resolve(id);
}).catch(reject);
});
}