Added updateMessage

This commit is contained in:
hydrabolt
2015-10-31 23:23:48 +00:00
parent a333548c00
commit 4b4b7d6a47
8 changed files with 180 additions and 36 deletions

View File

@@ -148,6 +148,8 @@ var Client = (function (_EventEmitter) {
}); });
}; };
// def deleteMessage
Client.prototype.deleteMessage = function deleteMessage(msg) { Client.prototype.deleteMessage = function deleteMessage(msg) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e) {} : arguments[2]; var callback = arguments.length <= 2 || arguments[2] === undefined ? function (e) {} : arguments[2];
@@ -169,6 +171,29 @@ var Client = (function (_EventEmitter) {
}); });
}; };
//def updateMessage
Client.prototype.updateMessage = function updateMessage(msg, content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
var self = this;
return new Promise(function (resolve, reject) {
if (typeof options === "function") {
// options is the callback
callback = options;
}
self.internal.updateMessage(msg, content, options).then(function (msg) {
callback(null, msg);
resolve(msg);
})["catch"](function (e) {
callback(e);
reject(e);
});
});
};
return Client; return Client;
})(EventEmitter); })(EventEmitter);

View File

@@ -184,6 +184,8 @@ var InternalClient = (function () {
}); });
}; };
// def deleteMessage
InternalClient.prototype.deleteMessage = function deleteMessage(_message) { InternalClient.prototype.deleteMessage = function deleteMessage(_message) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
@@ -215,6 +217,38 @@ var InternalClient = (function () {
}); });
}; };
// def updateMessage
InternalClient.prototype.updateMessage = function updateMessage(msg, _content) {
var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
var self = this;
return new Promise(function (resolve, reject) {
var message = self.resolver.resolveMessage(msg);
if (message) {
var content = self.resolver.resolveString(_content);
var mentions = self.resolver.resolveMentions(content);
request.patch(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)).set("authorization", self.token).send({
content: content,
tts: options.tts,
mentions: mentions
}).end(function (err, res) {
if (err) {
reject(new Error(err.response.text));
} else {
resolve(message.channel.messages.update(message, new Message(res.body, message.channel, self.client)));
}
});
} else {
reject(new Error("Supplied message did not resolve to a message!"));
}
});
};
InternalClient.prototype.sendWS = function sendWS(object) { InternalClient.prototype.sendWS = function sendWS(object) {
this.websocket.send(JSON.stringify(object)); this.websocket.send(JSON.stringify(object));
}; };

View File

@@ -68,12 +68,22 @@ var Cache = (function (_Array) {
} }
}; };
Cache.prototype.update = function update(old, data) {
var index = this.get(this.discrim, old);
if (~index) {
this[index] = data;
return this[index];
} else {
return false;
}
};
Cache.prototype.remove = function remove(data) { Cache.prototype.remove = function remove(data) {
var index = this.indexOf(data); var index = this.indexOf(data);
if (~index) { if (~index) {
this.splice(index, 1); this.splice(index, 1);
} else { } else {
var item = this.get("id", data.id); var item = this.get(this.discrim, data.id);
if (item) { if (item) {
this.splice(this.indexOf(item), 1); this.splice(this.indexOf(item), 1);
} }

View File

@@ -11,7 +11,9 @@ a.on("debug", function (m) {
a.on("message", function (m) { a.on("message", function (m) {
if (m.content === "$$$") a.reply(m, "hi man!").then(function (m) { if (m.content === "$$$") a.reply(m, "hi man!").then(function (m) {
a.deleteMessage(m); a.updateMessage(m, "!!!").then(function (m) {
a.updateMessage(m, "the old content was " + m.content);
});
}); });
}); });

View File

@@ -129,7 +129,7 @@ class Client extends EventEmitter {
}); });
}); });
} }
// def deleteMessage
deleteMessage(msg, options = {}, callback = function (e) { }) { deleteMessage(msg, options = {}, callback = function (e) { }) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -150,6 +150,27 @@ class Client extends EventEmitter {
}); });
} }
//def updateMessage
updateMessage(msg, content, options = {}, callback = function(err, msg){}) {
var self = this;
return new Promise((resolve, reject) => {
if (typeof options === "function") {
// options is the callback
callback = options;
}
self.internal.updateMessage(msg, content, options)
.then(msg => {
callback(null, msg);
resolve(msg);
})
.catch(e => {
callback(e);
reject(e);
});
});
}
} }
module.exports = Client; module.exports = Client;

