Added deleting messages

This commit is contained in:
hydrabolt
2015-10-31 23:12:14 +00:00
parent 28308433da
commit a333548c00
10 changed files with 195 additions and 44 deletions

View File

@@ -3,40 +3,40 @@
var InternalClient = require("./InternalClient.js");
var EventEmitter = require("events");
class Client extends EventEmitter{
class Client extends EventEmitter {
/*
this class is an interface for the internal
client.
*/
constructor(options){
constructor(options) {
super();
this.options = options || {};
this.internal = new InternalClient(this);
}
// def login
login(email, password, cb=function(err, token){}){
login(email, password, cb = function (err, token) { }) {
var self = this;
return new Promise((resolve, reject) => {
self.internal.login(email, password)
.then((token)=>{
.then((token) => {
cb(null, token);
resolve(token);
})
.catch((e)=>{
.catch((e) => {
cb(e);
reject(e);
});
});
}
// def logout
logout(cb=function(err){}){
logout(cb = function (err) { }) {
var self = this;
return new Promise((resolve, reject) => {
self.internal.logout()
.then(() => {
cb();
@@ -46,19 +46,19 @@ class Client extends EventEmitter{
cb(e);
reject(e);
})
})
}
sendMessage(where, content, options={}, callback=function(e, m){}){
// def sendMessage
sendMessage(where, content, options = {}, callback = function (e, m) { }) {
var self = this;
return new Promise((resolve, reject) => {
if(typeof options === "function"){
if (typeof options === "function") {
// options is the callback
callback = options;
}
self.internal.sendMessage(where, content, options)
.then(m => {
callback(null, m);
@@ -67,14 +67,15 @@ class Client extends EventEmitter{
callback(e);
reject(e);
});
});
}
sendTTSMessage(where, content, callback=function(e, m){}){
// def sendTTSMessage
sendTTSMessage(where, content, callback = function (e, m) { }) {
var self = this;
return new Promise((resolve, reject) => {
self.sendMessage(where, content, {tts:true})
self.sendMessage(where, content, { tts: true })
.then(m => {
callback(null, m);
resolve(m);
@@ -82,42 +83,43 @@ class Client extends EventEmitter{
callback(e);
reject(e);
});
});
}
reply(where, content, options={}, callback=function(e,m){}){
// def reply
reply(where, content, options = {}, callback = function (e, m) { }) {
var self = this;
return new Promise((resolve, reject) => {
if(typeof options === "function"){
if (typeof options === "function") {
// options is the callback
callback = options;
}
var msg = self.internal.resolver.resolveMessage(where);
if(msg){
if (msg) {
content = msg.author + ", " + content;
self.internal.sendMessage(msg, content, options)
.then(m => {
callback(null, m);
resolve(m);
}).catch(e => {
callback(e);
reject(e);
});
}else{
.then(m => {
callback(null, m);
resolve(m);
}).catch(e => {
callback(e);
reject(e);
});
} else {
var err = new Error("Destination not resolvable to a message!");
callback(err);
reject(err);
}
});
}
replyTTS(where, content, callback=function(){}){
return new Promise((resolve, reject)=>{
self.reply(where, content, {tts:true})
// def replyTTS
replyTTS(where, content, callback = function () { }) {
return new Promise((resolve, reject) => {
self.reply(where, content, { tts: true })
.then(m => {
callback(null, m);
resolve(m);
@@ -127,6 +129,27 @@ class Client extends EventEmitter{
});
});
}
deleteMessage(msg, options = {}, callback = function (e) { }) {
var self = this;
return new Promise((resolve, reject) => {
if (typeof options === "function") {
// options is the callback
callback = options;
}
self.internal.deleteMessage(msg)
.then(() => {
callback();
resolve();
})
.catch(e => {
callback(e);
reject(e);
});
});
}
}
module.exports = Client;

View File

@@ -163,7 +163,7 @@ class InternalClient {
}
// def sendMessage
sendMessage(where, _content, options={}) {
sendMessage(where, _content, options = {}) {
var self = this;
return new Promise((resolve, reject) => {
@@ -180,9 +180,9 @@ class InternalClient {
.post(Endpoints.CHANNEL_MESSAGES(destination.id))
.set("authorization", self.token)
.send({
content : content,
mentions : mentions,
tts : options.tts
content: content,
mentions: mentions,
tts: options.tts
})
.end((err, res) => {
if (err) {
@@ -203,6 +203,41 @@ class InternalClient {
});
}
deleteMessage(_message, options = {}) {
var self = this;
return new Promise((resolve, reject) => {
var message = self.resolver.resolveMessage(_message);
if (message) {
if(options.wait){
setTimeout(deleteMsg, options.wait);
}else{
deleteMsg();
}
function deleteMsg(){
request
.del(Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id))
.set("authorization", self.token)
.end((err, res) => {
if (err) {
reject(new Error(err.response.text));
} else {
message.channel.messages.remove(message);
resolve();
}
});
}
}else {
reject(new Error("Supplied message did not resolve to a message!"));
}
});
}
sendWS(object) {
this.websocket.send(JSON.stringify(object));
}

View File

@@ -28,6 +28,7 @@ var Endpoints = {
CHANNEL_INVITES: (channelID) => `${Endpoints.CHANNEL(channelID) }/invites`,
CHANNEL_TYPING: (channelID) => `${Endpoints.CHANNEL(channelID) }/typing`,
CHANNEL_PERMISSIONS: (channelID) => `${Endpoints.CHANNEL(channelID) }/permissions`,
CHANNEL_MESSAGE: (channelID, messageID) => `${Endpoints.CHANNEL_MESSAGES(channelID)}/${messageID}`
};
var Permissions = {

View File

@@ -46,6 +46,19 @@ class Cache extends Array{
return data;
}
}
remove(data){
var index = this.indexOf(data);
if(~index){
this.splice(index, 1);
}else{
var item = this.get("id", data.id);
if(item){
this.splice(this.indexOf(item), 1);
}
}
return false;
}
}
module.exports = Cache;

View File

@@ -7,7 +7,10 @@ a.on("debug", (m) => console.log("[debug]",m));
a.on("message", m => {
if(m.content === "$$$")
a.reply(m, "hi man!").catch(e => console.log(e.stack));
a.reply(m, "hi man!")
.then( m => {
a.deleteMessage(m);
});
});
a.login(process.env["discordEmail"], process.env["discordPass"]).catch((e)=>console.log(e));