More shortcuts

src/Client/Client.js

@@ -198,7 +198,7 @@ export default class Client extends EventEmitter {
 		return this.internal.leaveServer(server)
 		.then(callback, errCB(callback));
 	}
-	
+
 	// def deleteServer
 	deleteServer(server, callback = (/*err*/) => {}) {
 		return this.internal.leaveServer(server)

src/Structures/Channel.js

@@ -18,7 +18,4 @@ export default class Channel extends Equality {
 	delete(){
 		return this.client.deleteChannel.apply(this.client, reg(this, arguments));
 	}
-
-	
-	
 }

src/Structures/Invite.js

@@ -18,4 +18,12 @@ export default class Invite {
     toString(){
         return `https://discord.gg/${this.code}`;
     }
+
+    delete(){
+        return this.client.deleteInvite.apply(this.client, reg(this, arguments));
+    }
+
+    join(){
+        return this.client.joinServer.apply(this.client, reg(this, arguments));
+    }
 }

src/Structures/Message.js

@@ -60,7 +60,7 @@ export default class Message extends Equality{
 	update(){
 		return this.client.updateMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	edit() {
 		return this.client.updateMessage.apply(this.client, reg(this, arguments));
 	}

src/Structures/PMChannel.js

@@ -27,7 +27,7 @@ export default class PMChannel extends Channel {
 	sendMessage(){
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	send() {
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
@@ -35,23 +35,23 @@ export default class PMChannel extends Channel {
 	sendTTSMessage(){
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendTTS() {
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendFile() {
 		return this.client.sendFile.apply(this.client, reg(this, arguments));
 	}
-	
+
 	startTyping() {
 		return this.client.startTyping.apply(this.client, reg(this, arguments));
 	}
-	
+
 	stopTyping() {
-		return this.client.startTyping.apply(this.client, reg(this, arguments));
+		return this.client.stopTyping.apply(this.client, reg(this, arguments));
 	}
-	
+
 	getLogs() {
 		return this.client.getChannelLogs.apply(this.client, reg(this, arguments));
 	}

src/Structures/Role.js

@@ -131,32 +131,32 @@ export default class Role {
 		}
 		return "#"+val;
 	}
-	
+
 	delete() {
 		return this.client.deleteRole.apply(this.client, reg(this, arguments));
 	}
-	
+
 	edit() {
 		return this.client.updateRole.apply(this.client, reg(this, arguments));
 	}
-	
+
 	update() {
 		return this.client.updateRole.apply(this.client, reg(this, arguments));
 	}
-	
+
 	addMember(member, callback) {
 		return this.client.addMemberToRole.apply(this.client, [member, this, callback]);
 	}
-	
+
 	addUser(member, callback) {
-		return this.client.addMemberToRole.apply(this.client, [member, this, callback]);
+		return this.client.addUserToRole.apply(this.client, [member, this, callback]);
 	}
-	
+
 	removeMember(member, callback) {
 		return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]);
 	}
-	
+
 	removeUser(member, callback) {
-		return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]);
+		return this.client.removeUserFromRole.apply(this.client, [member, this, callback]);
 	}
 }

src/Structures/Server.js

@@ -70,7 +70,7 @@ export default class Server extends Equality {
 			}
 		}
 	}
-	
+
 	details(user) {
 		user = this.client.internal.resolver.resolveUser(user);
 		if (user) {
@@ -79,7 +79,7 @@ export default class Server extends Equality {
 			return {};
 		}
 	}
-	
+
 	detailsOf(user) {
 		return this.details(user);
 	}
@@ -112,11 +112,11 @@ export default class Server extends Equality {
 	get defaultChannel() {
 		return this.channels.get("id", this.id);
 	}
-	
+
 	get generalChannel() {
 		return this.defaultChannel;
 	}
-	
+
 	get general() {
 		return this.defaultChannel;
 	}
@@ -141,63 +141,63 @@ export default class Server extends Equality {
 		}
 		return true;
 	}
-	
+
 	leave() {
 		return this.client.leaveServer.apply(this.client, reg(this, arguments));
 	}
-	
+
 	delete() {
 		return this.client.leaveServer.apply(this.client, reg(this, arguments));
 	}
-	
+
 	createInvite() {
 		return this.client.createInvite.apply(this.client, reg(this, arguments));
 	}
-	
+
 	createRole() {
 		return this.client.createRole.apply(this.client, reg(this, arguments));
 	}
-	
+
 	banMember(user, tlength, callback) {
 		return this.client.banMember.apply(this.client, [user, this, tlength, callback]);
 	}
-	
+
 	banUser(user, tlength, callback) {
-		return this.client.banMember.apply(this.client, [user, this, tlength, callback]);
+		return this.banMember;
 	}
-	
+
 	ban(user, tlength, callback) {
-		return this.client.banMember.apply(this.client, [user, this, tlength, callback]);
+		return this.banMember;
 	}
-	
+
 	unbanMember(user, callback) {
 		return this.client.unbanMember.apply(this.client, [user, this, callback]);
 	}
-	
+
 	unbanUser(user, callback) {
-		return this.client.unbanMember.apply(this.client, [user, this, callback]);
+		return this.unbanMember;
 	}
-	
+
 	unban(user, callback) {
-		return this.client.unbanMember.apply(this.client, [user, this, callback]);
+		return this.unbanMember;
 	}
-	
+
 	kickMember(user, callback) {
 		return this.client.kickMember.apply(this.client, [user, this, callback]);
 	}
-	
+
 	kickUser(user, callback) {
-		return this.client.kickMember.apply(this.client, [user, this, callback]);
+		return this.kickMember;
 	}
-	
+
 	kick(user, callback) {
-		return this.client.kickMember.apply(this.client, [user, this, callback]);
+		return this.kickMember;
 	}
-	
+
 	getBans(callback) {
 		return this.client.getBans.apply(this.client, [this, callback]);
 	}
-	
+
 	createChannel() {
 		return this.client.createChannel.apply(this.client, reg(this, arguments));
 	}

src/Structures/TextChannel.js

@@ -33,7 +33,7 @@ export default class TextChannel extends ServerChannel{
 	sendMessage(){
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	send() {
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
@@ -41,24 +41,24 @@ export default class TextChannel extends ServerChannel{
 	sendTTSMessage(){
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendTTS() {
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendFile() {
 		return this.client.sendFile.apply(this.client, reg(this, arguments));
 	}
-	
+
 	getLogs() {
 		return this.client.getChannelLogs.apply(this.client, reg(this, arguments));
 	}
-	
+
 	startTyping() {
 		return this.client.startTyping.apply(this.client, reg(this, arguments));
 	}
-	
+
 	stopTyping() {
-		return this.client.startTyping.apply(this.client, reg(this, arguments));
+		return this.client.stopTyping.apply(this.client, reg(this, arguments));
 	}
 }

src/Structures/User.js

@@ -61,11 +61,11 @@ export default class User extends Equality{
 		else
 			return false;
 	}
-	
+
 	sendMessage(){
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	send() {
 		return this.client.sendMessage.apply(this.client, reg(this, arguments));
 	}
@@ -73,31 +73,31 @@ export default class User extends Equality{
 	sendTTSMessage(){
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendTTS() {
 		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
 	}
-	
+
 	sendFile() {
 		return this.client.sendFile.apply(this.client, reg(this, arguments));
 	}
-	
+
 	startTyping() {
 		return this.client.startTyping.apply(this.client, reg(this, arguments));
 	}
-	
+
 	stopTyping() {
-		return this.client.startTyping.apply(this.client, reg(this, arguments));
+		return this.client.stopTyping.apply(this.client, reg(this, arguments));
 	}
-	
+
 	addTo(role, callback) {
 		return this.client.addMemberToRole.apply(this.client, [this, role, callback]);
 	}
-	
+
 	removeFrom(role, callback) {
 		return this.client.removeMemberFromRole.apply(this.client, [this, role, callback]);
 	}
-	
+
 	getLogs() {
 		return this.client.getChannelLogs.apply(this.client, reg(this, arguments));
 	}

src/Structures/VoiceChannel.js

@@ -7,7 +7,7 @@ export default class VoiceChannel extends ServerChannel{
 	constructor(data, client, server){
 		super(data, client, server);
 	}
-	
+
 	join(callback = function () { }) {
 		return this.client.joinVoiceChannel.apply(this.client, [this, callback]);
 	}

test/lib-test.js

@@ -217,7 +217,7 @@ function sendFile() {
 
 function roleCreate() {
 	section("Role Management");
-	
+
 	client.createRole(server, {
 		name: "test role",
 		hoist: true,
@@ -226,25 +226,25 @@ function roleCreate() {
 			"kickMembers"
 		]
 	}).then(_role => {
-		
+
 		role = _role;
-		
+
 		pass("created role");
-		
+
 		if (role.name !== "test role" || role.color !== 0xFF0000 || !role.hoist){
 			err("bad role name, color or hoist");
 			return;
 		}
-		
+
 		if (!role.hasPermission("kickMembers")) {
 			err("role doesn't have kick members permission");
 			return;
 		}
 
 		pass("correct role metadata");
-		
+
 		joinInvite();
-		
+
 	}).catch(e => {
 		err("error creating role: " + e)
 	});
@@ -252,20 +252,20 @@ function roleCreate() {
 
 function joinInvite() {
 	section("Joining Servers");
-	
+
 	client.joinServer(process.env["ds_invite"]).then(srv => {
-		
+
 		invserver = srv;
 		pass("passed back server");
-		
+
 		if (srv.name !== "d.j s _ t s" || srv.region !== "london") {
 			err("incorrect server name or region");
 			return;
 		}
-		
+
 		pass("correct server name and region");
 		sendPM();
-		
+
 	}).catch(e => {
 		err("error joining server: " + e)
 	});
@@ -273,18 +273,18 @@ function joinInvite() {
 
 function sendPM() {
 	section("Sending PMs");
-	
+
 	client.sendMessage(invserver.owner, "hello, this is a test!").then(msg => {
-		
+
 		pass("sent PM");
-		
+
 		client.deleteMessage(msg).then(() => {
 			pass("deleted PM");
 			deleteAll();
 		}).catch(e => {
 			err("error deleting PM message: " + e);
 		});
-		
+
 	}).catch(e => {
 		err("error sending a PM: " + e)
 	})
@@ -299,11 +299,11 @@ function deleteAll() {
 		pass("deleted temporary channel");
 
 		client.leaveServer(server).then(() => {
-			
+
 			pass("deleted temporary server");
-			
+
 			exit();
-			
+
 		}).catch(e => {
 			err("error deleting server: " + e);
 		});
@@ -315,16 +315,16 @@ function deleteAll() {
 }
 
 function exit() {
-	
+
 	section("Exiting");
-	
+
 	client.logout().then(() => {
 		pass("logged out");
 		done();
 	}).catch(e => {
 		err("couldn't log out: " + e);
 	});
-	
+
 }
 
 function done() {