View File

@@ -202,7 +202,7 @@ class InternalClient {
}); });
} }
// def deleteMessage
deleteMessage(_message, options = {}) { deleteMessage(_message, options = {}) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -211,13 +211,13 @@ class InternalClient {
if (message) { if (message) {
if(options.wait){ if (options.wait) {
setTimeout(deleteMsg, options.wait); setTimeout(deleteMsg, options.wait);
}else{ } else {
deleteMsg(); deleteMsg();
} }
function deleteMsg(){ function deleteMsg() {
request request
.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id)) .del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id))
.set("authorization", self.token) .set("authorization", self.token)
@@ -230,13 +230,53 @@ class InternalClient {
} }
}); });
} }
}else { } else {
reject(new Error("Supplied message did not resolve to a message!")); reject(new Error("Supplied message did not resolve to a message!"));
} }
}); });
} }
// def updateMessage
updateMessage(msg, _content, options = {}) {
var self = this;
return new Promise((resolve, reject) => {
var message = self.resolver.resolveMessage(msg);
if (message) {
var content = self.resolver.resolveString(_content);
var mentions = self.resolver.resolveMentions(content);
request
.patch(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id))
.set("authorization", self.token)
.send({
content: content,
tts: options.tts,
mentions: mentions
})
.end((err, res) => {
if (err) {
reject(new Error(err.response.text));
} else {
resolve(
message.channel.messages.update
(message, new Message(res.body, message.channel, self.client)
));
}
})
} else {
reject(new Error("Supplied message did not resolve to a message!"));
}
});
}
sendWS(object) { sendWS(object) {
this.websocket.send(JSON.stringify(object)); this.websocket.send(JSON.stringify(object));

View File

@@ -1,61 +1,71 @@
"use strict"; "use strict";
class Cache extends Array{ class Cache extends Array {
constructor(discrim, limit){ constructor(discrim, limit) {
super(); super();
this.discrim = discrim || "id"; this.discrim = discrim || "id";
} }
get(key, value){ get(key, value) {
var found = null; var found = null;
this.forEach( (val, index, array) => { this.forEach((val, index, array) => {
if(val.hasOwnProperty(key) && val[key] == value){ if (val.hasOwnProperty(key) && val[key] == value) {
found = val; found = val;
return; return;
} }
} ); });
return found; return found;
} }
getAll(key, value){ getAll(key, value) {
var found = []; var found = [];
this.forEach( (val, index, array) => { this.forEach((val, index, array) => {
if(val.hasOwnProperty(key) && val[key] == value){ if (val.hasOwnProperty(key) && val[key] == value) {
found.push(val); found.push(val);
return; return;
} }
} ); });
return found; return found;
} }
add(data){ add(data) {
var exit = false; var exit = false;
for(var item of this){ for (var item of this) {
if(item[this.discrim] === data[this.discrim]){ if (item[this.discrim] === data[this.discrim]) {
exit = item; exit = item;
break; break;
} }
} }
if(exit){ if (exit) {
return exit; return exit;
}else{ } else {
if(this.limit && this.length >= this.limit){ if (this.limit && this.length >= this.limit) {
this.splice(0, 1); this.splice(0, 1);
} }
this.push(data); this.push(data);
return data; return data;
} }
} }
remove(data){ update(old, data) {
var index = this.get(this.discrim, old);
if (~index) {
this[index] = data;
return this[index];
} else {
return false;
}
}
remove(data) {
var index = this.indexOf(data); var index = this.indexOf(data);
if(~index){ if (~index) {
this.splice(index, 1); this.splice(index, 1);
}else{ } else {
var item = this.get("id", data.id); var item = this.get(this.discrim, data.id);
if(item){ if (item) {
this.splice(this.indexOf(item), 1); this.splice(this.indexOf(item), 1);
} }
} }
return false; return false;
} }

View File

@@ -9,7 +9,9 @@ a.on("message", m => {
if(m.content === "$$$") if(m.content === "$$$")
a.reply(m, "hi man!") a.reply(m, "hi man!")
.then( m => { .then( m => {
a.deleteMessage(m); a.updateMessage(m, "!!!").then( m => {
a.updateMessage(m, "the old content was " + m.content);
});
}); });
}); });