From f527dea36ead194aaae1bf5da1e953df59d692fd Mon Sep 17 00:00:00 2001
From: ckohen <chaikohen@gmail.com>
Date: Sat, 11 Jun 2022 02:04:53 -0700
Subject: [PATCH] fix(scripts): read directory and rerun (#8065)

---
 .../discord.js/scripts/generateRequires.mjs   |  9 ++++++---
 .../src/client/websocket/handlers/index.js    | 19 ++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/discord.js/scripts/generateRequires.mjs b/packages/discord.js/scripts/generateRequires.mjs
index dfafb3a40..70ff058e8 100644
--- a/packages/discord.js/scripts/generateRequires.mjs
+++ b/packages/discord.js/scripts/generateRequires.mjs
@@ -1,11 +1,14 @@
 import { readdir, writeFile } from 'node:fs/promises';
-import { GatewayDispatchEvents } from '../src/index.js';
 
 async function writeWebsocketHandlerImports() {
   const lines = ["'use strict';\n", 'const handlers = Object.fromEntries(['];
 
-  for (const name of Object.values(GatewayDispatchEvents)) {
-    lines.push(`  ['${name}', require('./${name}')],`);
+  const handlersDirectory = new URL('../src/client/websocket/handlers', import.meta.url);
+
+  for (const file of await (await readdir(handlersDirectory)).sort()) {
+    if (file === 'index.js') continue;
+
+    lines.push(`  ['${file.slice(0, -3)}', require('./${file.slice(0, -3)}')],`);
   }
 
   lines.push(']);\n\nmodule.exports = handlers;\n');
diff --git a/packages/discord.js/src/client/websocket/handlers/index.js b/packages/discord.js/src/client/websocket/handlers/index.js
index 53892eafa..c6b6bf53b 100644
--- a/packages/discord.js/src/client/websocket/handlers/index.js
+++ b/packages/discord.js/src/client/websocket/handlers/index.js
@@ -12,18 +12,20 @@ const handlers = Object.fromEntries([
   ['GUILD_DELETE', require('./GUILD_DELETE')],
   ['GUILD_EMOJIS_UPDATE', require('./GUILD_EMOJIS_UPDATE')],
   ['GUILD_INTEGRATIONS_UPDATE', require('./GUILD_INTEGRATIONS_UPDATE')],
+  ['GUILD_MEMBERS_CHUNK', require('./GUILD_MEMBERS_CHUNK')],
   ['GUILD_MEMBER_ADD', require('./GUILD_MEMBER_ADD')],
   ['GUILD_MEMBER_REMOVE', require('./GUILD_MEMBER_REMOVE')],
-  ['GUILD_MEMBERS_CHUNK', require('./GUILD_MEMBERS_CHUNK')],
   ['GUILD_MEMBER_UPDATE', require('./GUILD_MEMBER_UPDATE')],
   ['GUILD_ROLE_CREATE', require('./GUILD_ROLE_CREATE')],
   ['GUILD_ROLE_DELETE', require('./GUILD_ROLE_DELETE')],
   ['GUILD_ROLE_UPDATE', require('./GUILD_ROLE_UPDATE')],
+  ['GUILD_SCHEDULED_EVENT_CREATE', require('./GUILD_SCHEDULED_EVENT_CREATE')],
+  ['GUILD_SCHEDULED_EVENT_DELETE', require('./GUILD_SCHEDULED_EVENT_DELETE')],
+  ['GUILD_SCHEDULED_EVENT_UPDATE', require('./GUILD_SCHEDULED_EVENT_UPDATE')],
+  ['GUILD_SCHEDULED_EVENT_USER_ADD', require('./GUILD_SCHEDULED_EVENT_USER_ADD')],
+  ['GUILD_SCHEDULED_EVENT_USER_REMOVE', require('./GUILD_SCHEDULED_EVENT_USER_REMOVE')],
   ['GUILD_STICKERS_UPDATE', require('./GUILD_STICKERS_UPDATE')],
   ['GUILD_UPDATE', require('./GUILD_UPDATE')],
-  ['INTEGRATION_CREATE', require('./INTEGRATION_CREATE')],
-  ['INTEGRATION_DELETE', require('./INTEGRATION_DELETE')],
-  ['INTEGRATION_UPDATE', require('./INTEGRATION_UPDATE')],
   ['INTERACTION_CREATE', require('./INTERACTION_CREATE')],
   ['INVITE_CREATE', require('./INVITE_CREATE')],
   ['INVITE_DELETE', require('./INVITE_DELETE')],
@@ -36,11 +38,11 @@ const handlers = Object.fromEntries([
   ['MESSAGE_REACTION_REMOVE_EMOJI', require('./MESSAGE_REACTION_REMOVE_EMOJI')],
   ['MESSAGE_UPDATE', require('./MESSAGE_UPDATE')],
   ['PRESENCE_UPDATE', require('./PRESENCE_UPDATE')],
+  ['READY', require('./READY')],
+  ['RESUMED', require('./RESUMED')],
   ['STAGE_INSTANCE_CREATE', require('./STAGE_INSTANCE_CREATE')],
   ['STAGE_INSTANCE_DELETE', require('./STAGE_INSTANCE_DELETE')],
   ['STAGE_INSTANCE_UPDATE', require('./STAGE_INSTANCE_UPDATE')],
-  ['READY', require('./READY')],
-  ['RESUMED', require('./RESUMED')],
   ['THREAD_CREATE', require('./THREAD_CREATE')],
   ['THREAD_DELETE', require('./THREAD_DELETE')],
   ['THREAD_LIST_SYNC', require('./THREAD_LIST_SYNC')],
@@ -52,11 +54,6 @@ const handlers = Object.fromEntries([
   ['VOICE_SERVER_UPDATE', require('./VOICE_SERVER_UPDATE')],
   ['VOICE_STATE_UPDATE', require('./VOICE_STATE_UPDATE')],
   ['WEBHOOKS_UPDATE', require('./WEBHOOKS_UPDATE')],
-  ['GUILD_SCHEDULED_EVENT_CREATE', require('./GUILD_SCHEDULED_EVENT_CREATE')],
-  ['GUILD_SCHEDULED_EVENT_UPDATE', require('./GUILD_SCHEDULED_EVENT_UPDATE')],
-  ['GUILD_SCHEDULED_EVENT_DELETE', require('./GUILD_SCHEDULED_EVENT_DELETE')],
-  ['GUILD_SCHEDULED_EVENT_USER_ADD', require('./GUILD_SCHEDULED_EVENT_USER_ADD')],
-  ['GUILD_SCHEDULED_EVENT_USER_REMOVE', require('./GUILD_SCHEDULED_EVENT_USER_REMOVE')],
 ]);
 
 module.exports = handlers;