Webpack build for branch master: 3e5096f9fe

This commit is contained in:
Travis CI 2017-03-07 01:00:24 +00:00
parent 6979548f66
commit 857f72c214
2 changed files with 19 additions and 13 deletions

View file

@ -1806,8 +1806,11 @@ class Role {
/**
* Checks if the role has a permission.
* @param {PermissionResolvable} permission The permission to check for
* @param {PermissionResolvable|PermissionResolvable[]} permission Permission(s) to check for
* @param {boolean} [explicit=false] Whether to require the role to explicitly have the exact permission
* **(deprecated)**
* @param {boolean} [checkAdmin] Whether to allow the administrator permission to override
* (takes priority over `explicit`)
* @returns {boolean}
* @example
* // see if a role can ban a member
@ -1817,8 +1820,10 @@ class Role {
* console.log('This role can\'t ban members');
* }
*/
hasPermission(permission, explicit) {
return new Permissions(this.permissions).has(permission, !explicit);
hasPermission(permission, explicit = false, checkAdmin) {
return new Permissions(this.permissions).has(
permission, typeof checkAdmin !== 'undefined' ? checkAdmin : !explicit
);
}
/**
@ -1826,6 +1831,7 @@ class Role {
* @param {PermissionResolvable[]} permissions The permissions to check for
* @param {boolean} [explicit=false] Whether to require the role to explicitly have the exact permissions
* @returns {boolean}
* @deprecated
*/
hasPermissions(permissions, explicit = false) {
return new Permissions(this.permissions).has(permissions, !explicit);

20
discord.master.min.js vendored

File diff suppressed because one or more lines are too long