Fixed DiscordAPIError#message sometimes being undefined

This commit is contained in:
SpaceEEC
2017-07-31 01:18:55 +02:00
committed by iCrawl
parent e7ebb23f14
commit a56a24d042

View File

@@ -5,9 +5,9 @@
class DiscordAPIError extends Error { class DiscordAPIError extends Error {
constructor(error) { constructor(error) {
super(); 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.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 * HTTP error code returned by Discord
@@ -32,7 +32,9 @@ class DiscordAPIError extends Error {
if (obj[k]._errors) { if (obj[k]._errors) {
messages.push(`${newKey}: ${obj[k]._errors.map(e => e.message).join(' ')}`); messages.push(`${newKey}: ${obj[k]._errors.map(e => e.message).join(' ')}`);
} else if (obj[k].code && obj[k].message) { } else if (obj[k].code && obj[k].message) {
messages.push(`${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 { } else {
messages = messages.concat(this.flattenErrors(obj[k], newKey)); messages = messages.concat(this.flattenErrors(obj[k], newKey));
} }