Merge pull request #29 from hydrabolt/code-refactor

New event listeners

lib/Client.js

@@ -64,6 +64,7 @@ var Client = (function () {
 		this.pmChannelCache = [];
 		this.readyTime = null;
 		this.checkingQueue = {};
+		this.userTypingListener = {};
 		this.queue = {};
 
 		this.__idleTime = null;
@@ -352,7 +353,7 @@ var Client = (function () {
 
 			var self = this;
 
-			var prom = new Promise(function (resolve, reject) {
+			return new Promise(function (resolve, reject) {
 				if (timeout) {
 					setTimeout(remove, timeout);
 				} else {
@@ -360,37 +361,25 @@ var Client = (function () {
 				}
 
 				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() {
-					prom.success = true;
+					callback();
-					callback(null);
 					resolve();
 				}
 
 				function bad(err) {
-					prom.error = err;
 					callback(err);
 					reject(err);
 				}
 			});
-
-			return prom;
 		}
 	}, {
 		key: "updateMessage",
@@ -1127,6 +1116,30 @@ var Client = (function () {
 
 						break;
 
+					case "TYPING_START":
+
+						var userInCache = self.getUser("id", data.user_id);
+						var channelInCache = self.getChannel("id", data.channel_id);
+
+						if (!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1) {
+							self.trigger("startTyping", userInCache, channelInCache);
+						}
+
+						self.userTypingListener[data.user_id] = Date.now();
+
+						setTimeout(function () {
+							if (self.userTypingListener[data.user_id] === -1) {
+								return;
+							}
+							if (Date.now() - self.userTypingListener[data.user_id] > 6000) {
+								// stopped typing
+								self.trigger("stopTyping", userInCache, channelInCache);
+								self.userTypingListener[data.user_id] = -1;
+							}
+						}, 6000);
+
+						break;
+
 					default:
 						self.debug("received unknown packet");
 						self.trigger("unknown", dat);
@@ -1598,102 +1611,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: "checkQueue",
-		value: function checkQueue(channelID) {
-			var _this = this;
-
-			var self = this;
-
-			if (!this.checkingQueue[channelID]) {
-				(function () {
-					var doNext = function doNext() {
-						if (self.queue[channelID].length === 0) {
-							done();
-							return;
-						}
-						var queuedEvent = self.queue[channelID][0];
-						switch (queuedEvent.action) {
-							case "sendMessage":
-								var msgToSend = queuedEvent;
-								self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions).then(function (msg) {
-									msgToSend.then(msg);
-									self.queue[channelID].shift();
-									doNext();
-								})["catch"](function (err) {
-									msgToSend.error(err);
-									self.queue[channelID].shift();
-									doNext();
-								});
-								break;
-							case "sendFile":
-								var fileToSend = queuedEvent;
-								self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName).then(function (msg) {
-									fileToSend.then(msg);
-									self.queue[channelID].shift();
-									doNext();
-								})["catch"](function (err) {
-									fileToSend.error(err);
-									self.queue[channelID].shift();
-									doNext();
-								});
-								break;
-							case "updateMessage":
-								var msgToUpd = queuedEvent;
-								self._updateMessage(msgToUpd.message, msgToUpd.content).then(function (msg) {
-									msgToUpd.then(msg);
-									self.queue[channelID].shift();
-									doNext();
-								})["catch"](function (err) {
-									msgToUpd.error(err);
-									self.queue[channelID].shift();
-									doNext();
-								});
-								break;
-							case "deleteMessage":
-								var msgToDel = queuedEvent;
-								self._deleteMessage(msgToDel.message).then(function (msg) {
-									msgToDel.then(msg);
-									self.queue[channelID].shift();
-									doNext();
-								})["catch"](function (err) {
-									msgToDel.error(err);
-									self.queue[channelID].shift();
-									doNext();
-								});
-								break;
-							default:
-								done();
-								break;
-						}
-					};
-
-					var done = function done() {
-						self.checkingQueue[channelID] = false;
-						return;
-					};
-
-					//if we aren't already checking this queue.
-					_this.checkingQueue[channelID] = true;
-					doNext();
-				})();
-			}
-		}
 	}, {
 		key: "getGateway",
 		value: function getGateway() {

src/Client.js

@@ -54,6 +54,7 @@ class Client {
 		this.pmChannelCache = [];
 		this.readyTime = null;
 		this.checkingQueue = {};
+		this.userTypingListener = {};
 		this.queue = {};
 		
 		this.__idleTime = null;
@@ -389,7 +390,7 @@ class Client {
 
 		var self = this;
 
-		var prom = new Promise(function (resolve, reject) {
+		return new Promise(function (resolve, reject) {
 			if (timeout) {
 				setTimeout(remove, timeout)
 			} else {
@@ -397,37 +398,29 @@ class Client {
 			}
 
 			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() {
-				prom.success = true;
+				callback();
-				callback(null);
 				resolve();
 			}
 
 			function bad(err) {
-				prom.error = err;
 				callback(err);
 				reject(err);
 			}
 		});
 		
-		return prom;
 	}
 
 	updateMessage(message, content, callback = function (err, msg) { }) {
@@ -1032,6 +1025,30 @@ class Client {
 					
 					break;
 					
+				case "TYPING_START":
+				
+					var userInCache = self.getUser("id", data.user_id);
+					var channelInCache = self.getChannel("id", data.channel_id);
+					
+					if(!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1){
+						self.trigger("startTyping", userInCache, channelInCache);
+					}
+					
+					self.userTypingListener[data.user_id] = Date.now();
+					
+					setTimeout(function(){
+						if(self.userTypingListener[data.user_id] === -1){
+							return;
+						}
+						if( Date.now() - self.userTypingListener[data.user_id] > 6000 ){
+							// stopped typing
+							self.trigger("stopTyping", userInCache, channelInCache);
+							self.userTypingListener[data.user_id] = -1;
+						}
+					}, 6000);
+					
+					break;
+
 				default:
 					self.debug("received unknown packet");
 					self.trigger("unknown", dat);
@@ -1338,108 +1355,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();
-					}
-				});
-		});
-	}
-
-	checkQueue(channelID) {
-
-		var self = this;
-
-		if (!this.checkingQueue[channelID]) {
-			//if we aren't already checking this queue.
-			this.checkingQueue[channelID] = true;
-			doNext();
-
-			function doNext() {
-				if (self.queue[channelID].length === 0) {
-					done();
-					return;
-				}
-				var queuedEvent = self.queue[channelID][0];
-				switch (queuedEvent.action) {
-					case "sendMessage":
-						var msgToSend = queuedEvent;
-						self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions)
-							.then(function (msg) {
-								msgToSend.then(msg);
-								self.queue[channelID].shift();
-								doNext();
-							})
-							.catch(function (err) {
-								msgToSend.error(err);
-								self.queue[channelID].shift();
-								doNext();
-							});
-						break;
-					case "sendFile":
-						var fileToSend = queuedEvent;
-						self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName)
-							.then(function (msg) {
-								fileToSend.then(msg);
-								self.queue[channelID].shift();
-								doNext();
-							})
-							.catch(function (err) {
-								fileToSend.error(err);
-								self.queue[channelID].shift();
-								doNext();
-							});
-						break;
-					case "updateMessage":
-						var msgToUpd = queuedEvent;
-						self._updateMessage(msgToUpd.message, msgToUpd.content)
-							.then(function (msg) {
-								msgToUpd.then(msg);
-								self.queue[channelID].shift();
-								doNext();
-							})
-							.catch(function (err) {
-								msgToUpd.error(err);
-								self.queue[channelID].shift();
-								doNext();
-							});
-						break;
-					case "deleteMessage":
-						var msgToDel = queuedEvent;
-						self._deleteMessage(msgToDel.message)
-							.then(function (msg) {
-								msgToDel.then(msg);
-								self.queue[channelID].shift();
-								doNext();
-							})
-							.catch(function (err) {
-								msgToDel.error(err);
-								self.queue[channelID].shift();
-								doNext();
-							});
-						break;
-					default:
-						done();
-						break;
-				}
-			}
-
-			function done() {
-				self.checkingQueue[channelID] = false;
-				return;
-			}
-		}
-	}
-
 	getGateway() {
 		var self = this;
 		return new Promise(function (resolve, reject) {

test/bot.1.js

@@ -52,6 +52,13 @@ mybot.on("channelUpdate", function(oldChan, newChan){
 	
 });
 
+mybot.on("startTyping", function(user, channel){
+	console.log("start", user);
+});
+mybot.on("stopTyping", function(user, channel){
+	console.log("stop", user);
+});
+
 function dump(msg) {
 	console.log(msg);
 }