Skip to content

refactor(resolveColor): Prioritise number type check #10116

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

Merged
merged 3 commits into from
Feb 3, 2024
Merged

refactor(resolveColor): Prioritise number type check #10116

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d01076e
refactor(resolveColor): prioritise number type check
Jiralite Feb 2, 2024
0dd5fd6
refactor: prefer `!Number.isInteger()`
Jiralite Feb 2, 2024
7cb955f
Merge branch 'main' into refactor/number-priority-colour
kodiakhq[bot] Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/discord.js/src/util/Util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,14 @@ function resolveColor(color) {
resolvedColor = (color[0] << 16) + (color[1] << 8) + color[2];
}

if (resolvedColor < 0 || resolvedColor > 0xffffff) {
throw new DiscordjsRangeError(ErrorCodes.ColorRange);
}

if (typeof resolvedColor !== 'number' || Number.isNaN(resolvedColor)) {
throw new DiscordjsTypeError(ErrorCodes.ColorConvert, color);
}

if (resolvedColor < 0 || resolvedColor > 0xffffff) {
throw new DiscordjsRangeError(ErrorCodes.ColorRange);
}

return resolvedColor;
}

Expand Down