Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Permissions): toArray shouldn't check admin #7144

Merged
merged 2 commits into from Dec 26, 2021
Merged

fix(Permissions): toArray shouldn't check admin #7144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
299258b
fix(Permissions): toArray shouldn't check admin
DTrombett Dec 24, 2021
6e216d5
types(Permissions): update toArray
DTrombett Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/util/Permissions.js
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ class Permissions extends BitField {
* @returns {string[]}
*/
missing(bits, checkAdmin = true) {
return checkAdmin && this.has(this.constructor.FLAGS.ADMINISTRATOR) ? [] : super.missing(bits, checkAdmin);
return checkAdmin && this.has(this.constructor.FLAGS.ADMINISTRATOR) ? [] : super.missing(bits);
}

/**
Expand All @@ -53,6 +53,14 @@ class Permissions extends BitField {
has(permission, checkAdmin = true) {
return (checkAdmin && super.has(this.constructor.FLAGS.ADMINISTRATOR)) || super.has(permission);
}

/**
* Gets an {@link Array} of bitfield names based on the permissions available.
* @returns {string[]}
*/
toArray() {
return super.toArray(false);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion typings/index.d.ts
View file
Open in desktop
Expand Up @@ -1851,7 +1851,7 @@ export class Permissions extends BitField<PermissionString, bigint> {
public has(permission: PermissionResolvable, checkAdmin?: boolean): boolean;
public missing(bits: BitFieldResolvable<PermissionString, bigint>, checkAdmin?: boolean): PermissionString[];
public serialize(checkAdmin?: boolean): Record<PermissionString, boolean>;
public toArray(checkAdmin?: boolean): PermissionString[];
public toArray(): PermissionString[];

public static ALL: bigint;
public static DEFAULT: bigint;
Expand Down