Beginning to move send message functions to unified function

lib/Client.js

@@ -607,55 +607,10 @@ var Client = (function () {
 
 					if (self.options.queue) {
 						//we're QUEUEING messages, so sending them sequentially based on servers.
+						self.addMessageQueue(destination);
+					} else {
+						self._sendMessage("text", destination, message, mentions);
 					}
-					request.post(Endpoints.CHANNELS + "/" + destination + "/messages").set("authorization", self.token).send({
-						content: message,
-						mentions: mentions
-					}).end(function (err, res) {
-
-						if (err) {
-							callback(err);
-							reject(err);
-						} else {
-							var data = res.body;
-
-							var mentions = [];
-
-							data.mentions = data.mentions || []; //for some reason this was not defined at some point?
-
-							var _iteratorNormalCompletion3 = true;
-							var _didIteratorError3 = false;
-							var _iteratorError3 = undefined;
-
-							try {
-								for (var _iterator3 = data.mentions[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-									var mention = _step3.value;
-
-									mentions.push(self.addUser(mention));
-								}
-							} catch (err) {
-								_didIteratorError3 = true;
-								_iteratorError3 = err;
-							} finally {
-								try {
-									if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
-										_iterator3["return"]();
-									}
-								} finally {
-									if (_didIteratorError3) {
-										throw _iteratorError3;
-									}
-								}
-							}
-
-							var channel = self.getChannel("id", data.channel_id);
-							if (channel) {
-								var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
-								callback(null, msg);
-								resolve(msg);
-							}
-						}
-					});
 				}
 
 				function resolveMessage() {
@@ -668,27 +623,27 @@ var Client = (function () {
 
 				function resolveMentions() {
 					var _mentions = [];
-					var _iteratorNormalCompletion4 = true;
-					var _didIteratorError4 = false;
-					var _iteratorError4 = undefined;
+					var _iteratorNormalCompletion3 = true;
+					var _didIteratorError3 = false;
+					var _iteratorError3 = undefined;
 
 					try {
-						for (var _iterator4 = (message.match(/<@[^>]*>/g) || [])[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-							var mention = _step4.value;
+						for (var _iterator3 = (message.match(/<@[^>]*>/g) || [])[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+							var mention = _step3.value;
 
 							_mentions.push(mention.substring(2, mention.length - 1));
 						}
 					} catch (err) {
-						_didIteratorError4 = true;
-						_iteratorError4 = err;
+						_didIteratorError3 = true;
+						_iteratorError3 = err;
 					} finally {
 						try {
-							if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
-								_iterator4["return"]();
+							if (!_iteratorNormalCompletion3 && _iterator3["return"]) {
+								_iterator3["return"]();
 							}
 						} finally {
-							if (_didIteratorError4) {
-								throw _iteratorError4;
+							if (_didIteratorError3) {
+								throw _iteratorError3;
 							}
 						}
 					}
@@ -741,15 +696,40 @@ var Client = (function () {
 
 						self.user = self.addUser(data.user);
 
+						var _iteratorNormalCompletion4 = true;
+						var _didIteratorError4 = false;
+						var _iteratorError4 = undefined;
+
+						try {
+							for (var _iterator4 = data.guilds[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+								var _server = _step4.value;
+
+								var server = self.addServer(_server);
+							}
+						} catch (err) {
+							_didIteratorError4 = true;
+							_iteratorError4 = err;
+						} finally {
+							try {
+								if (!_iteratorNormalCompletion4 && _iterator4["return"]) {
+									_iterator4["return"]();
+								}
+							} finally {
+								if (_didIteratorError4) {
+									throw _iteratorError4;
+								}
+							}
+						}
+
 						var _iteratorNormalCompletion5 = true;
 						var _didIteratorError5 = false;
 						var _iteratorError5 = undefined;
 
 						try {
-							for (var _iterator5 = data.guilds[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-								var _server = _step5.value;
+							for (var _iterator5 = data.private_channels[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+								var _pmc = _step5.value;
 
-								var server = self.addServer(_server);
+								var pmc = self.addPMChannel(_pmc);
 							}
 						} catch (err) {
 							_didIteratorError5 = true;
@@ -766,31 +746,6 @@ var Client = (function () {
 							}
 						}
 
-						var _iteratorNormalCompletion6 = true;
-						var _didIteratorError6 = false;
-						var _iteratorError6 = undefined;
-
-						try {
-							for (var _iterator6 = data.private_channels[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-								var _pmc = _step6.value;
-
-								var pmc = self.addPMChannel(_pmc);
-							}
-						} catch (err) {
-							_didIteratorError6 = true;
-							_iteratorError6 = err;
-						} finally {
-							try {
-								if (!_iteratorNormalCompletion6 && _iterator6["return"]) {
-									_iterator6["return"]();
-								}
-							} finally {
-								if (_didIteratorError6) {
-									throw _iteratorError6;
-								}
-							}
-						}
-
 						self.trigger("ready");
 						self.readyTime = Date.now();
 						self.debug("cached " + self.serverCache.length + " servers, " + self.channelCache.length + " channels, " + self.pmChannelCache.length + " PMs and " + self.userCache.length + " users.");
@@ -805,27 +760,27 @@ var Client = (function () {
 
 						var mentions = [];
 						data.mentions = data.mentions || []; //for some reason this was not defined at some point?
-						var _iteratorNormalCompletion7 = true;
-						var _didIteratorError7 = false;
-						var _iteratorError7 = undefined;
+						var _iteratorNormalCompletion6 = true;
+						var _didIteratorError6 = false;
+						var _iteratorError6 = undefined;
 
 						try {
-							for (var _iterator7 = data.mentions[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-								var mention = _step7.value;
+							for (var _iterator6 = data.mentions[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+								var mention = _step6.value;
 
 								mentions.push(self.addUser(mention));
 							}
 						} catch (err) {
-							_didIteratorError7 = true;
-							_iteratorError7 = err;
+							_didIteratorError6 = true;
+							_iteratorError6 = err;
 						} finally {
 							try {
-								if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
-									_iterator7["return"]();
+								if (!_iteratorNormalCompletion6 && _iterator6["return"]) {
+									_iterator6["return"]();
 								}
 							} finally {
-								if (_didIteratorError7) {
-									throw _iteratorError7;
+								if (_didIteratorError6) {
+									throw _iteratorError6;
 								}
 							}
 						}
@@ -870,27 +825,27 @@ var Client = (function () {
 							}
 
 							var mentions = [];
-							var _iteratorNormalCompletion8 = true;
-							var _didIteratorError8 = false;
-							var _iteratorError8 = undefined;
+							var _iteratorNormalCompletion7 = true;
+							var _didIteratorError7 = false;
+							var _iteratorError7 = undefined;
 
 							try {
-								for (var _iterator8 = info.mentions[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
-									var mention = _step8.value;
+								for (var _iterator7 = info.mentions[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+									var mention = _step7.value;
 
 									mentions.push(self.addUser(mention));
 								}
 							} catch (err) {
-								_didIteratorError8 = true;
-								_iteratorError8 = err;
+								_didIteratorError7 = true;
+								_iteratorError7 = err;
 							} finally {
 								try {
-									if (!_iteratorNormalCompletion8 && _iterator8["return"]) {
-										_iterator8["return"]();
+									if (!_iteratorNormalCompletion7 && _iterator7["return"]) {
+										_iterator7["return"]();
 									}
 								} finally {
-									if (_didIteratorError8) {
-										throw _iteratorError8;
+									if (_didIteratorError7) {
+										throw _iteratorError7;
 									}
 								}
 							}
@@ -1105,27 +1060,27 @@ var Client = (function () {
 				server = new Server(data, this);
 				this.serverCache.push(server);
 				if (data.channels) {
-					var _iteratorNormalCompletion9 = true;
-					var _didIteratorError9 = false;
-					var _iteratorError9 = undefined;
+					var _iteratorNormalCompletion8 = true;
+					var _didIteratorError8 = false;
+					var _iteratorError8 = undefined;
 
 					try {
-						for (var _iterator9 = data.channels[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
-							var channel = _step9.value;
+						for (var _iterator8 = data.channels[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
+							var channel = _step8.value;
 
 							server.channels.push(this.addChannel(channel, server.id));
 						}
 					} catch (err) {
-						_didIteratorError9 = true;
-						_iteratorError9 = err;
+						_didIteratorError8 = true;
+						_iteratorError8 = err;
 					} finally {
 						try {
-							if (!_iteratorNormalCompletion9 && _iterator9["return"]) {
-								_iterator9["return"]();
+							if (!_iteratorNormalCompletion8 && _iterator8["return"]) {
+								_iterator8["return"]();
 							}
 						} finally {
-							if (_didIteratorError9) {
-								throw _iteratorError9;
+							if (_didIteratorError8) {
+								throw _iteratorError8;
 							}
 						}
 					}
@@ -1139,16 +1094,50 @@ var Client = (function () {
 	}, {
 		key: "getUser",
 		value: function getUser(key, value) {
+			var _iteratorNormalCompletion9 = true;
+			var _didIteratorError9 = false;
+			var _iteratorError9 = undefined;
+
+			try {
+				for (var _iterator9 = this.userCache[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+					var user = _step9.value;
+
+					if (user[key] === value) {
+						return user;
+					}
+				}
+			} catch (err) {
+				_didIteratorError9 = true;
+				_iteratorError9 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion9 && _iterator9["return"]) {
+						_iterator9["return"]();
+					}
+				} finally {
+					if (_didIteratorError9) {
+						throw _iteratorError9;
+					}
+				}
+			}
+
+			return null;
+		}
+
+		//def getChannel
+	}, {
+		key: "getChannel",
+		value: function getChannel(key, value) {
 			var _iteratorNormalCompletion10 = true;
 			var _didIteratorError10 = false;
 			var _iteratorError10 = undefined;
 
 			try {
-				for (var _iterator10 = this.userCache[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
-					var user = _step10.value;
+				for (var _iterator10 = this.channelCache[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
+					var channel = _step10.value;
 
-					if (user[key] === value) {
-						return user;
+					if (channel[key] === value) {
+						return channel;
 					}
 				}
 			} catch (err) {
@@ -1166,19 +1155,17 @@ var Client = (function () {
 				}
 			}
 
-			return null;
+			return this.getPMChannel(key, value); //might be a PM
 		}
-
-		//def getChannel
 	}, {
-		key: "getChannel",
-		value: function getChannel(key, value) {
+		key: "getPMChannel",
+		value: function getPMChannel(key, value) {
 			var _iteratorNormalCompletion11 = true;
 			var _didIteratorError11 = false;
 			var _iteratorError11 = undefined;
 
 			try {
-				for (var _iterator11 = this.channelCache[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
+				for (var _iterator11 = this.pmChannelCache[Symbol.iterator](), _step11; !(_iteratorNormalCompletion11 = (_step11 = _iterator11.next()).done); _iteratorNormalCompletion11 = true) {
 					var channel = _step11.value;
 
 					if (channel[key] === value) {
@@ -1200,21 +1187,23 @@ var Client = (function () {
 				}
 			}
 
-			return this.getPMChannel(key, value); //might be a PM
+			return null;
 		}
+
+		//def getServer
 	}, {
-		key: "getPMChannel",
-		value: function getPMChannel(key, value) {
+		key: "getServer",
+		value: function getServer(key, value) {
 			var _iteratorNormalCompletion12 = true;
 			var _didIteratorError12 = false;
 			var _iteratorError12 = undefined;
 
 			try {
-				for (var _iterator12 = this.pmChannelCache[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
-					var channel = _step12.value;
+				for (var _iterator12 = this.serverCache[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = true) {
+					var server = _step12.value;
 
-					if (channel[key] === value) {
-						return channel;
+					if (server[key] === value) {
+						return server;
 					}
 				}
 			} catch (err) {
@@ -1235,40 +1224,6 @@ var Client = (function () {
 			return null;
 		}
 
-		//def getServer
-	}, {
-		key: "getServer",
-		value: function getServer(key, value) {
-			var _iteratorNormalCompletion13 = true;
-			var _didIteratorError13 = false;
-			var _iteratorError13 = undefined;
-
-			try {
-				for (var _iterator13 = this.serverCache[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
-					var server = _step13.value;
-
-					if (server[key] === value) {
-						return server;
-					}
-				}
-			} catch (err) {
-				_didIteratorError13 = true;
-				_iteratorError13 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion13 && _iterator13["return"]) {
-						_iterator13["return"]();
-					}
-				} finally {
-					if (_didIteratorError13) {
-						throw _iteratorError13;
-					}
-				}
-			}
-
-			return null;
-		}
-
 		//def trySendConnData
 	}, {
 		key: "trySendConnData",
@@ -1321,13 +1276,13 @@ var Client = (function () {
 					} else if (destination instanceof User) {
 
 						//check if we have a PM
-						var _iteratorNormalCompletion14 = true;
-						var _didIteratorError14 = false;
-						var _iteratorError14 = undefined;
+						var _iteratorNormalCompletion13 = true;
+						var _didIteratorError13 = false;
+						var _iteratorError13 = undefined;
 
 						try {
-							for (var _iterator14 = self.pmChannelCache[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
-								var pmc = _step14.value;
+							for (var _iterator13 = self.pmChannelCache[Symbol.iterator](), _step13; !(_iteratorNormalCompletion13 = (_step13 = _iterator13.next()).done); _iteratorNormalCompletion13 = true) {
+								var pmc = _step13.value;
 
 								if (pmc.user.equals(destination)) {
 									return pmc.id;
@@ -1336,16 +1291,16 @@ var Client = (function () {
 
 							//we don't, at this point we're late
 						} catch (err) {
-							_didIteratorError14 = true;
-							_iteratorError14 = err;
+							_didIteratorError13 = true;
+							_iteratorError13 = err;
 						} finally {
 							try {
-								if (!_iteratorNormalCompletion14 && _iterator14["return"]) {
-									_iterator14["return"]();
+								if (!_iteratorNormalCompletion13 && _iterator13["return"]) {
+									_iterator13["return"]();
 								}
 							} finally {
-								if (_didIteratorError14) {
-									throw _iteratorError14;
+								if (_didIteratorError13) {
+									throw _iteratorError13;
 								}
 							}
 						}
@@ -1359,6 +1314,14 @@ var Client = (function () {
 				if (channId) resolve(channId);
 			});
 		}
+	}, {
+		key: "_sendMessage",
+		value: function _sendMessage(messageType, destination, content, mentions) {
+
+			var self = this;
+
+			return new Promise(function (resolve, reject) {});
+		}
 	}, {
 		key: "uptime",
 		get: function get() {
@@ -1395,27 +1358,27 @@ var Client = (function () {
 		get: function get() {
 
 			var msgs = [];
-			var _iteratorNormalCompletion15 = true;
-			var _didIteratorError15 = false;
-			var _iteratorError15 = undefined;
+			var _iteratorNormalCompletion14 = true;
+			var _didIteratorError14 = false;
+			var _iteratorError14 = undefined;
 
 			try {
-				for (var _iterator15 = this.channelCache[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
-					var channel = _step15.value;
+				for (var _iterator14 = this.channelCache[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+					var channel = _step14.value;
 
 					msgs = msgs.concat(channel.messages);
 				}
 			} catch (err) {
-				_didIteratorError15 = true;
-				_iteratorError15 = err;
+				_didIteratorError14 = true;
+				_iteratorError14 = err;
 			} finally {
 				try {
-					if (!_iteratorNormalCompletion15 && _iterator15["return"]) {
-						_iterator15["return"]();
+					if (!_iteratorNormalCompletion14 && _iterator14["return"]) {
+						_iterator14["return"]();
 					}
 				} finally {
-					if (_didIteratorError15) {
-						throw _iteratorError15;
+					if (_didIteratorError14) {
+						throw _iteratorError14;
 					}
 				}
 			}

src/Client.js

@@ -625,40 +625,11 @@ class Client {
 				
 				if(self.options.queue){
 					//we're QUEUEING messages, so sending them sequentially based on servers.
+					self.addMessageQueue(destination);
+				}else{
+					self._sendMessage("text", destination, message, mentions);
 				}
-				request
-					.post(`${Endpoints.CHANNELS}/${destination}/messages`)
-					.set("authorization", self.token)
-					.send({
-						content: message,
-						mentions: mentions
-					})
-					.end(function (err, res) {
-
-						if (err) {
-							callback(err);
-							reject(err);
-						} else {
-							var data = res.body;
-
-							var mentions = [];
-
-							data.mentions = data.mentions || []; //for some reason this was not defined at some point?
-							
-							for (var mention of data.mentions) {
-								mentions.push(self.addUser(mention));
-							}
-
-							var channel = self.getChannel("id", data.channel_id);
-							if (channel) {
-								var msg = channel.addMessage(new Message(data, channel, mentions, self.addUser(data.author)));
-								callback(null, msg);
-								resolve(msg);
-							}
-						}
-
-					});
-
+				
 			}
 
 			function resolveMessage() {
@@ -1118,6 +1089,16 @@ class Client {
 				resolve(channId);
 		});
 	}
+	
+	_sendMessage(messageType, destination, content, mentions){
+		
+		var self = this;
+		
+		return new Promise(function(resolve, reject){
+			
+		});
+		
+	}
 
 }