From fd4cda10d3abb827c13b443452da000572d061eb Mon Sep 17 00:00:00 2001 From: almostSouji Date: Tue, 19 Jan 2021 11:58:52 +0100 Subject: [PATCH 1/2] feat(BitField): move problematic bit into the error message --- src/errors/Messages.js | 2 +- src/util/BitField.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/errors/Messages.js b/src/errors/Messages.js index 980bf0975f27..4e9d73cacbd2 100644 --- a/src/errors/Messages.js +++ b/src/errors/Messages.js @@ -13,7 +13,7 @@ const Messages = { WS_CONNECTION_EXISTS: 'There is already an existing WebSocket connection.', WS_NOT_OPEN: (data = 'data') => `Websocket not open to send ${data}`, - BITFIELD_INVALID: 'Invalid bitfield flag or number.', + BITFIELD_INVALID: bit => `Invalid bitfield flag or number: ${bit}.`, SHARDING_INVALID: 'Invalid shard settings were provided.', SHARDING_REQUIRED: 'This session would have handled too many guilds - Sharding is required.', diff --git a/src/util/BitField.js b/src/util/BitField.js index 4d03aa6a5b11..80bdb8390fc4 100644 --- a/src/util/BitField.js +++ b/src/util/BitField.js @@ -147,8 +147,7 @@ class BitField { if (bit instanceof BitField) return bit.bitfield; if (Array.isArray(bit)) return bit.map(p => this.resolve(p)).reduce((prev, p) => prev | p, 0); if (typeof bit === 'string' && typeof this.FLAGS[bit] !== 'undefined') return this.FLAGS[bit]; - const error = new RangeError('BITFIELD_INVALID'); - error.bit = bit; + const error = new RangeError('BITFIELD_INVALID', bit); throw error; } } From 03a5b19a8fb88b7015ddb9ed63aa67631d356549 Mon Sep 17 00:00:00 2001 From: almostSouji Date: Tue, 19 Jan 2021 12:40:50 +0100 Subject: [PATCH 2/2] fix: remove intermediate constant --- src/util/BitField.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/BitField.js b/src/util/BitField.js index 80bdb8390fc4..fabbaf918f50 100644 --- a/src/util/BitField.js +++ b/src/util/BitField.js @@ -147,8 +147,7 @@ class BitField { if (bit instanceof BitField) return bit.bitfield; if (Array.isArray(bit)) return bit.map(p => this.resolve(p)).reduce((prev, p) => prev | p, 0); if (typeof bit === 'string' && typeof this.FLAGS[bit] !== 'undefined') return this.FLAGS[bit]; - const error = new RangeError('BITFIELD_INVALID', bit); - throw error; + throw new RangeError('BITFIELD_INVALID', bit); } }