From 58068fdae9d8c511074e025c7f88b65d799be9bd Mon Sep 17 00:00:00 2001 From: Schuyler Cebulskie Date: Tue, 21 Mar 2017 02:53:08 -0400 Subject: [PATCH] Change check for array/number, and fix docs --- src/util/Permissions.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/Permissions.js b/src/util/Permissions.js index 6e1622e57..e099d8390 100644 --- a/src/util/Permissions.js +++ b/src/util/Permissions.js @@ -8,10 +8,10 @@ const Constants = require('../util/Constants'); class Permissions { /** * @param {GuildMember} [member] Member the permissions are for **(deprecated)** - * @param {number|PermissionResolvable[]} bitfield Permissions or bitfield to read from + * @param {number|PermissionResolvable[]} permissions Permissions or bitfield to read from */ - constructor(member, bitfield) { - bitfield = typeof member === 'object' && !(member instanceof Array) ? bitfield : member; + constructor(member, permissions) { + permissions = typeof member === 'object' && !(member instanceof Array) ? permissions : member; /** * Member the permissions are for @@ -24,7 +24,7 @@ class Permissions { * Bitfield of the packed permissions * @type {number} */ - this.bitfield = bitfield instanceof Array ? this.constructor.resolve(bitfield) : bitfield; + this.bitfield = typeof permissions === 'number' ? permissions : this.constructor.resolve(permissions); } /** @@ -149,8 +149,8 @@ class Permissions { /** * Resolves permissions to their numeric form. - * @param {PermissionResolvable|Permissions[]} permission - Permission(s) to resolve - * @returns {number|number[]} + * @param {PermissionResolvable|PermissionResolvable[]} permission - Permission(s) to resolve + * @returns {number} */ static resolve(permission) { if (permission instanceof Array) return permission.map(p => this.resolve(p)).reduce((prev, p) => prev | p, 0);