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

cleaned up deleteMessage

Browse Source
This commit is contained in:
hydrabolt
2015-10-03 15:00:57 +01:00
parent 843c0defeb
commit ba69538029
2 changed files with 20 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Client.js
View File

@@ -352,7 +352,7 @@ var Client = (function () {
var self = this; var self = this;
var prom = new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
if (timeout) { if (timeout) {
setTimeout(remove, timeout); setTimeout(remove, timeout);
} else { } else {
@@ -360,37 +360,25 @@ var Client = (function () {
} }
function remove() { function remove() {
if (self.options.queue) { request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
if (!self.queue[message.channel.id]) { if (err) {
self.queue[message.channel.id] = []; bad();
} else {
good();
} }
self.queue[message.channel.id].push({ });
action: "deleteMessage",
message: message,
then: good,
error: bad
});
self.checkQueue(message.channel.id);
} else {
self._deleteMessage(message).then(good)["catch"](bad);
}
} }
function good() { function good() {
prom.success = true; callback();
callback(null);
resolve(); resolve();
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
}, { }, {
key: "updateMessage", key: "updateMessage",
@@ -1598,21 +1586,6 @@ var Client = (function () {
}); });
}); });
} }
}, {
key: "_deleteMessage",
value: function _deleteMessage(message) {
var self = this;
return new Promise(function (resolve, reject) {
request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
if (err) {
reject(err);
} else {
resolve();
}
});
});
}
}, { }, {
key: "getGateway", key: "getGateway",
value: function getGateway() { value: function getGateway() {

49
src/Client.js
View File

@@ -389,7 +389,7 @@ class Client {
var self = this; var self = this;
var prom = new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
if (timeout) { if (timeout) {
setTimeout(remove, timeout) setTimeout(remove, timeout)
} else { } else {
@@ -397,37 +397,29 @@ class Client {
} }
function remove() { function remove() {
if (self.options.queue) { request
if (!self.queue[message.channel.id]) { .del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
self.queue[message.channel.id] = []; .set("authorization", self.token)
.end(function (err, res) {
if(err){
bad();
}else{
good();
} }
self.queue[message.channel.id].push({ });
action: "deleteMessage",
message: message,
then: good,
error: bad
});
self.checkQueue(message.channel.id);
} else {
self._deleteMessage(message).then(good).catch(bad);
}
} }
function good() { function good() {
prom.success = true; callback();
callback(null);
resolve(); resolve();
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
updateMessage(message, content, callback = function (err, msg) { }) { updateMessage(message, content, callback = function (err, msg) { }) {
@@ -1338,23 +1330,6 @@ class Client {
}); });
} }
_deleteMessage(message) {
var self = this;
return new Promise(function (resolve, reject) {
request
.del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
.set("authorization", self.token)
.end(function (err, res) {
if (err) {
reject(err);
} else {
resolve();
}
});
});
}
getGateway() { getGateway() {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {