From cafde77d73452d729ba8e2cb1cac3f14235b889b Mon Sep 17 00:00:00 2001 From: Lo <45238635+mainleau@users.noreply.github.com> Date: Sun, 17 Jul 2022 21:17:49 +0200 Subject: [PATCH] refactor(Util)!: rename `fetchRecommendedShards` (#8298) --- packages/discord.js/src/sharding/ShardingManager.js | 4 ++-- packages/discord.js/src/util/Util.js | 8 ++++---- packages/discord.js/typings/index.d.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/discord.js/src/sharding/ShardingManager.js b/packages/discord.js/src/sharding/ShardingManager.js index a4b3c87a0..28f8c58fb 100644 --- a/packages/discord.js/src/sharding/ShardingManager.js +++ b/packages/discord.js/src/sharding/ShardingManager.js @@ -8,7 +8,7 @@ const { setTimeout: sleep } = require('node:timers/promises'); const { Collection } = require('@discordjs/collection'); const Shard = require('./Shard'); const { Error, TypeError, RangeError, ErrorCodes } = require('../errors'); -const { mergeDefault, fetchRecommendedShards } = require('../util/Util'); +const { mergeDefault, fetchRecommendedShardCount } = require('../util/Util'); /** * This is a utility class that makes multi-process sharding of a bot an easy and painless experience. @@ -187,7 +187,7 @@ class ShardingManager extends EventEmitter { async spawn({ amount = this.totalShards, delay = 5500, timeout = 30_000 } = {}) { // Obtain/verify the number of shards to spawn if (amount === 'auto') { - amount = await fetchRecommendedShards(this.token); + amount = await fetchRecommendedShardCount(this.token); } else { if (typeof amount !== 'number' || isNaN(amount)) { throw new TypeError(ErrorCodes.ClientInvalidOption, 'Amount of shards', 'a number.'); diff --git a/packages/discord.js/src/util/Util.js b/packages/discord.js/src/util/Util.js index 82050d77d..9409dbcd3 100644 --- a/packages/discord.js/src/util/Util.js +++ b/packages/discord.js/src/util/Util.js @@ -211,7 +211,7 @@ function escapeSpoiler(text) { } /** - * @typedef {Object} FetchRecommendedShardsOptions + * @typedef {Object} FetchRecommendedShardCountOptions * @property {number} [guildsPerShard=1000] Number of guilds assigned per shard * @property {number} [multipleOf=1] The multiple the shard count should round up to. (16 for large bot sharding) */ @@ -219,10 +219,10 @@ function escapeSpoiler(text) { /** * Gets the recommended shard count from Discord. * @param {string} token Discord auth token - * @param {FetchRecommendedShardsOptions} [options] Options for fetching the recommended shard count + * @param {FetchRecommendedShardCountOptions} [options] Options for fetching the recommended shard count * @returns {Promise} The recommended number of shards */ -async function fetchRecommendedShards(token, { guildsPerShard = 1_000, multipleOf = 1 } = {}) { +async function fetchRecommendedShardCount(token, { guildsPerShard = 1_000, multipleOf = 1 } = {}) { if (!token) throw new DiscordError(ErrorCodes.TokenMissing); const response = await fetch(RouteBases.api + Routes.gatewayBot(), { method: 'GET', @@ -555,7 +555,7 @@ module.exports = { escapeUnderline, escapeStrikethrough, escapeSpoiler, - fetchRecommendedShards, + fetchRecommendedShardCount, parseEmoji, resolvePartialEmoji, mergeDefault, diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts index 7c148defe..1d9259349 100644 --- a/packages/discord.js/typings/index.d.ts +++ b/packages/discord.js/typings/index.d.ts @@ -2290,7 +2290,7 @@ export class ShardingManager extends EventEmitter { public once(event: 'shardCreate', listener: (shard: Shard) => Awaitable): this; } -export interface FetchRecommendedShardsOptions { +export interface FetchRecommendedShardCountOptions { guildsPerShard?: number; multipleOf?: number; } @@ -2640,7 +2640,7 @@ export function escapeUnderline(text: string): string; export function escapeStrikethrough(text: string): string; export function escapeSpoiler(text: string): string; export function cleanCodeBlockContent(text: string): string; -export function fetchRecommendedShards(token: string, options?: FetchRecommendedShardsOptions): Promise; +export function fetchRecommendedShardCount(token: string, options?: FetchRecommendedShardCountOptions): Promise; export function flatten(obj: unknown, ...props: Record[]): unknown; export function makeError(obj: MakeErrorOptions): Error; export function makePlainError(err: Error): MakeErrorOptions;