Merge branch 'indev' of https://github.com/hydrabolt/discord.js into indev

package.json

@@ -32,6 +32,7 @@
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-es2015-loose": "^6.1.2",
     "colors": "^1.1.2",
+    "eslint": "^1.10.3",
     "grunt": "~0.4.5",
     "grunt-babel": "<6.0.0",
     "grunt-browserify": "^4.0.0",

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/PMChannel.js

@@ -49,7 +49,7 @@ export default class PMChannel extends Channel {
 	}
 
 	stopTyping() {
-		return this.client.startTyping.apply(this.client, reg(this, arguments));
+		return this.client.stopTyping.apply(this.client, reg(this, arguments));
 	}
 
 	getLogs() {

src/Structures/Role.js

@@ -149,7 +149,7 @@ export default class Role {
 	}
 
 	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) {
@@ -157,6 +157,6 @@ export default class Role {
 	}
 
 	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

@@ -163,11 +163,11 @@ export default class Server extends Equality {
 	}
 
 	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) {
@@ -175,11 +175,11 @@ export default class Server extends Equality {
 	}
 
 	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) {
@@ -187,11 +187,11 @@ export default class Server extends Equality {
 	}
 
 	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) {

src/Structures/TextChannel.js

@@ -59,6 +59,6 @@ export default class TextChannel extends ServerChannel{
 	}
 
 	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

@@ -87,7 +87,7 @@ export default class User extends Equality{
 	}
 
 	stopTyping() {
-		return this.client.startTyping.apply(this.client, reg(this, arguments));
+		return this.client.stopTyping.apply(this.client, reg(this, arguments));
 	}
 
 	addTo(role, callback) {