Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-14 02:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bad error error

Browse Source 
ironic isn't it
This commit is contained in:
hydrabolt
2015-11-08 21:03:45 +00:00
parent 82206e75b6
commit 4081bf8d2d
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Client/InternalClient.js
View File

@@ -125,7 +125,7 @@ var InternalClient = (function () {
request.post(Endpoints.SERVERS).set("authorization", self.token).send({ name: name, region: region }).end(function (err, res) { request.post(Endpoints.SERVERS).set("authorization", self.token).send({ name: name, region: region }).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
// valid server, wait until it is cached // valid server, wait until it is cached
var inter = setInterval(function () { 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) { request.del(Endpoints.SERVER(server.id)).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
// remove channels of server then the server // remove channels of server then the server
for (var _iterator = server.channels, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { 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.state = ConnectionState.DISCONNECTED;
self.websocket = null; self.websocket = null;
client.emit("disconnected"); client.emit("disconnected");
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
var token = res.body.token; var token = res.body.token;
self.state = ConnectionState.LOGGED_IN; self.state = ConnectionState.LOGGED_IN;
@@ -210,7 +210,7 @@ var InternalClient = (function () {
})["catch"](function (e) { })["catch"](function (e) {
self.state = ConnectionState.DISCONNECTED; self.state = ConnectionState.DISCONNECTED;
client.emit("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) { request.post(Endpoints.LOGOUT).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
if (_this.websocket) { if (_this.websocket) {
_this.websocket.close(); _this.websocket.close();
@@ -265,7 +265,7 @@ var InternalClient = (function () {
recipient_id: user.id recipient_id: user.id
}).end(function (err, res) { }).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(self.private_channels.add(new PMChannel(res.body, self.client))); resolve(self.private_channels.add(new PMChannel(res.body, self.client)));
} }
@@ -311,7 +311,7 @@ var InternalClient = (function () {
tts: options.tts tts: options.tts
}).end(function (err, res) { }).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(destination.messages.add(new Message(res.body, destination, self.client))); resolve(destination.messages.add(new Message(res.body, destination, self.client)));
@@ -335,7 +335,7 @@ var InternalClient = (function () {
var deleteMsg = function deleteMsg() { var deleteMsg = function deleteMsg() {
request.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).end(function (err, res) { request.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
message.channel.messages.remove(message); message.channel.messages.remove(message);
resolve(); resolve();
@@ -375,7 +375,7 @@ var InternalClient = (function () {
mentions: mentions mentions: mentions
}).end(function (err, res) { }).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(message.channel.messages.update(message, new Message(res.body, message.channel, self.client))); 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) { request.post(Endpoints.CHANNEL_MESSAGES(channel.id)).set("authorization", self.token).attach("file", file, name).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(channel.messages.add(new Message(res.body, channel, self.client))); 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) { request.get(Endpoints.CHANNEL_MESSAGES(channel.id) + "?limit=" + limit + joinedParams).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
var logs = []; var logs = [];
res.body.forEach(function (msg) { res.body.forEach(function (msg) {

22
src/Client/InternalClient.js
View File

@@ -120,7 +120,7 @@ class InternalClient {
.send({ name, region }) .send({ name, region })
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
// valid server, wait until it is cached // valid server, wait until it is cached
var inter = setInterval(() => { var inter = setInterval(() => {
@@ -146,7 +146,7 @@ class InternalClient {
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
// remove channels of server then the server // remove channels of server then the server
for (var chan of server.channels) { for (var chan of server.channels) {
@@ -182,7 +182,7 @@ class InternalClient {
self.state = ConnectionState.DISCONNECTED; self.state = ConnectionState.DISCONNECTED;
self.websocket = null; self.websocket = null;
client.emit("disconnected"); client.emit("disconnected");
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
var token = res.body.token; var token = res.body.token;
self.state = ConnectionState.LOGGED_IN; self.state = ConnectionState.LOGGED_IN;
@@ -198,7 +198,7 @@ class InternalClient {
}).catch((e) => { }).catch((e) => {
self.state = ConnectionState.DISCONNECTED; self.state = ConnectionState.DISCONNECTED;
client.emit("disconnected"); client.emit("disconnected");
reject(new Error(err.response.text)); reject(new Error(err));
}); });
} }
@@ -225,7 +225,7 @@ class InternalClient {
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
if (this.websocket) { if (this.websocket) {
this.websocket.close(); this.websocket.close();
@@ -259,7 +259,7 @@ class InternalClient {
}) })
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(self.private_channels.add(new PMChannel(res.body, self.client))); resolve(self.private_channels.add(new PMChannel(res.body, self.client)));
} }
@@ -314,7 +314,7 @@ class InternalClient {
}) })
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve( resolve(
@@ -351,7 +351,7 @@ class InternalClient {
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
message.channel.messages.remove(message); message.channel.messages.remove(message);
resolve(); resolve();
@@ -389,7 +389,7 @@ class InternalClient {
}) })
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve( resolve(
message.channel.messages.update message.channel.messages.update
@@ -425,7 +425,7 @@ class InternalClient {
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
resolve(channel.messages.add(new Message(res.body, channel, self.client))); resolve(channel.messages.add(new Message(res.body, channel, self.client)));
} }
@@ -467,7 +467,7 @@ class InternalClient {
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
reject(new Error(err.response.text)); reject(new Error(err));
} else { } else {
var logs = []; var logs = [];
res.body.forEach((msg) => { res.body.forEach((msg) => {