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) {
@@ -810,4 +849,4 @@ var Client = (function (_EventEmitter) {
 	return Client;
 })(EventEmitter);
 
-module.exports = Client;
+module.exports = Client;

lib/Client/ConnectionState.js

@@ -4,4 +4,4 @@ exports.IDLE = 0;
 exports.LOGGING_IN = 1;
 exports.LOGGED_IN = 2;
 exports.READY = 3;
-exports.DISCONNECTED = 4;
+exports.DISCONNECTED = 4;

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) {
@@ -1569,4 +1590,4 @@ var InternalClient = (function () {
 	return InternalClient;
 })();
 
-module.exports = InternalClient;
+module.exports = InternalClient;

lib/Client/Resolver/Resolver.js

@@ -200,11 +200,11 @@ 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"));
 		});
 	};
 
 	return Resolver;
 })();
 
-module.exports = Resolver;
+module.exports = Resolver;