From 8f0e2e0c56c9ab2c7c93d0aa1039dfceaa93dad2 Mon Sep 17 00:00:00 2001 From: Schuyler Cebulskie Date: Fri, 14 Oct 2016 02:14:00 -0400 Subject: [PATCH] Make token "Bot" removal more lenient In case of heavy user error. :) --- src/client/rest/RESTMethods.js | 2 +- src/sharding/ShardingManager.js | 2 +- src/util/GetRecommendedShards.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/rest/RESTMethods.js b/src/client/rest/RESTMethods.js index 85c4c698d..3bbe155dd 100644 --- a/src/client/rest/RESTMethods.js +++ b/src/client/rest/RESTMethods.js @@ -15,7 +15,7 @@ class RESTMethods { } loginToken(token = this.rest.client.token) { - token = token.replace(/^Bot /, ''); + token = token.replace(/^Bot\s*/i, ''); return new Promise((resolve, reject) => { this.rest.client.manager.connectToWebSocket(token, resolve, reject); }); diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js index 640822455..911fa47b7 100644 --- a/src/sharding/ShardingManager.js +++ b/src/sharding/ShardingManager.js @@ -72,7 +72,7 @@ class ShardingManager extends EventEmitter { * Token to use for obtaining the automatic shard count, and passing to shards * @type {?string} */ - this.token = options.token ? options.token.replace(/^Bot /, '') : null; + this.token = options.token ? options.token.replace(/^Bot\s*/i, '') : null; /** * A collection of shards that this manager has spawned diff --git a/src/util/GetRecommendedShards.js b/src/util/GetRecommendedShards.js index abce3fb39..8165cd02f 100644 --- a/src/util/GetRecommendedShards.js +++ b/src/util/GetRecommendedShards.js @@ -10,7 +10,7 @@ module.exports = function getRecommendedShards(token) { return new Promise((resolve, reject) => { if (!token) throw new Error('A token must be provided.'); superagent.get(botGateway) - .set('Authorization', `Bot ${token.replace(/^Bot /, '')}`) + .set('Authorization', `Bot ${token.replace(/^Bot\s*/i, '')}`) .end((err, res) => { if (err) reject(err); resolve(res.body.shards);