Merge remote-tracking branch 'refs/remotes/origin/rewrite' into rewrite-docs

lib/Client/Client.js

@@ -417,6 +417,28 @@ var Client = (function (_EventEmitter) {
 		});
 	};
 
+	//def updateRole
+
+	Client.prototype.updateRole = function updateRole(role) {
+		var data = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, res) {} : arguments[2];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			if (typeof data === "function") {
+				// data is the callback
+				callback = data;
+			}
+			self.internal.updateRole(role, data).then(function (role) {
+				callback(null, role);
+				resolve(role);
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
+			});
+		});
+	};
+
 	//def deleteRole
 
 	Client.prototype.deleteRole = function deleteRole(role) {
@@ -509,6 +531,23 @@ var Client = (function (_EventEmitter) {
 		});
 	};
 
+	// def deleteInvite
+
+	Client.prototype.deleteInvite = function deleteInvite(invite) {
+		var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
+
+		var self = this;
+		return new Promise(function (resolve, reject) {
+			self.internal.deleteInvite(invite).then(function () {
+				callback();
+				resolve();
+			})["catch"](function (e) {
+				callback(e);
+				reject(e);
+			});
+		});
+	};
+
 	// def overwritePermissions
 
 	Client.prototype.overwritePermissions = function overwritePermissions(channel, role) {

lib/Client/InternalClient.js

@@ -831,6 +831,27 @@ var InternalClient = (function () {
 		});
 	};
 
+	//def deleteInvite
+
+	InternalClient.prototype.deleteInvite = function deleteInvite(invite) {
+		var self = this;
+		return new Promise(function (resolve, reject) {
+
+			invite = self.resolver.resolveInviteID(invite);
+			if (invite) {
+				request.del(Endpoints.INVITE(invite)).set("authorization", self.token).end(function (err, res) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve();
+					}
+				});
+			} else {
+				reject(new Error("Not a valid invite"));
+			}
+		});
+	};
+
 	//def overwritePermissions
 
 	InternalClient.prototype.overwritePermissions = function overwritePermissions(channel, role, updated) {

lib/Client/Resolver/Resolver.js

@@ -200,7 +200,7 @@ var Resolver = (function () {
 					return;
 				}
 			}
-			if (found) resolve(found);else reject(new Error("not found anything"));
+			if (found) resolve(found);else reject(new Error("Didn't found anything"));
 		});
 	};
 

src/Client/Client.js

@@ -420,6 +420,27 @@ class Client extends EventEmitter {
 		});
 	}
 
+	//def updateRole
+	updateRole(role, data = null, callback = function (err, res) { }) {
+		var self = this;
+		return new Promise((resolve, reject) => {
+			if (typeof data === "function") {
+				// data is the callback
+				callback = data;
+			}
+			self.internal.updateRole(role, data)
+				.then((role) => {
+					callback(null, role);
+					resolve(role);
+				})
+				.catch(e => {
+					callback(e);
+					reject(e);
+				});
+
+		});
+	}
+
 	//def deleteRole
 	deleteRole(role, callback = function (err) { }) {
 
@@ -508,6 +529,22 @@ class Client extends EventEmitter {
 		});
 	}
 
+	// def deleteInvite
+	deleteInvite(invite, callback = function (err) { }) {
+		var self = this;
+		return new Promise((resolve, reject) => {
+			self.internal.deleteInvite(invite)
+				.then(() => {
+					callback();
+					resolve();
+				})
+				.catch(e => {
+					callback(e);
+					reject(e);
+				});
+		});
+	}
+
 	// def overwritePermissions
 	overwritePermissions(channel, role, options = {}, callback = function (err) { }) {
 		var self = this;

src/Client/InternalClient.js

@@ -728,9 +728,7 @@ class InternalClient {
 						reject(err);
 					} else {
 						var nrole = new Role(res.body, server, self.client);
-						resolve(
+						resolve(server.roles.update(role, nrole));
-							server.roles.update(role, nrole)
-							);
 					}
 				});
 
@@ -887,6 +885,31 @@ class InternalClient {
 		});
 	}
 
+	//def deleteInvite
+	deleteInvite(invite) {
+		var self = this;
+		return new Promise((resolve, reject) => {
+
+			invite = self.resolver.resolveInviteID(invite);
+			if (invite) {
+				request
+					.del(Endpoints.INVITE(invite))
+					.set("authorization", self.token)
+					.end((err, res) => {
+						if (err) {
+							reject(err);
+						} else {
+							resolve();
+						}
+					});
+
+			} else {
+				reject(new Error("Not a valid invite"));
+			}
+
+		});
+	}
+
 	//def overwritePermissions
 	overwritePermissions(channel, role, updated) {
 		var self = this;

src/Client/Resolver/Resolver.js

@@ -172,7 +172,7 @@ class Resolver {
 			if (found)
 				resolve(found);
 			else
-				reject(new Error("not found anything"));
+				reject(new Error("Didn't found anything"));
 		});
 
 	}