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(BitField): throw an error if bit to resolve is undefined #5565

Merged
merged 9 commits into from Jun 9, 2021
Merged

fix(BitField): throw an error if bit to resolve is undefined #5565

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83374bd
fix(Bitfield): has must return false it bit is undefined
kevinbioj Apr 28, 2021
41285af
Update src/util/BitField.js
kevinbioj Apr 30, 2021
1e3c8ca
fix(BitField): throw an error if bit to resolve is undefined
kevinbioj May 7, 2021
39bd4f0
fix(BitField): keep consistency for recursive has calls
kevinbioj May 7, 2021
e2f343b
typings(BitField): ...hasParam for has
kevinbioj May 7, 2021
ae896e6
fix(Permissions): pass checkAdmin to BitField#has
kevinbioj May 7, 2021
d31c779
revert(Permissions): revert to default behavior
kevinbioj Jun 9, 2021
3a2db52
revert(BitField): revert changes + fix(BitField): letting resolve han…
kevinbioj Jun 9, 2021
6b994a9
revert(typings): revert changes
kevinbioj Jun 9, 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
6 changes: 3 additions & 3 deletions src/util/BitField.js
View file
Open in desktop
Expand Up @@ -38,10 +38,11 @@ class BitField {
/**
* Checks whether the bitfield has a bit, or multiple bits.
* @param {BitFieldResolvable} bit Bit(s) to check for
* @param {...*} hasParams Additional parameters for the has method, if any
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what exactly this solves, but I'd rather drop it and the recursion that requires it.
BitField.resolve handles arrays just fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, it used to return true whenever they had admin no matter if you actually passed true to checkAdmin.
I still do not really understand the issue here, anyway as you said <BitField>.constructor.resolve handles arrays well already.

* @returns {boolean}
*/
has(bit) {
if (Array.isArray(bit)) return bit.every(p => this.has(p));
has(bit, ...hasParams) {
if (Array.isArray(bit)) return bit.every(p => this.has(p, ...hasParams));
bit = this.constructor.resolve(bit);
return (this.bitfield & bit) === bit;
}
Expand Down Expand Up @@ -143,7 +144,6 @@ class BitField {
*/
static resolve(bit) {
const { defaultBit } = this;
if (typeof bit === 'undefined') return defaultBit;
if (typeof defaultBit === typeof bit && bit >= defaultBit) return bit;
if (bit instanceof BitField) return bit.bitfield;
if (Array.isArray(bit)) return bit.map(p => this.resolve(p)).reduce((prev, p) => prev | p, defaultBit);
Expand Down
2 changes: 1 addition & 1 deletion src/util/Permissions.js
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ class Permissions extends BitField {
* @returns {boolean}
*/
has(permission, checkAdmin = true) {
return (checkAdmin && super.has(this.constructor.FLAGS.ADMINISTRATOR)) || super.has(permission);
return (checkAdmin && super.has(this.constructor.FLAGS.ADMINISTRATOR)) || super.has(permission, checkAdmin);
}
}

Expand Down
2 changes: 1 addition & 1 deletion typings/index.d.ts
View file
Open in desktop
Expand Up @@ -203,7 +203,7 @@ declare module 'discord.js' {
public any(bit: BitFieldResolvable<S, N>): boolean;
public equals(bit: BitFieldResolvable<S, N>): boolean;
public freeze(): Readonly<BitField<S, N>>;
public has(bit: BitFieldResolvable<S, N>): boolean;
public has(bit: BitFieldResolvable<S, N>, ...hasParam: readonly unknown[]): boolean;
public missing(bits: BitFieldResolvable<S, N>, ...hasParam: readonly unknown[]): S[];
public remove(...bits: BitFieldResolvable<S, N>[]): BitField<S, N>;
public serialize(...hasParam: readonly unknown[]): Record<S, boolean>;
Expand Down