Fixed bugs from PR

lib/Client/Client.js

@@ -222,7 +222,7 @@ var Client = (function (_EventEmitter) {
 	// def getBans
 
 	Client.prototype.getBans = function getBans(where) {
-		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, logs) {} : arguments[1];
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, bans) {} : arguments[1];
 
 		var self = this;
 		return new Promise(function (resolve, reject) {
@@ -619,6 +619,11 @@ var Client = (function (_EventEmitter) {
 		get: function get() {
 			return this.internal.private_channels;
 		}
+	}, {
+		key: "voiceConnection",
+		get: function get() {
+			return this.internal.voiceConnection;
+		}
 	}]);
 
 	return Client;

lib/Client/InternalClient.js

@@ -456,19 +456,18 @@ var InternalClient = (function () {
 	// def getBans
 
 	InternalClient.prototype.getBans = function getBans(server) {
-
 		var self = this;
 		return new Promise(function (resolve, reject) {
 
-			server = self.resolver.resolveServer(server)
+			server = self.resolver.resolveServer(server);
 
-			request.get(Endpoints.SERVER_BANS(server.id)).set("authorization", self.token).end(function (err, res) {
+			request.del("" + Endpoints.SERVER_BANS(server.id)).set("authorization", self.token).end(function (err, res) {
 				if (err) {
 					reject(new Error(err));
 				} else {
 					var bans = [];
 					res.body.forEach(function (ban) {
-						bans.push(ban.user);
+						bans.push(self.users.add(new User(ban.user, self.client)));
 					});
 					resolve(bans);
 				}
@@ -538,7 +537,7 @@ var InternalClient = (function () {
 			user = self.resolver.resolveUser(user);
 			server = self.resolver.resolveServer(server);
 
-			request.put(Endpoints.SERVER_BANS(server.id) + "/" + user.id + "?delete-message-days=" + length).set("authorization", self.token).end(function (err, res) {
+			request.put(Endpoints.SERVER_BANS(server.id) + "/" + user.id + "/?delete-message-days=" + length).set("authorization", self.token).end(function (err, res) {
 				if (err) {
 					reject(err);
 				} else {
@@ -555,6 +554,7 @@ var InternalClient = (function () {
 		return new Promise(function (resolve, reject) {
 
 			server = self.resolver.resolveServer(server);
+			user = self.resolver.resolveUser(user);
 
 			request.del(Endpoints.SERVER_BANS(server.id) + "/" + user.id).set("authorization", self.token).end(function (err, res) {
 				if (err) {

lib/Structures/Invite.js

@@ -6,27 +6,27 @@ var Server = require("./Server.js");
 var ServerChannel = require("./ServerChannel.js");
 
 var Invite = (function () {
-      function Invite(data, chan, client) {
+    function Invite(data, chan, client) {
-            _classCallCheck(this, Invite);
+        _classCallCheck(this, Invite);
 
-            this.maxAge = data.max_age;
+        this.maxAge = data.max_age;
-            this.code = data.code;
+        this.code = data.code;
-            this.server = chan.server;
+        this.server = chan.server;
-            this.channel = chan;
+        this.channel = chan;
-            this.revoked = data.revoked;
+        this.revoked = data.revoked;
-            this.createdAt = Date.parse(data.created_at);
+        this.createdAt = Date.parse(data.created_at);
-            this.temporary = data.temporary;
+        this.temporary = data.temporary;
-            this.uses = data.uses;
+        this.uses = data.uses;
-            this.maxUses = data.uses;
+        this.maxUses = data.uses;
-            this.inviter = client.internal.users.get("id", data.inviter.id);
+        this.inviter = client.internal.users.get("id", data.inviter.id);
-            this.xkcd = data.xkcdpass;
+        this.xkcd = data.xkcdpass;
-      }
+    }
 
-      Invite.prototype.toString = function toString() {
+    Invite.prototype.toString = function toString() {
-            return "https://discord.gg/" + this.code;
+        return "https://discord.gg/" + this.code;
-      };
+    };
 
-      return Invite;
+    return Invite;
 })();
 
 module.exports = Invite;

lib/Util/Equality.js

@@ -2,11 +2,11 @@
 	The Equality Class is just used to show
 	that a Class has an ID that can be used to
 	check for equality.
-	
+
 	Never use == or === when comparing
 	objects in discord.js, they will be different
 	instances sometimes.
-	
+
 	Instead, use objectThatExtendsEquality.equals()
 */
 "use strict";

lib/Voice/VoiceConnection.js

@@ -2,7 +2,7 @@
 /*
 	Major credit to izy521 who is the creator of
 	https://github.com/izy521/discord.io,
-	
+
 	without his help voice chat in discord.js would not have
 	been possible!
 */

lib/Voice/VoicePacket.js

@@ -3,24 +3,24 @@
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 var VoicePacket = function VoicePacket(data, sequence, time, ssrc) {
-	_classCallCheck(this, VoicePacket);
+		_classCallCheck(this, VoicePacket);
 
-	var audioBuffer = data,
+		var audioBuffer = data,
-	    returnBuffer = new Buffer(audioBuffer.length + 12);
+		    returnBuffer = new Buffer(audioBuffer.length + 12);
 
-	returnBuffer.fill(0);
+		returnBuffer.fill(0);
-	returnBuffer[0] = 0x80;
+		returnBuffer[0] = 0x80;
-	returnBuffer[1] = 0x78;
+		returnBuffer[1] = 0x78;
 
-	returnBuffer.writeUIntBE(sequence, 2, 2);
+		returnBuffer.writeUIntBE(sequence, 2, 2);
-	returnBuffer.writeUIntBE(time, 4, 4);
+		returnBuffer.writeUIntBE(time, 4, 4);
-	returnBuffer.writeUIntBE(ssrc, 8, 4);
+		returnBuffer.writeUIntBE(ssrc, 8, 4);
 
-	for (var i = 0; i < audioBuffer.length; i++) {
+		for (var i = 0; i < audioBuffer.length; i++) {
-		returnBuffer[i + 12] = audioBuffer[i];
+				returnBuffer[i + 12] = audioBuffer[i];
-	}
+		}
 
-	return returnBuffer;
+		return returnBuffer;
 };
 
 module.exports = VoicePacket;

src/Client/Client.js

@@ -29,6 +29,10 @@ class Client extends EventEmitter {
 	get privateChannels(){
 		return this.internal.private_channels;
 	}
+	
+	get voiceConnection(){
+		return this.internal.voiceConnection;
+	}
 
 	// def login
 	login(email, password, cb = function (err, token) { }) {

src/Client/InternalClient.js

@@ -487,10 +487,10 @@ class InternalClient {
 		var self = this;
 		return new Promise((resolve, reject) => {
 
-			server = self.resolver.resolveChannel(server);
+			server = self.resolver.resolveServer(server);
 
 			request
-				.del(`${Endpoints.SERVER_BANS(channel.id) }`)
+				.del(`${Endpoints.SERVER_BANS(server.id) }`)
 				.set("authorization", self.token)
 				.end((err, res) => {
 					if (err) {
@@ -498,7 +498,7 @@ class InternalClient {
 					} else {
 						var bans = [];
 						res.body.forEach((ban) => {
-							bans.push(ban.user);
+							bans.push(self.users.add(new User(ban.user, self.client)));
 						});
 						resolve(bans);
 					}
@@ -589,9 +589,10 @@ class InternalClient {
 		return new Promise((resolve, reject) => {
 
 			server = self.resolver.resolveServer(server);
+			user = self.resolver.resolveUser(user);
 
 			request
-				.delete(`${Endpoints.SERVER_BANS(server.id) }/${user.id}`)
+				.del(`${Endpoints.SERVER_BANS(server.id) }/${user.id}`)
 				.set("authorization", self.token)
 				.end((err, res) => {
 					if (err) {
@@ -612,7 +613,7 @@ class InternalClient {
 			server = self.resolver.resolveServer(server);
 
 			request
-				.delete(`${Endpoints.SERVER_MEMBERS(server.id) }/${user.id}`)
+				.del(`${Endpoints.SERVER_MEMBERS(server.id) }/${user.id}`)
 				.set("authorization", self.token)
 				.end((err, res) => {
 					if (err) {