@discord-selfbot/core 14.0.1 → 14.0.2

package/dist/index.js

@@ -2,7 +2,7 @@
 // package.json
 var package_default = {
   name: "@discord-selfbot/core",
-  version: "14.0.1",
+  version: "14.0.2",
   description: "An unofficial discord.js fork for creating selfbots, migrated to TypeScript and ESM",
   keywords: [
     "api",
@@ -5200,14 +5200,17 @@ import { setInterval as setInterval2 } from "timers";
 import { Collection as Collection10 } from "@discordjs/collection";
 import makeFetchCookie from "fetch-cookie";
 import { CookieJar } from "tough-cookie";
-import { fetch as fetchOriginal } from "undici";
+import {
+  Client as UndiciClient,
+  ProxyAgent,
+  buildConnector,
+  fetch as fetchOriginal
+} from "undici";
 
 // src/rest/APIRequest.ts
 import { Buffer as Buffer3 } from "buffer";
 import { setTimeout as setTimeout4 } from "timers";
-import { FormData, buildConnector, Client as Client2, ProxyAgent } from "undici";
-var { ciphers } = Constants_default;
-var agent = null;
+import { FormData } from "undici";
 
 class APIRequest {
   rest;
@@ -5226,7 +5229,6 @@ class APIRequest {
     this.options = options;
     this.retries = 0;
     this.fullUserAgent = this.client.options.http.headers["User-Agent"];
-    this.client.options.ws.properties.browser_user_agent = this.fullUserAgent;
     let queryString = "";
     if (options.query) {
       const queryOptions = options.query;
@@ -5236,7 +5238,7 @@ class APIRequest {
     this.path = `${path}${queryString && `?${queryString}`}`;
   }
   make(captchaKey, captchaRqToken) {
-    this.ensureAgent();
+    const dispatcher = this.rest.getDispatcher();
     const API = this.options.versioned === false ? this.client.options.http.api : `${this.client.options.http.api}/v${this.client.options.http.version}`;
     const url = API + this.path;
     const headers = this.buildHeaders(captchaKey, captchaRqToken);
@@ -5246,25 +5248,13 @@ class APIRequest {
     return this.rest.fetch(url, {
       body,
       credentials: "include",
-      dispatcher: agent,
+      dispatcher,
       headers,
       method: this.method.toUpperCase(),
       redirect: "follow",
       signal: controller.signal
     }).finally(() => clearTimeout(timeout));
   }
-  ensureAgent() {
-    if (agent) {
-      return;
-    }
-    const proxyAgent = Util_default.checkUndiciProxyAgent(this.client.options.http.agent);
-    agent = proxyAgent ? new ProxyAgent({
-      ...proxyAgent,
-      ciphers: ciphers.join(":")
-    }) : new Client2("https://discord.com", {
-      connect: buildConnector({ ciphers: ciphers.join(":") })
-    });
-  }
   buildHeaders(captchaKey, captchaRqToken) {
     let headers = {
       accept: "*/*",
@@ -5569,8 +5559,6 @@ function calculateReset(reset, resetAfter, serverDate) {
   }
   return new Date(Number(reset) * 1000).getTime() - getAPIOffset(serverDate);
 }
-var invalidCount = 0;
-var invalidCountResetTime = null;
 
 class RequestHandler {
   manager;
@@ -5750,16 +5738,16 @@ class RequestHandler {
   }
   trackInvalidRequest(res) {
     if (res.status === 401 || res.status === 403 || res.status === 429) {
-      if (!invalidCountResetTime || invalidCountResetTime < Date.now()) {
-        invalidCountResetTime = Date.now() + 1000 * 60 * 10;
-        invalidCount = 0;
+      if (!this.manager.invalidCountResetTime || this.manager.invalidCountResetTime < Date.now()) {
+        this.manager.invalidCountResetTime = Date.now() + 1000 * 60 * 10;
+        this.manager.invalidCount = 0;
       }
-      invalidCount++;
-      const emitInvalid = this.manager.client.listenerCount(INVALID_REQUEST_WARNING) && this.manager.client.options.invalidRequestWarningInterval > 0 && invalidCount % this.manager.client.options.invalidRequestWarningInterval === 0;
+      this.manager.invalidCount++;
+      const emitInvalid = this.manager.client.listenerCount(INVALID_REQUEST_WARNING) && this.manager.client.options.invalidRequestWarningInterval > 0 && this.manager.invalidCount % this.manager.client.options.invalidRequestWarningInterval === 0;
       if (emitInvalid) {
         this.manager.client.emit(INVALID_REQUEST_WARNING, {
-          count: invalidCount,
-          remainingTime: invalidCountResetTime - Date.now()
+          count: this.manager.invalidCount,
+          remainingTime: (this.manager.invalidCountResetTime ?? Date.now()) - Date.now()
         });
       }
     }
@@ -5857,7 +5845,7 @@ var RequestHandler_default = RequestHandler;
 
 // src/rest/RESTManager.ts
 var { Error: Error7 } = errors_default;
-var { Endpoints: Endpoints3 } = Constants_default;
+var { Endpoints: Endpoints3, ciphers } = Constants_default;
 
 class RESTManager {
   client;
@@ -5870,6 +5858,9 @@ class RESTManager {
   cookieJar;
   fetch;
   sweepInterval;
+  agent;
+  invalidCount;
+  invalidCountResetTime;
   constructor(client) {
     this.client = client;
     this.handlers = new Collection10;
@@ -5880,12 +5871,28 @@ class RESTManager {
     this.globalDelay = null;
     this.cookieJar = new CookieJar;
     this.fetch = makeFetchCookie(fetchOriginal, this.cookieJar);
+    this.agent = null;
+    this.invalidCount = 0;
+    this.invalidCountResetTime = null;
     if (client.options.restSweepInterval > 0) {
       this.sweepInterval = setInterval2(() => {
         this.handlers.sweep((handler) => handler._inactive);
       }, client.options.restSweepInterval * 1000).unref();
     }
   }
+  getDispatcher() {
+    if (this.agent) {
+      return this.agent;
+    }
+    const proxyAgent = Util_default.checkUndiciProxyAgent(this.client.options.http.agent);
+    this.agent = proxyAgent ? new ProxyAgent({
+      ...proxyAgent,
+      ciphers: ciphers.join(":")
+    }) : new UndiciClient("https://discord.com", {
+      connect: buildConnector({ ciphers: ciphers.join(":") })
+    });
+    return this.agent;
+  }
   get api() {
     return APIRouter_default(this);
   }
@@ -6181,6 +6188,7 @@ class BaseClient extends EventEmitter {
       process6.emitWarning("Intents is not available.", "DeprecationWarning");
     }
     this.options = Util_default.mergeDefault(Options_default.createDefault(), options);
+    this.options.ws.properties.browser_user_agent = this.options.http.headers["User-Agent"];
     this.rest = new RESTManager_default(this);
   }
   get api() {
@@ -6212,11 +6220,22 @@ var BaseClient_default = BaseClient;
 // src/client/WebhookClient.ts
 var require4 = createRequire3(import.meta.url);
 var { Error: Error8 } = errors_default;
+var _webhookPatched = false;
 
 class WebhookClient extends BaseClient_default {
   constructor(data, options) {
     super(options);
     Object.defineProperty(this, "client", { value: this });
+    if (!_webhookPatched) {
+      try {
+        const WebhookMod = require4("../structures/Webhook");
+        const Webhook = WebhookMod.default ?? WebhookMod;
+        if (typeof Webhook.applyToClass === "function") {
+          Webhook.applyToClass(WebhookClient);
+          _webhookPatched = true;
+        }
+      } catch {}
+    }
     let id = null;
     let token = null;
     if ("url" in data) {
@@ -6245,12 +6264,6 @@ class WebhookClient extends BaseClient_default {
   deleteMessage() {}
 }
 var WebhookClient_default = WebhookClient;
-setTimeout(() => {
-  try {
-    const Webhook = require4("../structures/Webhook");
-    Webhook.applyToClass(WebhookClient);
-  } catch {}
-}, 0);
 
 // src/structures/VoiceState.ts
 var { Error: Error9, TypeError: TypeError10 } = errors_default;
@@ -6633,6 +6646,31 @@ var MessageCollector_default = MessageCollector;
 import { setTimeout as setTimeout6 } from "timers";
 import { s } from "@sapphire/shapeshift";
 
+// src/util/OutboundMessagePipeline.ts
+async function uploadMessageAttachments(client, channelId, files) {
+  if (!files.length) {
+    return [];
+  }
+  const uploads = await Util_default.getUploadURL(client, channelId, files);
+  const attachments = await Promise.all(uploads.map(async (upload) => {
+    const file = files[Number(upload.id)];
+    if (!file) {
+      throw new TypeError("Invalid upload attachment index");
+    }
+    await Util_default.uploadFile(file.file, upload.upload_url);
+    return {
+      description: file.description,
+      duration_secs: file.duration_secs,
+      filename: file.name,
+      id: upload.id,
+      uploaded_filename: upload.upload_filename,
+      waveform: file.waveform
+    };
+  }));
+  attachments.sort((left, right) => Math.trunc(Number(left.id)) - Math.trunc(Number(right.id)));
+  return attachments;
+}
+
 // src/structures/GuildMember.ts
 import { createRequire as createRequire4 } from "module";
 import process8 from "process";
@@ -9117,25 +9155,7 @@ class MessageManager extends CachedManager_default {
       throw new TypeError14("INVALID_TYPE", "message", "MessageResolvable");
     }
     const { data, files } = await (options instanceof MessagePayload_default ? options : MessagePayload_default.create(message instanceof Message2 ? message : this, options)).resolveData().resolveFiles();
-    const fileList = files ?? [];
-    const attachments = await Util_default.getUploadURL(this.client, this.channel.id, fileList);
-    const requestPromises = attachments.map(async (attachment) => {
-      const file = fileList[Number(attachment.id)];
-      if (!file) {
-        throw new TypeError14("INVALID_TYPE", "attachment", "FileOptions");
-      }
-      await Util_default.uploadFile(file.file, attachment.upload_url);
-      return {
-        description: file.description,
-        duration_secs: file.duration_secs,
-        filename: file.name,
-        id: attachment.id,
-        uploaded_filename: attachment.upload_filename,
-        waveform: file.waveform
-      };
-    });
-    const attachmentsData = await Promise.all(requestPromises);
-    attachmentsData.sort((left, right) => Math.trunc(Number(left.id)) - Math.trunc(Number(right.id)));
+    const attachmentsData = await uploadMessageAttachments(this.client, this.channel.id, files ?? []);
     if (data) {
       Object.assign(data, { attachments: attachmentsData });
     }
@@ -9644,25 +9664,7 @@ class TextBasedChannel {
     }
     const messagePayload = options instanceof MessagePayload_default ? options.resolveData() : MessagePayload_default.create(this, options).resolveData();
     const { data, files } = await messagePayload.resolveFiles();
-    const fileList = files ?? [];
-    const attachments = await Util_default.getUploadURL(this.client, this.id, fileList);
-    const requestPromises = attachments.map(async (attachment) => {
-      const file = fileList[Number(attachment.id)];
-      if (!file) {
-        throw new Error17("INVALID_TYPE", "attachment", "FileOptions");
-      }
-      await Util_default.uploadFile(file.file, attachment.upload_url);
-      return {
-        description: file.description,
-        duration_secs: file.duration_secs,
-        filename: file.name,
-        id: attachment.id,
-        uploaded_filename: attachment.upload_filename,
-        waveform: file.waveform
-      };
-    });
-    const attachmentsData = await Promise.all(requestPromises);
-    attachmentsData.sort((left, right) => Math.trunc(Number(left.id)) - Math.trunc(Number(right.id)));
+    const attachmentsData = await uploadMessageAttachments(this.client, this.id, files ?? []);
     if (data) {
       Object.assign(data, { attachments: attachmentsData });
     }
@@ -11048,7 +11050,6 @@ import process15 from "process";
 import { Collection as Collection27 } from "@discordjs/collection";
 
 // src/structures/Channel.ts
-import { createRequire as createRequire6 } from "module";
 import process12 from "process";
 
 // src/util/ChannelFlags.ts
@@ -11060,114 +11061,116 @@ ChannelFlags.FLAGS = {
 };
 var ChannelFlags_default = ChannelFlags;
 
-// src/structures/Channel.ts
+// src/structures/ChannelConstruction.ts
+import { createRequire as createRequire6 } from "module";
 var require7 = createRequire6(import.meta.url);
-var { ChannelTypes: ChannelTypes3, ThreadChannelTypes: ThreadChannelTypes2, VoiceBasedChannelTypes } = Constants_default;
-var CategoryChannel;
-var DMChannel;
-var NewsChannel;
-var StageChannel;
-var StoreChannel;
-var TextChannel;
-var ThreadChannel;
-var VoiceChannel;
-var DirectoryChannel;
-var ForumChannel;
-var MediaChannel;
-var deletedChannels = new WeakSet;
-var deprecationEmittedForDeleted6 = false;
-function loadChannelClasses() {
-  CategoryChannel ??= require7("./CategoryChannel").default;
-  DMChannel ??= require7("./DMChannel").default;
-  NewsChannel ??= require7("./NewsChannel").default;
-  StageChannel ??= require7("./StageChannel").default;
-  StoreChannel ??= require7("./StoreChannel").default;
-  TextChannel ??= require7("./TextChannel").default;
-  ThreadChannel ??= require7("./ThreadChannel").default;
-  VoiceChannel ??= require7("./VoiceChannel").default;
-  DirectoryChannel ??= require7("./DirectoryChannel").default;
-  ForumChannel ??= require7("./ForumChannel").default;
-  MediaChannel ??= require7("./MediaChannel").default;
-}
-function cacheGuildChannel(cache, channel) {
-  cache.set(channel.id, channel);
-}
+var { ChannelTypes: ChannelTypes3 } = Constants_default;
+var channelFactory = null;
 function requireGuild(guild) {
   if (!guild) {
     throw new TypeError("A guild is required to create a guild channel");
   }
   return guild;
 }
-function createDirectMessageChannel(client, data) {
-  let channel;
-  if ("recipients" in data && data.recipients && data.type !== ChannelTypes3.GROUP_DM || data.type === ChannelTypes3.DM) {
-    channel = new DMChannel(client, data);
-  } else if (data.type === ChannelTypes3.GROUP_DM) {
-    const GroupDMChannel = require7("./GroupDMChannel").default;
-    channel = new GroupDMChannel(client, data);
-  }
-  return channel;
-}
-function createGuildChannel(client, data, guild, allowUnknownGuild) {
-  let channel;
-  switch (data.type) {
-    case ChannelTypes3.GUILD_TEXT: {
-      channel = new TextChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_VOICE: {
-      channel = new VoiceChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_CATEGORY: {
-      channel = new CategoryChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_NEWS: {
-      channel = new NewsChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_STORE: {
-      channel = new StoreChannel(requireGuild(guild), data, client);
-      break;
+function buildChannelFactory() {
+  const CategoryChannel = require7("./CategoryChannel").default;
+  const DMChannel = require7("./DMChannel").default;
+  const GroupDMChannel = require7("./GroupDMChannel").default;
+  const NewsChannel = require7("./NewsChannel").default;
+  const StageChannel = require7("./StageChannel").default;
+  const StoreChannel = require7("./StoreChannel").default;
+  const TextChannel = require7("./TextChannel").default;
+  const ThreadChannel = require7("./ThreadChannel").default;
+  const VoiceChannel = require7("./VoiceChannel").default;
+  const DirectoryChannel = require7("./DirectoryChannel").default;
+  const ForumChannel = require7("./ForumChannel").default;
+  const MediaChannel = require7("./MediaChannel").default;
+  const constructDirect = (client, data) => {
+    if ("recipients" in data && data.recipients && data.type !== ChannelTypes3.GROUP_DM || data.type === ChannelTypes3.DM) {
+      return new DMChannel(client, data);
+    }
+    if (data.type === ChannelTypes3.GROUP_DM) {
+      return new GroupDMChannel(client, data);
     }
-    case ChannelTypes3.GUILD_STAGE_VOICE: {
-      channel = new StageChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_NEWS_THREAD:
-    case ChannelTypes3.GUILD_PUBLIC_THREAD:
-    case ChannelTypes3.GUILD_PRIVATE_THREAD: {
-      const thread = new ThreadChannel(requireGuild(guild), data, client);
-      if (!allowUnknownGuild && thread.parent && isThreadParentChannel(thread.parent)) {
-        thread.parent.threads.cache.set(thread.id, thread);
+    return;
+  };
+  const constructGuild = (client, data, guild) => {
+    switch (data.type) {
+      case ChannelTypes3.GUILD_TEXT: {
+        return new TextChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_VOICE: {
+        return new VoiceChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_CATEGORY: {
+        return new CategoryChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_NEWS: {
+        return new NewsChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_STORE: {
+        return new StoreChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_STAGE_VOICE: {
+        return new StageChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_NEWS_THREAD:
+      case ChannelTypes3.GUILD_PUBLIC_THREAD:
+      case ChannelTypes3.GUILD_PRIVATE_THREAD: {
+        return new ThreadChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_DIRECTORY: {
+        return new DirectoryChannel(client, data);
+      }
+      case ChannelTypes3.GUILD_FORUM: {
+        return new ForumChannel(requireGuild(guild), data, client);
+      }
+      case ChannelTypes3.GUILD_MEDIA: {
+        return new MediaChannel(requireGuild(guild), data, client);
+      }
+      default: {
+        return;
       }
-      channel = thread;
-      break;
-    }
-    case ChannelTypes3.GUILD_DIRECTORY: {
-      channel = new DirectoryChannel(client, data);
-      break;
-    }
-    case ChannelTypes3.GUILD_FORUM: {
-      channel = new ForumChannel(requireGuild(guild), data, client);
-      break;
-    }
-    case ChannelTypes3.GUILD_MEDIA: {
-      channel = new MediaChannel(requireGuild(guild), data, client);
-      break;
     }
-    default: {
-      break;
+  };
+  return (client, data, guild) => {
+    const guildId = "guild_id" in data ? data.guild_id : undefined;
+    if (!guildId && !guild) {
+      return constructDirect(client, data);
     }
+    return constructGuild(client, data, guild);
+  };
+}
+function constructChannel(client, data, guild, { allowUnknownGuild = false } = {}) {
+  channelFactory ??= buildChannelFactory();
+  const relations = {};
+  const guildId = "guild_id" in data ? data.guild_id : undefined;
+  if (!guildId && !guild) {
+    return { channel: channelFactory(client, data), relations };
+  }
+  const resolvedGuild = guild ?? (guildId ? client.guilds.cache.get(guildId) : undefined);
+  if (!resolvedGuild && !allowUnknownGuild) {
+    return { channel: undefined, relations };
   }
-  return channel;
+  const channel = channelFactory(client, data, resolvedGuild);
+  if (channel && resolvedGuild) {
+    relations.guild = resolvedGuild;
+  }
+  if (channel && typeof channel.isThread === "function" && channel.isThread() && "parent" in channel && channel.parent && isThreadParentChannel(channel.parent)) {
+    relations.threadParent = channel.parent;
+  }
+  return { channel, relations };
 }
 
+// src/structures/Channel.ts
+var { ChannelTypes: ChannelTypes4, ThreadChannelTypes: ThreadChannelTypes2, VoiceBasedChannelTypes } = Constants_default;
+var deletedChannels = new WeakSet;
+var deprecationEmittedForDeleted6 = false;
+
 class Channel extends Base_default {
   constructor(client, data, immediatePatch = true) {
     super(client);
-    const type = data?.type === undefined ? undefined : ChannelTypes3[data.type];
+    const type = data?.type === undefined ? undefined : ChannelTypes4[data.type];
     this.type = type ?? "UNKNOWN";
     if (data && immediatePatch) {
       this._patch(data);
@@ -11236,20 +11239,22 @@ class Channel extends Base_default {
   isDirectory() {
     return this.type === "GUILD_DIRECTORY";
   }
+  static construct(client, data, guild, { allowUnknownGuild = false } = {}) {
+    return constructChannel(client, data, guild, { allowUnknownGuild });
+  }
   static create(client, data, guild, { allowUnknownGuild = false } = {}) {
-    loadChannelClasses();
-    let channel;
-    const guildId = "guild_id" in data ? data.guild_id : undefined;
-    if (!guildId && !guild) {
-      channel = createDirectMessageChannel(client, data);
-    } else {
-      const resolvedGuild = guild ?? (guildId ? client.guilds.cache.get(guildId) : undefined);
-      if (resolvedGuild || allowUnknownGuild) {
-        channel = createGuildChannel(client, data, resolvedGuild, allowUnknownGuild);
-        if (channel && !allowUnknownGuild && resolvedGuild) {
-          cacheGuildChannel(resolvedGuild.channels.cache, channel);
-        }
-      }
+    const { channel, relations } = constructChannel(client, data, guild, {
+      allowUnknownGuild
+    });
+    if (!channel) {
+      return channel;
+    }
+    if (!allowUnknownGuild && relations.guild) {
+      relations.guild.channels.cache.set(channel.id, channel);
+    }
+    if (!allowUnknownGuild && relations.threadParent) {
+      const parent = relations.threadParent;
+      parent.threads?.cache?.set(channel.id, channel);
     }
     return channel;
   }
@@ -11906,7 +11911,7 @@ var { Channel: Channel3 } = Channel_default;
 var { RangeError: RangeError7 } = errors_default;
 var { resolveAutoArchiveMaxLimit } = Util_default;
 
-class ThreadChannel2 extends Channel3 {
+class ThreadChannel extends Channel3 {
   constructor(guild, data, client) {
     super(guild?.client ?? client, data, false);
     this.guild = guild;
@@ -12040,7 +12045,7 @@ class ThreadChannel2 extends Channel3 {
       reason
     });
     const { updated } = this.client.actions.ChannelUpdate.handle(newData);
-    return updated instanceof ThreadChannel2 ? updated : this;
+    return updated instanceof ThreadChannel ? updated : this;
   }
   setArchived(archived = true, reason) {
     return this.edit({ archived }, reason);
@@ -12132,18 +12137,18 @@ class ThreadChannel2 extends Channel3 {
   createMessageCollector() {}
   awaitMessages() {}
 }
-TextBasedChannel_default.applyToClass(ThreadChannel2, true, [
+TextBasedChannel_default.applyToClass(ThreadChannel, true, [
   "fetchWebhooks",
   "setRateLimitPerUser",
   "setNSFW"
 ]);
-var ThreadChannel_default = ThreadChannel2;
+var ThreadChannel_default = ThreadChannel;
 
 // src/managers/GuildChannelManager.ts
 var { Error: Error22, TypeError: TypeError20 } = errors_default;
 var {
   ThreadChannelTypes: ThreadChannelTypes3,
-  ChannelTypes: ChannelTypes4,
+  ChannelTypes: ChannelTypes5,
   VideoQualityModes,
   SortOrderTypes,
   ForumLayoutTypes
@@ -12220,14 +12225,14 @@ class GuildChannelManager extends CachedManager_default {
     if (typeof type === "number") {
       intType = type;
     } else if (type) {
-      intType = resolveEnumValue(ChannelTypes4, type) ?? ChannelTypes4.GUILD_TEXT;
+      intType = resolveEnumValue(ChannelTypes5, type) ?? ChannelTypes5.GUILD_TEXT;
     } else {
-      intType = ChannelTypes4.GUILD_TEXT;
+      intType = ChannelTypes5.GUILD_TEXT;
     }
     const videoMode = resolveEnumValue(VideoQualityModes, videoQualityMode);
     const sortMode = resolveEnumValue(SortOrderTypes, defaultSortOrder);
     const layoutMode = resolveEnumValue(ForumLayoutTypes, defaultForumLayout);
-    if (intType === ChannelTypes4.GUILD_STORE && !storeChannelDeprecationEmitted) {
+    if (intType === ChannelTypes5.GUILD_STORE && !storeChannelDeprecationEmitted) {
       storeChannelDeprecationEmitted = true;
       process15.emitWarning("Creating store channels is deprecated by Discord and will stop working in March 2022. Check the docs for more info.", "DeprecationWarning");
     }
@@ -16472,7 +16477,7 @@ import { Collection as Collection37 } from "@discordjs/collection";
 var { Channel: Channel5 } = Channel_default;
 var { Opcodes: Opcodes2, Status: Status2 } = Constants_default;
 
-class DMChannel2 extends Channel5 {
+class DMChannel extends Channel5 {
   constructor(client, data) {
     super(client, data);
     this.type = "DM";
@@ -16581,13 +16586,13 @@ class DMChannel2 extends Channel5 {
   createMessageCollector() {}
   awaitMessages() {}
 }
-TextBasedChannel_default.applyToClass(DMChannel2, true, [
+TextBasedChannel_default.applyToClass(DMChannel, true, [
   "fetchWebhooks",
   "createWebhook",
   "setRateLimitPerUser",
   "setNSFW"
 ]);
-var DMChannel_default = DMChannel2;
+var DMChannel_default = DMChannel;
 
 // src/client/actions/ChannelDelete.ts
 var { deletedChannels: deletedChannels2 } = Channel_default;
@@ -16619,7 +16624,7 @@ var ChannelDelete_default = ChannelDeleteAction;
 
 // src/client/actions/ChannelUpdate.ts
 var { Channel: Channel6 } = Channel_default;
-var { ChannelTypes: ChannelTypes5 } = Constants_default;
+var { ChannelTypes: ChannelTypes6 } = Constants_default;
 
 class ChannelUpdateAction extends Action_default {
   handle(data) {
@@ -16627,7 +16632,7 @@ class ChannelUpdateAction extends Action_default {
     let channel = client.channels.cache.get(data.id);
     if (channel) {
       const old = channel._update(data);
-      if (resolveEnumValue(ChannelTypes5, channel.type) !== data.type) {
+      if (resolveEnumValue(ChannelTypes6, channel.type) !== data.type) {
         const guild = isGuildBasedChannel(channel) ? channel.guild : undefined;
         const newChannel = Channel6.create(this.client, data, guild);
         if (!newChannel) {
@@ -21215,7 +21220,6 @@ var ClientVoiceManager_default = ClientVoiceManager;
 
 // src/client/websocket/WebSocketManager.ts
 import EventEmitter12 from "events";
-import { setImmediate as setImmediate2 } from "timers";
 import { Collection as Collection46 } from "@discordjs/collection";
 import { RPCErrorCodes } from "discord-api-types/v10";
 
@@ -21796,6 +21800,9 @@ Emitting close and reconnecting again.`);
 }
 var WebSocketShard_default = WebSocketShard;
 
+// src/client/websocket/GatewayDispatch.ts
+import { setImmediate as setImmediate2 } from "timers";
+
 // src/client/websocket/handlers/USER_REQUIRED_ACTION_UPDATE.ts
 async function acceptAgreements(client) {
   try {
@@ -23236,7 +23243,7 @@ var MessageButton_default = MessageButton;
 
 // src/structures/MessageSelectMenu.ts
 import { ChannelType, ComponentType as ComponentType2 } from "discord-api-types/v10";
-var { ChannelTypes: ChannelTypes6 } = Constants_default;
+var { ChannelTypes: ChannelTypes7 } = Constants_default;
 var SELECT_MENU_TYPES = {
   CHANNEL_SELECT: ComponentType2.ChannelSelect,
   MENTIONABLE_SELECT: ComponentType2.MentionableSelect,
@@ -23251,14 +23258,14 @@ function resolveChannelType(value) {
   if (typeof value === "number") {
     return isChannelType(value) ? value : undefined;
   }
-  const resolved = resolveEnumValue(ChannelTypes6, value);
+  const resolved = resolveEnumValue(ChannelTypes7, value);
   return typeof resolved === "number" && isChannelType(resolved) ? resolved : undefined;
 }
 function isPublicChannelType(value) {
   return typeof value === "number" && value in ChannelType;
 }
 function resolvePublicChannelType(value) {
-  const resolved = resolveEnumValue(ChannelTypes6, value);
+  const resolved = resolveEnumValue(ChannelTypes7, value);
   return isPublicChannelType(resolved) ? resolved : undefined;
 }
 function serializeSelectOption(option) {
@@ -24278,10 +24285,9 @@ var handlers = Object.fromEntries([
 ]);
 var handlers_default = handlers;
 
-// src/client/websocket/WebSocketManager.ts
-var { Error: Error39 } = errors_default;
-var { Events: Events90, ShardEvents: ShardEvents2, Status: Status10, WSCodes: WSCodes2, WSEvents: WSEvents2 } = Constants_default;
-var BeforeReadyWhitelist = [
+// src/client/websocket/GatewayDispatch.ts
+var { Events: Events90, Status: Status10, WSEvents: WSEvents2 } = Constants_default;
+var BEFORE_READY_WHITELIST = new Set([
   WSEvents2.READY,
   WSEvents2.RESUMED,
   WSEvents2.GUILD_CREATE,
@@ -24289,7 +24295,135 @@ var BeforeReadyWhitelist = [
   WSEvents2.GUILD_MEMBERS_CHUNK,
   WSEvents2.GUILD_MEMBER_ADD,
   WSEvents2.GUILD_MEMBER_REMOVE
+]);
+var ACTION_EVENT_TYPES = [
+  "APPLICATION_COMMAND_PERMISSIONS_UPDATE",
+  "AUTO_MODERATION_ACTION_EXECUTION",
+  "AUTO_MODERATION_RULE_CREATE",
+  "AUTO_MODERATION_RULE_DELETE",
+  "AUTO_MODERATION_RULE_UPDATE",
+  "CHANNEL_CREATE",
+  "CHANNEL_DELETE",
+  "CHANNEL_UPDATE",
+  "GUILD_AUDIT_LOG_ENTRY_CREATE",
+  "GUILD_BAN_ADD",
+  "GUILD_BAN_REMOVE",
+  "GUILD_CHANNELS_POSITION_UPDATE",
+  "GUILD_DELETE",
+  "GUILD_EMOJI_CREATE",
+  "GUILD_EMOJI_DELETE",
+  "GUILD_EMOJI_UPDATE",
+  "GUILD_EMOJIS_UPDATE",
+  "GUILD_INTEGRATIONS_UPDATE",
+  "GUILD_MEMBER_REMOVE",
+  "GUILD_MEMBER_UPDATE",
+  "GUILD_ROLE_CREATE",
+  "GUILD_ROLE_DELETE",
+  "GUILD_ROLE_UPDATE",
+  "GUILD_ROLES_POSITION_UPDATE",
+  "GUILD_SCHEDULED_EVENT_CREATE",
+  "GUILD_SCHEDULED_EVENT_DELETE",
+  "GUILD_SCHEDULED_EVENT_UPDATE",
+  "GUILD_SCHEDULED_EVENT_USER_ADD",
+  "GUILD_SCHEDULED_EVENT_USER_REMOVE",
+  "GUILD_STICKER_CREATE",
+  "GUILD_STICKER_DELETE",
+  "GUILD_STICKER_UPDATE",
+  "GUILD_STICKERS_UPDATE",
+  "GUILD_UPDATE",
+  "INVITE_CREATE",
+  "INVITE_DELETE",
+  "MESSAGE_CREATE",
+  "MESSAGE_DELETE",
+  "MESSAGE_DELETE_BULK",
+  "MESSAGE_POLL_VOTE_ADD",
+  "MESSAGE_POLL_VOTE_REMOVE",
+  "MESSAGE_REACTION_ADD",
+  "MESSAGE_REACTION_REMOVE",
+  "MESSAGE_REACTION_REMOVE_ALL",
+  "MESSAGE_REACTION_REMOVE_EMOJI",
+  "MESSAGE_UPDATE",
+  "PRESENCE_UPDATE",
+  "STAGE_INSTANCE_CREATE",
+  "STAGE_INSTANCE_DELETE",
+  "STAGE_INSTANCE_UPDATE",
+  "THREAD_CREATE",
+  "THREAD_DELETE",
+  "THREAD_LIST_SYNC",
+  "THREAD_MEMBER_UPDATE",
+  "THREAD_MEMBERS_UPDATE",
+  "TYPING_START",
+  "USER_UPDATE",
+  "VOICE_STATE_UPDATE",
+  "WEBHOOKS_UPDATE"
 ];
+function toActionPropertyName(eventType) {
+  return eventType.split("_").map((part) => part.charAt(0) + part.slice(1).toLowerCase()).join("");
+}
+function isActionLike(value) {
+  return typeof value === "object" && value !== null && "handle" in value && typeof value.handle === "function";
+}
+
+class GatewayDispatch {
+  client;
+  packetQueue = [];
+  registry = new Map;
+  constructor(client) {
+    this.client = client;
+  }
+  registerDefaults(actions) {
+    const handlers = handlers_default;
+    for (const [eventType, handler] of Object.entries(handlers)) {
+      if (typeof handler === "function") {
+        this.registry.set(eventType, handler);
+      }
+    }
+    for (const eventType of ACTION_EVENT_TYPES) {
+      if (this.registry.has(eventType)) {
+        continue;
+      }
+      const actionName = toActionPropertyName(eventType);
+      const action = Reflect.get(actions, actionName);
+      if (!isActionLike(action)) {
+        continue;
+      }
+      this.registry.set(eventType, (_client, packet, shard) => action.handle(packet.d, shard));
+    }
+  }
+  handle(packet, shard) {
+    const manager = this.client.ws;
+    if (packet && manager.status !== Status10.READY && !BEFORE_READY_WHITELIST.has(packet.t ?? "")) {
+      this.packetQueue.push({ packet, shard });
+      return false;
+    }
+    if (this.packetQueue.length) {
+      const item = this.packetQueue.shift();
+      if (item) {
+        setImmediate2(() => {
+          this.handle(item.packet, item.shard);
+        }).unref();
+      }
+    }
+    if (!packet) {
+      return true;
+    }
+    const eventType = packet.t;
+    if (eventType) {
+      const handler = this.registry.get(eventType);
+      if (handler) {
+        handler(this.client, packet, shard);
+        return true;
+      }
+    }
+    this.client.emit(Events90.UNHANDLED_PACKET, packet, shard);
+    return true;
+  }
+}
+var GatewayDispatch_default = GatewayDispatch;
+
+// src/client/websocket/WebSocketManager.ts
+var { Error: Error39 } = errors_default;
+var { Events: Events91, ShardEvents: ShardEvents2, Status: Status11, WSCodes: WSCodes2 } = Constants_default;
 function isRecord26(value) {
   return typeof value === "object" && value !== null;
 }
@@ -24311,8 +24445,8 @@ class WebSocketManager extends EventEmitter12 {
       value: new Set,
       writable: true
     });
-    Object.defineProperty(this, "packetQueue", { value: [] });
-    this.status = Status10.IDLE;
+    this.dispatch = new GatewayDispatch_default(client);
+    this.status = Status11.IDLE;
     this.destroyed = false;
     this.reconnecting = false;
   }
@@ -24321,7 +24455,7 @@ class WebSocketManager extends EventEmitter12 {
     return sum / this.shards.size;
   }
   debug(message, shard) {
-    this.client.emit(Events90.DEBUG, `[WS => ${shard ? `Shard ${shard.id}` : "Manager"}] ${message}`);
+    this.client.emit(Events91.DEBUG, `[WS => ${shard ? `Shard ${shard.id}` : "Manager"}] ${message}`);
   }
   async connect() {
     let gatewayURL = "wss://gateway.discord.gg";
@@ -24361,7 +24495,7 @@ class WebSocketManager extends EventEmitter12 {
     this.shardQueue.delete(shard);
     if (!shard.eventsAttached) {
       shard.on(ShardEvents2.ALL_READY, (unavailableGuilds) => {
-        this.client.emit(Events90.SHARD_READY, shard.id, unavailableGuilds);
+        this.client.emit(Events91.SHARD_READY, shard.id, unavailableGuilds);
         if (!this.shardQueue.size) {
           this.reconnecting = false;
         }
@@ -24369,7 +24503,7 @@ class WebSocketManager extends EventEmitter12 {
       });
       shard.on(ShardEvents2.CLOSE, (event) => {
         if (event.code === 1000 ? this.destroyed : event.code !== undefined && UNRECOVERABLE_CLOSE_CODES.includes(event.code)) {
-          this.client.emit(Events90.SHARD_DISCONNECT, event, shard.id);
+          this.client.emit(Events91.SHARD_DISCONNECT, event, shard.id);
           if (event.code !== undefined) {
             this.debug(WSCodes2[event.code], shard);
           }
@@ -24378,7 +24512,7 @@ class WebSocketManager extends EventEmitter12 {
         if (event.code !== undefined && UNRESUMABLE_CLOSE_CODES.includes(event.code)) {
           shard.sessionId = null;
         }
-        this.client.emit(Events90.SHARD_RECONNECTING, shard.id);
+        this.client.emit(Events91.SHARD_RECONNECTING, shard.id);
         this.shardQueue.add(shard);
         if (shard.sessionId) {
           this.debug(`Session id is present, attempting an immediate reconnect...`, shard);
@@ -24386,11 +24520,11 @@ class WebSocketManager extends EventEmitter12 {
         this.reconnect();
       });
       shard.on(ShardEvents2.INVALID_SESSION, () => {
-        this.client.emit(Events90.SHARD_RECONNECTING, shard.id);
+        this.client.emit(Events91.SHARD_RECONNECTING, shard.id);
       });
       shard.on(ShardEvents2.DESTROYED, () => {
         this.debug("Shard was destroyed but no WebSocket connection was present! Reconnecting...", shard);
-        this.client.emit(Events90.SHARD_RECONNECTING, shard.id);
+        this.client.emit(Events91.SHARD_RECONNECTING, shard.id);
         this.shardQueue.add(shard);
         this.reconnect();
       });
@@ -24418,7 +24552,7 @@ class WebSocketManager extends EventEmitter12 {
     return true;
   }
   async reconnect() {
-    if (this.reconnecting || this.status !== Status10.READY) {
+    if (this.reconnecting || this.status !== Status11.READY) {
       return false;
     }
     this.reconnecting = true;
@@ -24433,8 +24567,8 @@ class WebSocketManager extends EventEmitter12 {
         this.reconnecting = false;
         return this.reconnect();
       }
-      if (this.client.listenerCount(Events90.INVALIDATED)) {
-        this.client.emit(Events90.INVALIDATED);
+      if (this.client.listenerCount(Events91.INVALIDATED)) {
+        this.client.emit(Events91.INVALIDATED);
         this.destroy();
       } else {
         this.client.destroy();
@@ -24462,44 +24596,21 @@ ${new Error39("MANAGER_DESTROYED").stack}`);
     }
   }
   handlePacket(packet, shard) {
-    if (packet && this.status !== Status10.READY && !BeforeReadyWhitelist.includes(packet.t ?? "")) {
-      this.packetQueue.push({ packet, shard });
-      return false;
-    }
-    if (this.packetQueue.length) {
-      const item = this.packetQueue.shift();
-      if (item) {
-        setImmediate2(() => {
-          this.handlePacket(item.packet, item.shard);
-        }).unref();
-      }
-    }
-    if (packet?.t && handlers_default[packet.t]) {
-      handlers_default[packet.t](this.client, packet, shard);
-    } else if (packet) {
-      const actionName = String(packet.t || "").split("_").map((part) => part.charAt(0) + part.slice(1).toLowerCase()).join("");
-      const action = Reflect.get(this.client.actions, actionName);
-      if (action && typeof action === "object" && "handle" in action && typeof action.handle === "function") {
-        Reflect.apply(action.handle, action, [packet.d, shard]);
-        return true;
-      }
-      this.client.emit(Events90.UNHANDLED_PACKET, packet, shard);
-    }
-    return true;
+    return this.dispatch.handle(packet, shard);
   }
   checkShardsReady() {
-    if (this.status === Status10.READY) {
+    if (this.status === Status11.READY) {
       return;
     }
-    if (this.shards.size !== this.totalShards || this.shards.some((s) => s.status !== Status10.READY)) {
+    if (this.shards.size !== this.totalShards || this.shards.some((s) => s.status !== Status11.READY)) {
       return;
     }
     this.triggerClientReady();
   }
   triggerClientReady() {
-    this.status = Status10.READY;
+    this.status = Status11.READY;
     this.client.readyAt = new Date;
-    this.client.emit(Events90.CLIENT_READY, this.client);
+    this.client.emit(Events91.CLIENT_READY, this.client);
     this.handlePacket();
   }
 }
@@ -24610,7 +24721,7 @@ var BillingManager_default = BillingManager;
 // src/managers/ChannelManager.ts
 import process21 from "process";
 var { Channel: Channel8 } = Channel_default;
-var { Events: Events91, RelationshipTypes: RelationshipTypes2 } = Constants_default;
+var { Events: Events92, RelationshipTypes: RelationshipTypes2 } = Constants_default;
 var cacheWarningEmitted4 = false;
 
 class ChannelManager extends CachedManager_default {
@@ -24649,7 +24760,7 @@ class ChannelManager extends CachedManager_default {
     }
     const channel = data instanceof Channel8 ? data : Channel8.create(this.client, data, guild, { allowUnknownGuild });
     if (!channel) {
-      this.client.emit(Events91.DEBUG, `Failed to find guild, or unknown type for channel ${data.id} ${data.type}`);
+      this.client.emit(Events92.DEBUG, `Failed to find guild, or unknown type for channel ${data.id} ${data.type}`);
       return null;
     }
     if (cache && !allowUnknownGuild) {
@@ -24936,8 +25047,8 @@ var { Guild: Guild2 } = Guild_default;
 var { GuildMember: GuildMember6 } = GuildMember_default;
 var { Role: Role7 } = Role_default;
 var {
-  ChannelTypes: ChannelTypes7,
-  Events: Events92,
+  ChannelTypes: ChannelTypes8,
+  Events: Events93,
   OverwriteTypes: OverwriteTypes4,
   VerificationLevels: VerificationLevels3,
   DefaultMessageNotificationLevels: DefaultMessageNotificationLevels2,
@@ -24996,7 +25107,7 @@ class GuildManager extends CachedManager_default {
     const resolvedDefaultMessageNotifications = typeof defaultMessageNotifications === "string" ? DefaultMessageNotificationLevels2[defaultMessageNotifications] : defaultMessageNotifications;
     const resolvedExplicitContentFilter = typeof explicitContentFilter === "string" ? ExplicitContentFilterLevels2[explicitContentFilter] : explicitContentFilter;
     for (const channel of channels) {
-      channel.type &&= resolveEnumValue(ChannelTypes7, channel.type);
+      channel.type &&= resolveEnumValue(ChannelTypes8, channel.type);
       channel.parent_id = channel.parentId;
       delete channel.parentId;
       channel.user_limit = channel.userLimit;
@@ -25052,15 +25163,15 @@ class GuildManager extends CachedManager_default {
         if (timeoutState.timer) {
           clearTimeout(timeoutState.timer);
         }
-        this.client.removeListener(Events92.GUILD_CREATE, handleGuild);
+        this.client.removeListener(Events93.GUILD_CREATE, handleGuild);
         this.client.decrementMaxListeners();
         resolve(guild);
       }
     };
     this.client.incrementMaxListeners();
-    this.client.on(Events92.GUILD_CREATE, handleGuild);
+    this.client.on(Events93.GUILD_CREATE, handleGuild);
     timeoutState.timer = setTimeout14(() => {
-      this.client.removeListener(Events92.GUILD_CREATE, handleGuild);
+      this.client.removeListener(Events93.GUILD_CREATE, handleGuild);
       this.client.decrementMaxListeners();
       resolve(this.client.guilds._add(data));
     }, 1e4).unref();
@@ -25620,7 +25731,7 @@ import { parentPort } from "worker_threads";
 import process23 from "process";
 import { promisify } from "util";
 var { Error: Error41 } = errors_default;
-var { Events: Events93 } = Constants_default;
+var { Events: Events94 } = Constants_default;
 function readProperty(value, key) {
   if (typeof value !== "object" || value === null) {
     return;
@@ -25805,12 +25916,12 @@ class ShardClientUtil {
       const reason = error instanceof Error41 ? error : new Error41(String(error));
       const wrapped = new Error41(`Error when sending ${type} response to master process: ${reason.message}`);
       wrapped.stack = reason.stack;
-      this.client.emit(Events93.ERROR, wrapped);
+      this.client.emit(Events94.ERROR, wrapped);
     }
   }
   static singleton(client, mode) {
     if (this._singleton) {
-      client.emit(Events93.WARN, "Multiple clients created in child process/worker; only the first will handle sharding helpers.");
+      client.emit(Events94.WARN, "Multiple clients created in child process/worker; only the first will handle sharding helpers.");
     } else {
       this._singleton = new this(client, mode);
     }
@@ -26313,7 +26424,7 @@ var RemoteAuth_default = DiscordAuthWebsocket;
 // src/client/Client.ts
 var { Error: Error42, TypeError: TypeError36 } = errors_default;
 var { Sticker: Sticker7 } = Sticker_default;
-var { Events: Events94, Status: Status11 } = Constants_default;
+var { Events: Events95, Status: Status12 } = Constants_default;
 var deprecationEmitted2 = false;
 function validateBasicOptions(options) {
   if (typeof options.makeCache !== "function") {
@@ -26398,6 +26509,7 @@ class Client extends BaseClient_default {
     this._finalizers = new FinalizationRegistry(this._finalize.bind(this));
     this.ws = new WebSocketManager_default(this);
     this.actions = new ActionsManager_default(this);
+    this.ws.dispatch.registerDefaults(this.actions);
     this.voice = new ClientVoiceManager_default(this);
     this.voiceStates = new VoiceStateManager_default({ client: this });
     const shardingMode = process24.env.SHARDING_MANAGER_MODE;
@@ -26456,16 +26568,16 @@ class Client extends BaseClient_default {
     }
     const normalizedToken = token.replace(/^(?:Bot|Bearer)\s*/iu, "");
     this.token = normalizedToken;
-    this.emit(Events94.DEBUG, `
+    this.emit(Events95.DEBUG, `
       Logging on with a user token is unfortunately against the Discord
       \`Terms of Service\` <https://support.discord.com/hc/en-us/articles/115002192352>
       and doing so might potentially get your account banned.
       Use this at your own risk.`);
-    this.emit(Events94.DEBUG, `Provided token: ${normalizedToken.split(".").map((value, index) => index > 1 ? value.replaceAll(/./gu, "*") : value).join(".")}`);
+    this.emit(Events95.DEBUG, `Provided token: ${normalizedToken.split(".").map((value, index) => index > 1 ? value.replaceAll(/./gu, "*") : value).join(".")}`);
     if (this.options.presence) {
       this.options.ws.presence = this.presence._parse(this.options.presence);
     }
-    this.emit(Events94.DEBUG, "Preparing to connect to the gateway...");
+    this.emit(Events95.DEBUG, "Preparing to connect to the gateway...");
     try {
       await this.ws.connect();
       return normalizedToken;
@@ -26515,7 +26627,7 @@ class Client extends BaseClient_default {
     return null;
   }
   isReady() {
-    return !this.ws.destroyed && this.ws.status === Status11.READY;
+    return !this.ws.destroyed && this.ws.status === Status12.READY;
   }
   destroy() {
     super.destroy();
@@ -26607,10 +26719,10 @@ class Client extends BaseClient_default {
       cleanup();
       this._cleanups.delete(cleanup);
       if (message) {
-        this.emit(Events94.DEBUG, message);
+        this.emit(Events95.DEBUG, message);
       }
     } catch {
-      this.emit(Events94.DEBUG, `Garbage collection failed on ${name ?? "an unknown item"}.`);
+      this.emit(Events95.DEBUG, `Garbage collection failed on ${name ?? "an unknown item"}.`);
     }
   }
   sweepMessages(lifetime = this.options.messageCacheLifetime) {
@@ -26618,7 +26730,7 @@ class Client extends BaseClient_default {
       throw new TypeError36("INVALID_TYPE", "lifetime", "number");
     }
     if (lifetime <= 0) {
-      this.emit(Events94.DEBUG, "Didn't sweep messages - lifetime is unlimited");
+      this.emit(Events95.DEBUG, "Didn't sweep messages - lifetime is unlimited");
       return -1;
     }
     const filter = Sweepers_default.outdatedMessageSweepFilter(lifetime)();
@@ -26626,7 +26738,7 @@ class Client extends BaseClient_default {
       return -1;
     }
     const messages = this.sweepers.sweepMessages(filter);
-    this.emit(Events94.DEBUG, `Swept ${messages} messages older than ${lifetime} seconds`);
+    this.emit(Events95.DEBUG, `Swept ${messages} messages older than ${lifetime} seconds`);
     return messages;
   }
   async fetchGuildPreview(guild) {
@@ -26729,14 +26841,14 @@ class Client extends BaseClient_default {
         session_id: this.sessionId
       }
     });
-    this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Joined`);
+    this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Joined`);
     if (!guildId) {
       const channelId = inviteInfo.channelId || data.channel?.id;
       return channelId ? this.channels.cache.has(channelId) : false;
     }
     const guild = this.guilds.cache.get(guildId);
     if (inviteInfo.flags.has("GUEST")) {
-      this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Guest invite`);
+      this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Guest invite`);
       return guild;
     }
     if (resolvedOptions.bypassOnboarding) {
@@ -26776,15 +26888,15 @@ class Client extends BaseClient_default {
         onboarding_responses_seen
       }
     });
-    this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Bypassed onboarding`);
+    this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Bypassed onboarding`);
   }
   async bypassVerification(guildId, verificationLevel) {
     if (verificationLevel === "VERY_HIGH" && !this.user?.phone) {
-      this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Cannot bypass verify (Phone required)`);
+      this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Cannot bypass verify (Phone required)`);
       return;
     }
     if (verificationLevel !== "NONE" && !this.user?.email) {
-      this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Cannot bypass verify (Email required)`);
+      this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Cannot bypass verify (Email required)`);
       return;
     }
     let getForm;
@@ -26800,7 +26912,7 @@ class Client extends BaseClient_default {
       await this.api.guilds(guildId).requests["@me"].put({
         data: { form_fields: [form], version: getForm.version }
       });
-      this.emit(Events94.DEBUG, `[Invite > Guild ${guildId}] Bypassed verify`);
+      this.emit(Events95.DEBUG, `[Invite > Guild ${guildId}] Bypassed verify`);
     }
   }
   redeemNitro(nitro, channel, paymentSourceId) {
@@ -27577,7 +27689,7 @@ class OAuth2RoleConnection {
   }
 }
 // src/util/Events.ts
-var Events95 = {
+var Events96 = {
   API_REQUEST: "apiRequest",
   API_RESPONSE: "apiResponse",
   APPLICATION_COMMAND_CREATE: "applicationCommandCreate",
@@ -27765,7 +27877,7 @@ var Events95 = {
   Warn: "warn",
   WebhooksUpdate: "webhooksUpdate"
 };
-var Events_default = Events95;
+var Events_default = Events96;
 // src/util/Formatters.ts
 import {
   blockQuote,
@@ -27827,7 +27939,7 @@ var Partials;
 })(Partials ||= {});
 var Partials_default = Partials;
 // src/util/Status.ts
-var Status12;
+var Status13;
 ((Status) => {
   Status[Status["Ready"] = 0] = "Ready";
   Status[Status["Connecting"] = 1] = "Connecting";
@@ -27838,8 +27950,8 @@ var Status12;
   Status[Status["WaitingForGuilds"] = 6] = "WaitingForGuilds";
   Status[Status["Identifying"] = 7] = "Identifying";
   Status[Status["Resuming"] = 8] = "Resuming";
-})(Status12 ||= {});
-var Status_default = Status12;
+})(Status13 ||= {});
+var Status_default = Status13;
 // src/managers/ThreadManager.ts
 import { Collection as Collection56 } from "@discordjs/collection";
 class ThreadManager extends CachedManager_default {
@@ -27926,7 +28038,7 @@ var ThreadManager_default = ThreadManager;
 
 // src/managers/GuildForumThreadManager.ts
 var { TypeError: TypeError38 } = errors_default;
-var { resolveAutoArchiveMaxLimit: resolveAutoArchiveMaxLimit3, getUploadURL, uploadFile } = Util_default;
+var { resolveAutoArchiveMaxLimit: resolveAutoArchiveMaxLimit3 } = Util_default;
 
 class GuildForumThreadManager extends ThreadManager_default {
   async create({
@@ -27942,26 +28054,7 @@ class GuildForumThreadManager extends ThreadManager_default {
     }
     const messagePayload = message instanceof MessagePayload_default ? message.resolveData() : MessagePayload_default.create(this, message).resolveData();
     const { data: body, files } = await messagePayload.resolveFiles();
-    const fileList = files ?? [];
-    const attachments = await getUploadURL(this.client, this.channel.id, fileList);
-    const requestPromises = attachments.map(async (attachment) => {
-      const index = Number(attachment.id);
-      const file = fileList[index];
-      if (!file) {
-        throw new TypeError38("GUILD_FORUM_ATTACHMENT_MISSING");
-      }
-      await uploadFile(file.file, attachment.upload_url);
-      return {
-        description: file.description,
-        duration_secs: file.duration_secs,
-        filename: file.name,
-        id: attachment.id,
-        uploaded_filename: attachment.upload_filename,
-        waveform: file.waveform
-      };
-    });
-    const attachmentsData = await Promise.all(requestPromises);
-    attachmentsData.sort((left, right) => Math.trunc(Number(left.id)) - Math.trunc(Number(right.id)));
+    const attachmentsData = await uploadMessageAttachments(this.client, this.channel.id, files ?? []);
     let archiveDuration = autoArchiveDuration;
     if (autoArchiveDuration === "MAX") {
       resolveAutoArchiveMaxLimit3(this.channel.guild);
@@ -27985,7 +28078,7 @@ class GuildForumThreadManager extends ThreadManager_default {
 var GuildForumThreadManager_default = GuildForumThreadManager;
 // src/managers/GuildTextThreadManager.ts
 var { TypeError: TypeError39 } = errors_default;
-var { ChannelTypes: ChannelTypes8 } = Constants_default;
+var { ChannelTypes: ChannelTypes9 } = Constants_default;
 var { resolveAutoArchiveMaxLimit: resolveAutoArchiveMaxLimit4 } = Util_default;
 
 class GuildTextThreadManager extends ThreadManager_default {
@@ -28002,7 +28095,7 @@ class GuildTextThreadManager extends ThreadManager_default {
     if (type && typeof type !== "string" && typeof type !== "number") {
       throw new TypeError39("INVALID_TYPE", "type", "ThreadChannelType or Number");
     }
-    let resolvedType = this.channel.type === "GUILD_NEWS" ? ChannelTypes8.GUILD_NEWS_THREAD : ChannelTypes8.GUILD_PUBLIC_THREAD;
+    let resolvedType = this.channel.type === "GUILD_NEWS" ? ChannelTypes9.GUILD_NEWS_THREAD : ChannelTypes9.GUILD_PUBLIC_THREAD;
     if (startMessage) {
       const { messages } = this.channel;
       const startMessageId = messages?.resolveId(startMessage);
@@ -28012,7 +28105,7 @@ class GuildTextThreadManager extends ThreadManager_default {
       path = path.messages(startMessageId);
     } else if (this.channel.type !== "GUILD_NEWS") {
       if (typeof type === "string") {
-        resolvedType = resolveEnumValue(ChannelTypes8, type);
+        resolvedType = resolveEnumValue(ChannelTypes9, type);
       } else if (typeof type === "number") {
         resolvedType = type;
       }
@@ -28021,7 +28114,7 @@ class GuildTextThreadManager extends ThreadManager_default {
     const data = await path.threads.post({
       data: {
         auto_archive_duration: resolvedAutoArchiveDuration,
-        invitable: resolvedType === ChannelTypes8.GUILD_PRIVATE_THREAD ? invitable : undefined,
+        invitable: resolvedType === ChannelTypes9.GUILD_PRIVATE_THREAD ? invitable : undefined,
         name,
         rate_limit_per_user: rateLimitPerUser,
         type: resolvedType
@@ -28101,7 +28194,7 @@ class BaseGuildTextChannel extends GuildChannel_default {
 TextBasedChannel_default.applyToClass(BaseGuildTextChannel, true);
 var BaseGuildTextChannel_default = BaseGuildTextChannel;
 // src/structures/CategoryChannel.ts
-class CategoryChannel2 extends GuildChannel_default {
+class CategoryChannel extends GuildChannel_default {
   get children() {
     return this.guild.channels.cache.filter((channel) => channel.parentId === this.id);
   }
@@ -28112,7 +28205,7 @@ class CategoryChannel2 extends GuildChannel_default {
     });
   }
 }
-var CategoryChannel_default = CategoryChannel2;
+var CategoryChannel_default = CategoryChannel;
 // src/structures/ContainerComponent.ts
 import { ComponentType as ComponentType6 } from "discord-api-types/v10";
 function isContainerChild(component) {
@@ -28147,7 +28240,7 @@ var ContainerComponent_default = ContainerComponent;
 // src/structures/DirectoryChannel.ts
 var { Channel: Channel9 } = Channel_default;
 
-class DirectoryChannel2 extends Channel9 {
+class DirectoryChannel extends Channel9 {
   _patch(data) {
     super._patch(data);
     if (typeof data.name === "string") {
@@ -28155,7 +28248,7 @@ class DirectoryChannel2 extends Channel9 {
     }
   }
 }
-var DirectoryChannel_default = DirectoryChannel2;
+var DirectoryChannel_default = DirectoryChannel;
 // src/structures/UnfurledMediaItem.ts
 function isRecord27(value) {
   return typeof value === "object" && value !== null;
@@ -28266,7 +28359,7 @@ var ThreadOnlyChannel_default = ThreadOnlyChannel;
 // src/structures/ForumChannel.ts
 var { ForumLayoutTypes: ForumLayoutTypes2 } = Constants_default;
 
-class ForumChannel2 extends ThreadOnlyChannel_default {
+class ForumChannel extends ThreadOnlyChannel_default {
   _patch(data) {
     super._patch(data);
     this.defaultForumLayout = resolveEnumMember(ForumLayoutTypes2, data.default_forum_layout ?? 0) ?? ForumLayoutTypes2.NOT_SET;
@@ -28275,11 +28368,11 @@ class ForumChannel2 extends ThreadOnlyChannel_default {
     return this.edit({ defaultForumLayout }, reason);
   }
 }
-var ForumChannel_default = ForumChannel2;
+var ForumChannel_default = ForumChannel;
 // src/structures/MediaChannel.ts
-class MediaChannel2 extends ThreadOnlyChannel_default {
+class MediaChannel extends ThreadOnlyChannel_default {
 }
-var MediaChannel_default = MediaChannel2;
+var MediaChannel_default = MediaChannel;
 // src/structures/MediaGalleryItem.ts
 class MediaGalleryItem {
   constructor(data = {}) {
@@ -28322,7 +28415,7 @@ var MediaGalleryComponent_default = MediaGalleryComponent;
 // src/structures/NewsChannel.ts
 var { Error: Error45 } = errors_default;
 
-class NewsChannel2 extends BaseGuildTextChannel_default {
+class NewsChannel extends BaseGuildTextChannel_default {
   async addFollower(channel, reason) {
     const channelId = this.guild.channels.resolveId(channel);
     if (!channelId) {
@@ -28332,7 +28425,7 @@ class NewsChannel2 extends BaseGuildTextChannel_default {
     return this;
   }
 }
-var NewsChannel_default = NewsChannel2;
+var NewsChannel_default = NewsChannel;
 // src/structures/TextDisplayComponent.ts
 import { ComponentType as ComponentType9 } from "discord-api-types/v10";
 
@@ -28433,7 +28526,7 @@ class SeparatorComponent extends BaseMessageComponent_default {
 }
 var SeparatorComponent_default = SeparatorComponent;
 // src/structures/StageChannel.ts
-class StageChannel2 extends BaseGuildVoiceChannel_default {
+class StageChannel extends BaseGuildVoiceChannel_default {
   _patch(data) {
     super._patch(data);
     if ("topic" in data) {
@@ -28450,9 +28543,9 @@ class StageChannel2 extends BaseGuildVoiceChannel_default {
     return this.edit({ topic }, reason);
   }
 }
-var StageChannel_default = StageChannel2;
+var StageChannel_default = StageChannel;
 // src/structures/StoreChannel.ts
-class StoreChannel2 extends GuildChannel_default {
+class StoreChannel extends GuildChannel_default {
   constructor(guild, data, client) {
     super(guild, data, client);
     this.nsfw = Boolean(data.nsfw);
@@ -28470,9 +28563,9 @@ class StoreChannel2 extends GuildChannel_default {
     return this.guild.invites.fetch({ cache, channelId: this.id });
   }
 }
-var StoreChannel_default = StoreChannel2;
+var StoreChannel_default = StoreChannel;
 // src/structures/TextChannel.ts
-class TextChannel2 extends BaseGuildTextChannel_default {
+class TextChannel extends BaseGuildTextChannel_default {
   _patch(data) {
     super._patch(data);
     if ("rate_limit_per_user" in data) {
@@ -28483,12 +28576,12 @@ class TextChannel2 extends BaseGuildTextChannel_default {
     return this.edit({ rateLimitPerUser }, reason);
   }
 }
-var TextChannel_default = TextChannel2;
+var TextChannel_default = TextChannel;
 // src/structures/VoiceChannel.ts
 import process27 from "process";
 var deprecationEmittedForEditable = false;
 
-class VoiceChannel2 extends BaseGuildVoiceChannel_default {
+class VoiceChannel extends BaseGuildVoiceChannel_default {
   get editable() {
     if (!deprecationEmittedForEditable) {
       process27.emitWarning("The VoiceChannel#editable getter is deprecated. Use VoiceChannel#manageable instead.", "DeprecationWarning");
@@ -28519,7 +28612,7 @@ class VoiceChannel2 extends BaseGuildVoiceChannel_default {
     return Boolean(me && me.communicationDisabledUntilTimestamp !== null && me.communicationDisabledUntilTimestamp < Date.now() && permissions.has(Permissions_default.FLAGS.SPEAK, false));
   }
 }
-var VoiceChannel_default = VoiceChannel2;
+var VoiceChannel_default = VoiceChannel;
 // src/structures/WebEmbed.ts
 var { RangeError: RangeError12 } = errors_default;
 var baseURL2 = "https://webembed-sb.onrender.com/embed?";