From 4081bf8d2d0b2324aebc9192aeff28b2e322e65c Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Sun, 8 Nov 2015 21:03:45 +0000 Subject: [PATCH] Fixed bad error error ironic isn't it --- lib/Client/InternalClient.js | 22 +++++++++++----------- src/Client/InternalClient.js | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index 5cc18dd06..760f0c635 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -125,7 +125,7 @@ var InternalClient = (function () { request.post(Endpoints.SERVERS).set("authorization", self.token).send({ name: name, region: region }).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { // valid server, wait until it is cached var inter = setInterval(function () { @@ -149,7 +149,7 @@ var InternalClient = (function () { request.del(Endpoints.SERVER(server.id)).set("authorization", self.token).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { // remove channels of server then the server for (var _iterator = server.channels, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { @@ -195,7 +195,7 @@ var InternalClient = (function () { self.state = ConnectionState.DISCONNECTED; self.websocket = null; client.emit("disconnected"); - reject(new Error(err.response.text)); + reject(new Error(err)); } else { var token = res.body.token; self.state = ConnectionState.LOGGED_IN; @@ -210,7 +210,7 @@ var InternalClient = (function () { })["catch"](function (e) { self.state = ConnectionState.DISCONNECTED; client.emit("disconnected"); - reject(new Error(err.response.text)); + reject(new Error(err)); }); } }); @@ -235,7 +235,7 @@ var InternalClient = (function () { request.post(Endpoints.LOGOUT).set("authorization", self.token).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { if (_this.websocket) { _this.websocket.close(); @@ -265,7 +265,7 @@ var InternalClient = (function () { recipient_id: user.id }).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(self.private_channels.add(new PMChannel(res.body, self.client))); } @@ -311,7 +311,7 @@ var InternalClient = (function () { tts: options.tts }).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(destination.messages.add(new Message(res.body, destination, self.client))); @@ -335,7 +335,7 @@ var InternalClient = (function () { var deleteMsg = function deleteMsg() { request.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { message.channel.messages.remove(message); resolve(); @@ -375,7 +375,7 @@ var InternalClient = (function () { mentions: mentions }).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(message.channel.messages.update(message, new Message(res.body, message.channel, self.client))); } @@ -404,7 +404,7 @@ var InternalClient = (function () { request.post(Endpoints.CHANNEL_MESSAGES(channel.id)).set("authorization", self.token).attach("file", file, name).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(channel.messages.add(new Message(res.body, channel, self.client))); } @@ -440,7 +440,7 @@ var InternalClient = (function () { request.get(Endpoints.CHANNEL_MESSAGES(channel.id) + "?limit=" + limit + joinedParams).set("authorization", self.token).end(function (err, res) { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { var logs = []; res.body.forEach(function (msg) { diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index 405e0ff8f..907ba1570 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -120,7 +120,7 @@ class InternalClient { .send({ name, region }) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { // valid server, wait until it is cached var inter = setInterval(() => { @@ -146,7 +146,7 @@ class InternalClient { .set("authorization", self.token) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { // remove channels of server then the server for (var chan of server.channels) { @@ -182,7 +182,7 @@ class InternalClient { self.state = ConnectionState.DISCONNECTED; self.websocket = null; client.emit("disconnected"); - reject(new Error(err.response.text)); + reject(new Error(err)); } else { var token = res.body.token; self.state = ConnectionState.LOGGED_IN; @@ -198,7 +198,7 @@ class InternalClient { }).catch((e) => { self.state = ConnectionState.DISCONNECTED; client.emit("disconnected"); - reject(new Error(err.response.text)); + reject(new Error(err)); }); } @@ -225,7 +225,7 @@ class InternalClient { .set("authorization", self.token) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { if (this.websocket) { this.websocket.close(); @@ -259,7 +259,7 @@ class InternalClient { }) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(self.private_channels.add(new PMChannel(res.body, self.client))); } @@ -314,7 +314,7 @@ class InternalClient { }) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve( @@ -351,7 +351,7 @@ class InternalClient { .set("authorization", self.token) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { message.channel.messages.remove(message); resolve(); @@ -389,7 +389,7 @@ class InternalClient { }) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve( message.channel.messages.update @@ -425,7 +425,7 @@ class InternalClient { .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { resolve(channel.messages.add(new Message(res.body, channel, self.client))); } @@ -467,7 +467,7 @@ class InternalClient { .set("authorization", self.token) .end((err, res) => { if (err) { - reject(new Error(err.response.text)); + reject(new Error(err)); } else { var logs = []; res.body.forEach((msg) => {