Removed trailing spaces, added unbanMember and kickMember

src/Client/Client.js

@@ -13,23 +13,23 @@ class Client extends EventEmitter {
 		this.options = options || {};
 		this.internal = new InternalClient(this);
 	}
-	
+
 	get users(){
 		return this.internal.users;
 	}
-	
+
 	get channels(){
 		return this.internal.channels;
 	}
-	
+
 	get servers(){
 		return this.internal.servers;
 	}
-	
+
 	get privateChannels(){
 		return this.internal.private_channels;
 	}
-	
+
 	// def login
 	login(email, password, cb = function (err, token) { }) {
 		var self = this;
@@ -47,7 +47,7 @@ class Client extends EventEmitter {
 
 		});
 	}
-	
+
 	// def logout
 	logout(cb = function (err) { }) {
 		var self = this;
@@ -86,7 +86,7 @@ class Client extends EventEmitter {
 
 		});
 	}
-	
+
 	// def sendTTSMessage
 	sendTTSMessage(where, content, callback = function (e, m) { }) {
 		var self = this;
@@ -131,7 +131,7 @@ class Client extends EventEmitter {
 
 		});
 	}
-	
+
 	// def replyTTS
 	replyTTS(where, content, callback = function () { }) {
 		return new Promise((resolve, reject) => {
@@ -174,7 +174,7 @@ class Client extends EventEmitter {
 				// options is the callback
 				callback = options;
 			}
-			
+
 			self.internal.updateMessage(msg, content, options)
 				.then(msg => {
 					callback(null, msg);
@@ -184,13 +184,13 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	// def getChannelLogs
 	getChannelLogs(where, limit=500, options={}, callback=function(err, logs){}){
-		
+
 		var self = this;
 		return new Promise((resolve, reject) => {
 			if (typeof options === "function") {
@@ -206,11 +206,11 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		});
-		
+
 	}
-	
+
 	// def sendFile
 	sendFile(where, attachment, name="image.png", callback=function(err, m){}){
 		var self = this;
@@ -224,10 +224,10 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	createServer(name, region="london", callback=function(err, srv){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
@@ -242,12 +242,12 @@ class Client extends EventEmitter {
 				})
 		});
 	}
-	
+
 	// def leaveServer
 	leaveServer(server, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.leaveServer(server)
 				.then(() => {
 					callback(); resolve();
@@ -255,10 +255,10 @@ class Client extends EventEmitter {
 				.catch(e => {
 					callback(e); reject(e);
 				})
-			
+
 		});
 	}
-	
+
 	// def createChannel
 	createChannel(server, name, type="text", callback=function(err,channel){}){
 		var self = this;
@@ -274,15 +274,15 @@ class Client extends EventEmitter {
 				.catch(e => {
 					callback(e); reject(e);
 				})
-			
+
 		});
 	}
-	
+
 	// def deleteChannel
 	deleteChannel(channel, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.deleteChannel(channel)
 				.then( () => {
 					callback();
@@ -291,10 +291,10 @@ class Client extends EventEmitter {
 				.catch( e => {
 					callback(e); reject(e);
 				})
-			
+
 		});
 	}
-	
+
 	//def banMember
 	banMember(user, server, length=1, callback=function(err){}){
 		var self = this;
@@ -311,10 +311,42 @@ class Client extends EventEmitter {
 				.catch( e => {
 					callback(e); reject(e);
 				})
-			
+
 		});
 	}
-	
+
+	//def unbanMember
+	unbanMember(user, server, callback=function(err){}){
+		var self = this;
+		return new Promise((resolve, reject) => {
+			self.internal.unbanMember(user, server)
+				.then( () => {
+					callback();
+					resolve();
+				})
+				.catch( e => {
+					callback(e); reject(e);
+				})
+
+		});
+	}
+
+	//def kickMember
+	kickMember(user, server, callback=function(err){}){
+		var self = this;
+		return new Promise((resolve, reject) => {
+			self.internal.kickMember(user, server)
+				.then( () => {
+					callback();
+					resolve();
+				})
+				.catch( e => {
+					callback(e); reject(e);
+				})
+
+		});
+	}
+
 	//def createRole
 	createRole(server, data=null, callback=function(err,res){}){
 		var self = this;
@@ -332,16 +364,16 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	//def deleteRole
 	deleteRole(role, callback=function(err){}){
-		
+
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.deleteRole(role)
 				.then(() => {
 					callback();
@@ -349,18 +381,18 @@ class Client extends EventEmitter {
 				})
 				.catch(e => {
 					callback(e);
-					reject(e);	
+					reject(e);
 				});
-			
+
 		});
-		
+
 	}
-	
+
 	//def addMemberToRole
 	addMemberToRole(member, role, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.addMemberToRole(member, role)
 				.then(() => {
 					callback();
@@ -368,22 +400,22 @@ class Client extends EventEmitter {
 				})
 				.catch(e => {
 					callback(e);
-					reject(e);	
+					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	// def addUserToRole
 	addUserToRole(member, role, callback=function(err){}){
 		return this.addMemberToRole(member, role, callback);
 	}
-	
+
 	// def removeMemberFromRole
 	removeMemberFromRole(member, role, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.removeMemberFromRole(member, role)
 				.then(() => {
 					callback();
@@ -391,17 +423,17 @@ class Client extends EventEmitter {
 				})
 				.catch(e => {
 					callback(e);
-					reject(e);	
+					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	// def removeUserFromRole
 	removeUserFromRole(member, role, callback=function(err){}){
 		return this.removeUserFromRole(member, role, callback);
 	}
-	
+
 	// def createInvite
 	createInvite(chanServ, options, callback=function(err,invite){}){
 		var self = this;
@@ -410,7 +442,7 @@ class Client extends EventEmitter {
 				// length is the callback
 				callback = options;
 			}
-			
+
 			self.internal.createInvite(chanServ, options)
 				.then(invite => {
 					callback(null, invite);
@@ -418,17 +450,17 @@ class Client extends EventEmitter {
 				})
 				.catch(e => {
 					callback(e);
-					reject(e);	
+					reject(e);
 				});
-			
+
 		});
 	}
-	
+
 	// def overwritePermissions
 	overwritePermissions(channel, role, options={}, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.overwritePermissions(channel, role, options)
 				.then(() => {
 					callback();
@@ -438,15 +470,15 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				})
-			
+
 		});
 	}
-	
+
 	// def setTopic
 	setTopic(channel, topic, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.setTopic(channel, topic)
 				.then(() => {
 					callback();
@@ -456,15 +488,15 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		})
 	}
-	
+
 	//def setChannelName
 	setChannelName(channel, topic, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.setChannelName(channel, topic)
 				.then(() => {
 					callback();
@@ -474,15 +506,15 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		})
 	}
-	
+
 	//def setChannelNameAndTopic
 	setChannelNameAndTopic(channel, name, topic, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.setChannelNameAndTopic(channel, name, topic)
 				.then(() => {
 					callback();
@@ -492,15 +524,15 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		})
 	}
-	
+
 	//def updateChannel
 	updateChannel(channel, data, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject) => {
-			
+
 			self.internal.updateChannel(channel, data)
 				.then(() => {
 					callback();
@@ -510,15 +542,15 @@ class Client extends EventEmitter {
 					callback(e);
 					reject(e);
 				});
-			
+
 		})
 	}
-	
+
 	//def joinVoiceChannel
 	joinVoiceChannel(channel, callback=function(err){}){
 		var self = this;
 		return new Promise((resolve, reject)=>{
-			
+
 			self.internal.joinVoiceChannel(channel)
 				.then(chan => {
 					callback(null, chan);
@@ -528,7 +560,7 @@ class Client extends EventEmitter {
 					callback(err);
 					reject(err);
 				});
-			
+
 		});
 	}
 }

src/Client/InternalClient.js

@@ -34,7 +34,7 @@ class InternalClient {
 		if (this.client.options.compress) {
 			zlib = require("zlib");
 		}
-		
+
 		// creates 4 caches with discriminators based on ID
 		this.users = new Cache();
 		this.channels = new Cache();
@@ -43,7 +43,7 @@ class InternalClient {
 		this.voiceConnection = null;
 		this.resolver = new Resolver(this);
 	}
-	
+
 	//def leaveVoiceChannel
 	leaveVoiceChannel() {
 		var self = this;
@@ -57,7 +57,7 @@ class InternalClient {
 			}
 		});
 	}
-	
+
 	//def joinVoiceChannel
 	joinVoiceChannel(chann) {
 		var self = this;
@@ -107,7 +107,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def createServer
 	createServer(name, region = "london") {
 		var self = this;
@@ -133,7 +133,7 @@ class InternalClient {
 				});
 		});
 	}
-	
+
 	//def leaveServer
 	leaveServer(srv) {
 		var self = this;
@@ -163,7 +163,7 @@ class InternalClient {
 			}
 		});
 	}
-	
+
 	// def login
 	login(email, password) {
 		var self = this;
@@ -241,7 +241,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def startPM
 	startPM(resUser) {
 		var self = this;
@@ -249,7 +249,7 @@ class InternalClient {
 			var user = self.resolver.resolveUser(resUser);
 
 			if (user) {
-				
+
 				// start the PM
 				request
 					.post(`${Endpoints.USER_CHANNELS(user.id) }`)
@@ -289,7 +289,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def sendMessage
 	sendMessage(where, _content, options = {}) {
 		var self = this;
@@ -365,7 +365,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def updateMessage
 	updateMessage(msg, _content, options = {}) {
 
@@ -405,7 +405,7 @@ class InternalClient {
 		});
 
 	}
-	
+
 	// def sendFile
 	sendFile(where, _file, name = "image.png") {
 		var self = this;
@@ -481,7 +481,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def createChannel
 	createChannel(server, name, type = "text") {
 		var self = this;
@@ -512,7 +512,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def deleteChannel
 	deleteChannel(_channel) {
 		var self = this;
@@ -536,7 +536,7 @@ class InternalClient {
 			}
 		});
 	}
-	
+
 	// def banMember
 	banMember(user, server, length = 1) {
 		var self = this;
@@ -557,7 +557,49 @@ class InternalClient {
 				});
 		});
 	}
-	
+
+	// def unbanMember
+	unbanMember(user, server) {
+		var self = this;
+		return new Promise((resolve, reject) => {
+
+			user = self.resolver.resolveUser(user);
+			server = self.resolver.resolveServer(server);
+
+			request
+				.delete(`${Endpoints.SERVER_BANS(server.id) }/${user.id}`)
+				.set("authorization", self.token)
+				.end((err, res) => {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+		});
+	}
+
+	// def kickMember
+	kickMember(user, server) {
+		var self = this;
+		return new Promise((resolve, reject) => {
+
+			user = self.resolver.resolveUser(user);
+			server = self.resolver.resolveServer(server);
+
+			request
+				.delete(`${Endpoints.SERVER_MEMBERS(server.id) }/${user.id}`)
+				.set("authorization", self.token)
+				.end((err, res) => {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+		});
+	}
+
 	// def createRole
 	createRole(server, data) {
 		var self = this;
@@ -652,7 +694,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	//def addMemberToRole
 	addMemberToRole(member, role) {
 		var self = this;
@@ -689,7 +731,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	//def removeMemberFromRole
 	removeMemberFromRole(member, role) {
 		var self = this;
@@ -732,7 +774,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	// def createInvite
 	createInvite(chanServ, options) {
 		var self = this;
@@ -781,7 +823,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	//def overwritePermissions
 	overwritePermissions(channel, role, updated) {
 		var self = this;
@@ -842,7 +884,7 @@ class InternalClient {
 			}
 		});
 	}
-	
+
 	//def setTopic
 	setTopic(chann, topic = "") {
 		var self = this;
@@ -934,7 +976,7 @@ class InternalClient {
 
 		});
 	}
-	
+
 	//def updateChannel
 	updateChannel(chann, data) {
 		return this.setChannelNameAndTopic(chann, data.name, data.topic);

src/Client/Resolver/Resolver.js

@@ -15,7 +15,7 @@ class Resolver {
 	constructor(internal) {
 		this.internal = internal;
 	}
-	
+
 	resolveServer(resource){
 		if(resource instanceof Server){
 			return resource;
@@ -49,10 +49,10 @@ class Resolver {
 	}
 
 	resolveString(resource) {
-		
+
 		// accepts Array, Channel, Server, User, Message, String and anything
 		// toString()-able
-		
+
 		var final = resource;
 		if (resource instanceof Array) {
 			final = resource.join("\n");
@@ -98,7 +98,7 @@ class Resolver {
 
 		return found;
 	}
-	
+
 	resolveVoiceChannel(resource) {
 		// resolveChannel will also work but this is more apt
 		if(resource instanceof VoiceChannel){