Webpack build for branch 11.1-dev: bdc61a4068

This commit is contained in:
Travis CI 2017-07-30 23:33:07 +00:00
parent 01f1201bf5
commit d84f637b35
2 changed files with 7 additions and 5 deletions

View file

@ -12375,9 +12375,9 @@ module.exports = GroupDMChannel;
class DiscordAPIError extends Error {
constructor(error) {
super();
const flattened = error.errors ? `\n${this.constructor.flattenErrors(error.errors).join('\n')}` : '';
const flattened = this.constructor.flattenErrors(error.errors || error).join('\n');
this.name = 'DiscordAPIError';
this.message = `${error.message}${flattened}`;
this.message = error.message && flattened ? `${error.message}\n${flattened}` : error.message || flattened;
/**
* HTTP error code returned by Discord
@ -12401,8 +12401,10 @@ class DiscordAPIError extends Error {
if (obj[k]._errors) {
messages.push(`${newKey}: ${obj[k]._errors.map(e => e.message).join(' ')}`);
} else if (obj[k].code && obj[k].message) {
messages.push(`${obj[k].code}: ${obj[k].message}`);
} else if (obj[k].code || obj[k].message) {
messages.push(`${obj[k].code ? `${obj[k].code}: ` : ''}: ${obj[k].message}`.trim());
} else if (typeof obj[k] === 'string') {
messages.push(obj[k]);
} else {
messages = messages.concat(this.flattenErrors(obj[k], newKey));
}

File diff suppressed because one or more lines are too long