From 955e8fe312c42ad4937cc1994d1d81e517c413c8 Mon Sep 17 00:00:00 2001 From: DraftMan Date: Sun, 12 Mar 2023 21:07:51 +0100 Subject: [PATCH] fix(snowflake): snowflakes length (#9144) * fix(snowflake): fix snowflakes length * fix(snowflake): fix length --- packages/discord.js/src/managers/ThreadManager.js | 2 +- packages/rest/src/lib/RequestManager.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/discord.js/src/managers/ThreadManager.js b/packages/discord.js/src/managers/ThreadManager.js index 530de214e..2ae78cc00 100644 --- a/packages/discord.js/src/managers/ThreadManager.js +++ b/packages/discord.js/src/managers/ThreadManager.js @@ -148,7 +148,7 @@ class ThreadManager extends CachedManager { let id; const query = makeURLSearchParams({ limit }); if (typeof before !== 'undefined') { - if (before instanceof ThreadChannel || /^\d{16,19}$/.test(String(before))) { + if (before instanceof ThreadChannel || /^\d{17,19}$/.test(String(before))) { id = this.resolveId(before); timestamp = this.resolve(before)?.archivedAt?.toISOString(); const toUse = type === 'private' && !fetchAll ? id : timestamp; diff --git a/packages/rest/src/lib/RequestManager.ts b/packages/rest/src/lib/RequestManager.ts index 24853ad8c..364072130 100644 --- a/packages/rest/src/lib/RequestManager.ts +++ b/packages/rest/src/lib/RequestManager.ts @@ -499,14 +499,14 @@ export class RequestManager extends EventEmitter { * @internal */ private static generateRouteData(endpoint: RouteLike, method: RequestMethod): RouteData { - const majorIdMatch = /^\/(?:channels|guilds|webhooks)\/(\d{16,19})/.exec(endpoint); + const majorIdMatch = /^\/(?:channels|guilds|webhooks)\/(\d{17,19})/.exec(endpoint); // Get the major id for this route - global otherwise const majorId = majorIdMatch?.[1] ?? 'global'; const baseRoute = endpoint // Strip out all ids - .replaceAll(/\d{16,19}/g, ':id') + .replaceAll(/\d{17,19}/g, ':id') // Strip out reaction as they fall under the same bucket .replace(/\/reactions\/(.*)/, '/reactions/:reaction'); @@ -515,7 +515,7 @@ export class RequestManager extends EventEmitter { // Hard-Code Old Message Deletion Exception (2 week+ old messages are a different bucket) // https://github.com/discord/discord-api-docs/issues/1295 if (method === RequestMethod.Delete && baseRoute === '/channels/:id/messages/:id') { - const id = /\d{16,19}$/.exec(endpoint)![0]!; + const id = /\d{17,19}$/.exec(endpoint)![0]!; const timestamp = DiscordSnowflake.timestampFrom(id); if (Date.now() - timestamp > 1_000 * 60 * 60 * 24 * 14) { exceptions += '/Delete Old Message';