Merge pull request #23 from hydrabolt/future-fixing

3.3.3

lib/Client.js

@@ -148,7 +148,7 @@ var Client = (function () {
 							self.state = 2; //set state to logged in (not yet ready)
 							self.token = res.body.token; //set our token
 
-							getGateway().then(function (url) {
+							self.getGateway().then(function (url) {
 								self.createws(url);
 								callback(null, self.token);
 								resolve(self.token);
@@ -337,7 +337,7 @@ var Client = (function () {
 				}
 
 				var user = destination.sender;
-				self.sendMessage(destination, message, callback, user + ", ").then(response)["catch"](reject);
+				self.sendMessage(destination, message, tts, callback, user + ", ").then(response)["catch"](reject);
 			});
 		}
 	}, {
@@ -1600,6 +1600,20 @@ var Client = (function () {
 				})();
 			}
 		}
+	}, {
+		key: "getGateway",
+		value: function getGateway() {
+			var self = this;
+			return new Promise(function (resolve, reject) {
+				request.get(Endpoints.API + "/gateway").set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve(res.body.url);
+					}
+				});
+			});
+		}
 	}, {
 		key: "uptime",
 		get: function get() {
@@ -1668,19 +1682,4 @@ var Client = (function () {
 	return Client;
 })();
 
-function getGateway() {
-
-	var self = this;
-
-	return new Promise(function (resolve, reject) {
-		request.get(Endpoints.API + "/gateway").end(function (err, res) {
-			if (err) {
-				reject(err);
-			} else {
-				resolve(res.body.url);
-			}
-		});
-	});
-}
-
 module.exports = Client;

lib/channel.js

@@ -64,7 +64,7 @@ var Channel = (function () {
     }, {
         key: "toString",
         value: function toString() {
-            return "#" + this.name;
+            return "<#" + this.id + ">";
         }
     }, {
         key: "client",

lib/server.js

@@ -165,6 +165,11 @@ var Server = (function () {
 		get: function get() {
 			return this.client.getUser("id", this.ownerID);
 		}
+	}, {
+		key: "users",
+		get: function get() {
+			return this.members;
+		}
 	}]);
 
 	return Server;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord.js",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "A way to interface with the Discord API",
   "main": "./lib/index.js",
   "scripts": {

src/Client.js

@@ -162,7 +162,7 @@ class Client {
 							self.state = 2; //set state to logged in (not yet ready)
 							self.token = res.body.token; //set our token
 							
-							getGateway().then(function (url) {
+							self.getGateway().then(function (url) {
 								self.createws(url);
 								callback(null, self.token);
 								resolve(self.token);
@@ -374,7 +374,7 @@ class Client {
 			}
 
 			var user = destination.sender;
-			self.sendMessage(destination, message, callback, user + ", ").then(response).catch(reject);
+			self.sendMessage(destination, message, tts, callback, user + ", ").then(response).catch(reject);
 
 		});
 
@@ -1360,15 +1360,13 @@ class Client {
 			}
 		}
 	}
-}
-
-function getGateway() {
 
+	getGateway() {
 		var self = this;
-
 		return new Promise(function (resolve, reject) {
 			request
 				.get(`${Endpoints.API}/gateway`)
+				.set("authorization", self.token)
 				.end(function (err, res) {
 					if (err) {
 						reject(err);
@@ -1377,7 +1375,7 @@ function getGateway() {
 					}
 				});
 		});
-
+	}
 }
 
 module.exports = Client;

src/channel.js

@@ -34,7 +34,7 @@ class Channel {
 	}
 
     toString(){
-        return "#" + this.name;
+        return "<#" + this.id + ">";
     }
     
     get isPrivate(){

src/server.js

@@ -50,6 +50,10 @@ class Server {
 		return this.client.getUser("id", this.ownerID);
 	}
 	
+	get users() {
+		return this.members;
+	}
+	
 	// get/set
 	getChannel(key, value) {
 		for (var channel of this.channels) {

test/bot.1.js

@@ -17,7 +17,7 @@ mybot.on("message", function (message) {
 	}
 
 	// we can go ahead :)
-	mybot.sendMessage(message.author, message.sender.username);
+	mybot.reply(message, message.channel);
 });
 
 mybot.on("ready", function () {