Merge branch 'main' into fix-fetch-members-imports

src/bot.ts

@@ -1,5 +1,6 @@
 import { getGatewayBot } from "./helpers/misc/get_gateway_bot.ts";
 import { DiscordGatewayIntents } from "./types/gateway/gateway_intents.ts";
+import { DiscordGetGatewayBot } from "./types/gateway/get_gateway_bot.ts";
 import { baseEndpoints, GATEWAY_VERSION } from "./util/constants.ts";
 import { spawnShards } from "./ws/shard_manager.ts";
 
@@ -14,7 +15,7 @@ export let botGatewayData: DiscordGetGatewayBot;
 export let proxyWSURL = `wss://gateway.discord.gg`;
 export let lastShardId = 0;
 
-export const identifyPayload: DiscordIdentify = {
+export const identifyPayload = {
   token: "",
   compress: true,
   properties: {

src/handlers/channels/CHANNEL_CREATE.ts

@@ -1,7 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordChannel, DiscordGatewayPayload } from "../../types/mod.ts";
+import { DiscordChannel } from "../../types/channels/channel.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleChannelCreate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordChannel;

src/handlers/channels/CHANNEL_DELETE.ts

@@ -1,10 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
-import {
+import { DiscordChannel } from "../../types/channels/channel.ts";
-  DiscordChannel,
+import { DiscordChannelTypes } from "../../types/channels/channel_types.ts";
-  DiscordChannelTypes,
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
-  DiscordGatewayPayload,
-} from "../../types/mod.ts";
 
 export async function handleChannelDelete(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordChannel;

src/handlers/channels/CHANNEL_PINS_UPDATE.ts

@@ -1,9 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
-import {
+import { DiscordChannelPinsUpdate } from "../../types/channels/channel_pins_update.ts";
-  DiscordChannelPinsUpdate,
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
-  DiscordGatewayPayload,
-} from "../../types/mod.ts";
 
 export async function handleChannelPinsUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordChannelPinsUpdate;

src/handlers/channels/CHANNEL_UPDATE.ts

@@ -1,7 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordChannel, DiscordGatewayPayload } from "../../types/mod.ts";
+import { DiscordChannel } from "../../types/channels/channel.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleChannelUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordChannel;

src/handlers/commands/APPLICATION_COMMAND_CREATE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleApplicationCommandCreate(
   data: DiscordGatewayPayload,

src/handlers/commands/APPLICATION_COMMAND_DELETE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleApplicationCommandDelete(data: DiscordGatewayPayload) {
   const {

src/handlers/commands/APPLICATION_COMMAND_UPDATE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleApplicationCommandUpdate(data: DiscordGatewayPayload) {
   const {

src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts

@@ -1,10 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
-import {
-  DiscordGatewayPayload,
-  DiscordGuildEmojisUpdate,
-} from "../../types/mod.ts";
 import { Collection } from "../../util/collection.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildEmojisUpdate } from "../../types/emojis/guild_emojis_update.ts";
 
 export async function handleGuildEmojisUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildEmojisUpdate;

src/handlers/guilds/GUILD_BAN_ADD.ts

@@ -1,5 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleGuildBanAdd(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildBanAddRemove;

src/handlers/guilds/GUILD_BAN_REMOVE.ts

@@ -1,5 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleGuildBanRemove(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildBanAddRemove;

src/handlers/guilds/GUILD_CREATE.ts

@@ -2,6 +2,8 @@ import { eventHandlers } from "../../bot.ts";
 import { cache, cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
 import { basicShards } from "../../ws/shard.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuild } from "../../types/guilds/guild.ts";
 
 export async function handleGuildCreate(
   data: DiscordGatewayPayload,
@@ -23,6 +25,8 @@ export async function handleGuildCreate(
     await cacheHandlers.delete("unavailableGuilds", payload.id);
 
     shard.unavailableGuildIds.delete(payload.id);
+
+    return eventHandlers.guildAvailable?.(guildStruct);
   }
 
   if (!cache.isReady) return eventHandlers.guildLoaded?.(guildStruct);

src/handlers/guilds/GUILD_DELETE.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { basicShards } from "../../ws/shard.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordUnavailableGuild } from "../../types/guilds/unavailable_guild.ts";
 
 export async function handleGuildDelete(
   data: DiscordGatewayPayload,
@@ -18,9 +20,11 @@ export async function handleGuildDelete(
     if (shard) shard.unavailableGuildIds.add(payload.id);
 
     await cacheHandlers.set("unavailableGuilds", payload.id, Date.now());
-  }
 
+    eventHandlers.guildUnavailable?.(guild);
+  } else {
     eventHandlers.guildDelete?.(guild);
+  }
 
   cacheHandlers.forEach("messages", (message) => {
     if (message.guildId === payload.id) {

src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildIntegrationsUpdate } from "../../types/guilds/guild_integrations_update.ts";
 
 export async function handleGuildIntegrationsUpdate(
   data: DiscordGatewayPayload,

src/handlers/guilds/GUILD_UPDATE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuild } from "../../types/guilds/guild.ts";
 
 export async function handleGuildUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuild;

src/handlers/integrations/INTEGRATION_CREATE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleIntegrationCreate(
   data: DiscordGatewayPayload,

src/handlers/integrations/INTEGRATION_DELETE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleIntegrationDelete(data: DiscordGatewayPayload) {
   const {

src/handlers/integrations/INTEGRATION_UPDATE.ts

@@ -1,4 +1,5 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleIntegrationUpdate(data: DiscordGatewayPayload) {
   const {

src/handlers/interactions/INTERACTION_CREATE.ts

@@ -1,6 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleInteractionCreate(data: DiscordGatewayPayload) {
   const payload = data.d as InteractionCommandPayload;

src/handlers/invites/INVITE_CREATE.ts

@@ -1,4 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordInviteCreate } from "../../types/invites/invite_create.ts";
 
 export function handleInviteCreate(payload: DiscordGatewayPayload) {
   // TODO: replace with tocamelcase

src/handlers/invites/INVITE_DELETE.ts

@@ -1,4 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordInviteDelete } from "../../types/invites/invite_delete.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export function handleInviteDelete(payload: DiscordGatewayPayload) {
   const {

src/handlers/members/GUILD_MEMBERS_CHUNK.ts

@@ -1,6 +1,8 @@
 import { cache, cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
 import { Collection } from "../../util/collection.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildMembersChunk } from "../../types/members/guild_members_chunk.ts";
 
 export async function handleGuildMembersChunk(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildMembersChunk;

src/handlers/members/GUILD_MEMBER_ADD.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildMemberAdd } from "../../types/members/guild_member_add.ts";
 
 export async function handleGuildMemberAdd(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildMemberAdd;

src/handlers/members/GUILD_MEMBER_REMOVE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildMemberRemove } from "../../types/members/guild_member_remove.ts";
 
 export async function handleGuildMemberRemove(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildMemberRemove;

src/handlers/members/GUILD_MEMBER_UPDATE.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildMemberUpdate } from "../../types/members/guild_member_update.ts";
 
 export async function handleGuildMemberUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildMemberUpdate;

src/handlers/messages/MESSAGE_CREATE.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessage } from "../../types/messages/message.ts";
 
 export async function handleMessageCreate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordMessage;

src/handlers/messages/MESSAGE_DELETE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageDelete } from "../../types/messages/message_delete.ts";
 
 export async function handleMessageDelete(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordMessageDelete;

src/handlers/messages/MESSAGE_DELETE_BULK.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageDeleteBulk } from "../../types/messages/message_delete_bulk.ts";
 
 export async function handleMessageDeleteBulk(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordMessageDeleteBulk;

src/handlers/messages/MESSAGE_REACTION_ADD.ts

@@ -1,6 +1,8 @@
 import { botId, eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageReactionAdd } from "../../types/messages/message_reaction_add.ts";
 
 export async function handleMessageReactionAdd(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordMessageReactionAdd;

src/handlers/messages/MESSAGE_REACTION_REMOVE.ts

@@ -1,6 +1,8 @@
 import { botId, eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageReactionRemove } from "../../types/messages/message_reaction_remove.ts";
 
 export async function handleMessageReactionRemove(
   data: DiscordGatewayPayload,

src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageReactionRemoveAll } from "../../types/messages/message_reaction_remove_all.ts";
 
 export async function handleMessageReactionRemoveAll(
   data: DiscordGatewayPayload,

src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessageReactionRemoveEmoji } from "../../types/messages/message_reaction_remove_emoji.ts";
 
 export async function handleMessageReactionRemoveEmoji(
   data: DiscordGatewayPayload,

src/handlers/messages/MESSAGE_UPDATE.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordMessage } from "../../types/messages/message.ts";
 
 export async function handleMessageUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordMessage;

src/handlers/misc/PRESENCE_UPDATE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordPresenceUpdate } from "../../types/misc/presence_update.ts";
 
 export async function handlePresenceUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordPresenceUpdate;

src/handlers/misc/READY.ts

@@ -9,6 +9,8 @@ import { initialMemberLoadQueue } from "../../structures/guild.ts";
 import { structures } from "../../structures/mod.ts";
 import { delay } from "../../util/utils.ts";
 import { allowNextShard, basicShards } from "../../ws/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordReady } from "../../types/gateway/ready.ts";
 
 export async function handleReady(
   data: DiscordGatewayPayload,

src/handlers/misc/TYPING_START.ts

@@ -1,4 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordTypingStart } from "../../types/misc/typing_start.ts";
 
 export function handleTypingStart(data: DiscordGatewayPayload) {
   eventHandlers.typingStart?.(data.d as DiscordTypingStart);

src/handlers/misc/USER_UPDATE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordUser } from "../../types/users/user.ts";
 
 export async function handleUserUpdate(data: DiscordGatewayPayload) {
   const userData = data.d as DiscordUser;

src/handlers/roles/GUILD_ROLE_CREATE.ts

@@ -1,6 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleGuildRoleCreate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildRoleCreateUpdate;

src/handlers/roles/GUILD_ROLE_DELETE.ts

@@ -1,5 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordGuildRoleDelete } from "../../types/guilds/guild_role_delete.ts";
 
 export async function handleGuildRoleDelete(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildRoleDelete;

src/handlers/roles/GUILD_ROLE_UPDATE.ts

@@ -1,6 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
 
 export async function handleGuildRoleUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordGuildRoleCreateUpdate;

src/handlers/voice/VOICE_STATE_UPDATE.ts

@@ -1,6 +1,8 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { structures } from "../../structures/mod.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordVoiceState } from "../../types/voice/voice_state.ts";
 
 export async function handleVoiceStateUpdate(data: DiscordGatewayPayload) {
   const payload = data.d as DiscordVoiceState;

src/handlers/webhooks/WEBHOOKS_UPDATE.ts

@@ -1,4 +1,6 @@
 import { eventHandlers } from "../../bot.ts";
+import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import { DiscordWebhooksUpdate } from "../../types/webhooks/webhooks_update.ts";
 
 export function handleWebhooksUpdate(data: DiscordGatewayPayload) {
   const options = data.d as DiscordWebhooksUpdate;

src/helpers/channels/create_channel.ts

@@ -1,12 +1,10 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import {
+import { DiscordChannel } from "../../types/channels/channel.ts";
-  CreateGuildChannel,
+import { DiscordChannelTypes } from "../../types/channels/channel_types.ts";
-  DiscordChannel,
+import { CreateGuildChannel } from "../../types/guilds/create_guild_channel.ts";
-  DiscordChannelTypes,
+import { PermissionStrings } from "../../types/permissions/permission_strings.ts";
-  PermissionStrings,
-} from "../../types/mod.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   calculateBits,
@@ -17,7 +15,7 @@ import {
 export async function createChannel(
   guildId: string,
   name: string,
-  options?: CreateGuildChannel,
+  options?: CreateGuildChannel
 ) {
   const requiredPerms: Set<PermissionStrings> = new Set(["MANAGE_CHANNELS"]);
 
@@ -28,8 +26,10 @@ export async function createChannel(
 
   await requireBotGuildPermissions(guildId, [...requiredPerms]);
 
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod("post", endpoints.GUILD_CHANNELS(guildId), {
+    "post",
+    endpoints.GUILD_CHANNELS(guildId),
+    {
       ...options,
       name,
       permission_overwrites: options?.permissionOverwrites?.map((perm) => ({
@@ -39,7 +39,8 @@ export async function createChannel(
         deny: calculateBits(perm.deny),
       })),
       type: options?.type || DiscordChannelTypes.GUILD_TEXT,
-    })) as DiscordChannel;
+    }
+  )) as DiscordChannel;
 
   const channelStruct = await structures.createChannelStruct(result);
   await cacheHandlers.set("channels", channelStruct.id, channelStruct);

src/helpers/channels/delete_channel.ts

@@ -1,6 +1,6 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
-import { Errors } from "../../types/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 

src/helpers/channels/edit_channel_overwrite.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { Overwrite } from "../../types/mod.ts";
+import { Overwrite } from "../../types/channels/overwrite.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   calculateBits,

src/helpers/channels/follow_channel.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordFollowedChannel } from "../../types/mod.ts";
+import { DiscordFollowedChannel } from "../../types/channels/followed_channel.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 

src/helpers/channels/get_channel.ts

@@ -1,7 +1,7 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordChannel } from "../../types/mod.ts";
+import { DiscordChannel } from "../../types/channels/channel.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Fetches a single channel object from the api.
@@ -9,8 +9,7 @@ import { endpoints } from "../../util/constants.ts";
  * ⚠️ **If you need this, you are probably doing something wrong. This is not intended for use. Your channels will be cached in your guild.**
  */
 export async function getChannel(channelId: string, addToCache = true) {
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.CHANNEL_BASE(channelId),
   )) as DiscordChannel;

src/helpers/channels/get_channel_webhooks.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordWebhook } from "../../types/mod.ts";
+import { DiscordWebhook } from "../../types/webhooks/webhook.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 

src/helpers/channels/get_channels.ts

@@ -1,7 +1,7 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordChannel } from "../../types/mod.ts";
+import { DiscordChannel } from "../../types/channels/channel.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns a list of guild channel objects.
@@ -9,8 +9,7 @@ import { endpoints } from "../../util/constants.ts";
  * ⚠️ **If you need this, you are probably doing something wrong. This is not intended for use. Your channels will be cached in your guild.**
  */
 export async function getChannels(guildId: string, addToCache = true) {
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.GUILD_CHANNELS(guildId),
   ) as DiscordChannel[]);

src/helpers/channels/get_pins.ts

@@ -1,12 +1,11 @@
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordMessage } from "../../types/mod.ts";
+import { DiscordMessage } from "../../types/messages/message.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Get pinned messages in this channel. */
 export async function getPins(channelId: string) {
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.CHANNEL_PINS(channelId),
   )) as DiscordMessage[];

src/helpers/channels/start_typing.ts

@@ -1,6 +1,7 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
-import { DiscordChannelTypes, Errors } from "../../types/mod.ts";
+import { DiscordChannelTypes } from "../../types/channels/channel_types.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { botHasChannelPermissions } from "../../util/permissions.ts";
 

src/helpers/channels/swap_channels.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { ModifyGuildChannelPositions } from "../../types/mod.ts";
+import { ModifyGuildChannelPositions } from "../../types/guilds/modify_guild_channel_position.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Modify the positions of channels on the guild. Requires MANAGE_CHANNELS permisison. */

src/helpers/commands/edit_slash_response.ts

@@ -1,6 +1,7 @@
 import { applicationId } from "../../bot.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** To edit your response to a slash command. If a messageId is not provided it will default to editing the original response. */

src/helpers/commands/get_slash_commands.ts

@@ -5,8 +5,7 @@ import { endpoints } from "../../util/constants.ts";
 
 /** Fetch all of the global commands for your application. */
 export async function getSlashCommands(guildId?: string) {
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     guildId
       ? endpoints.COMMANDS_GUILD(applicationId, guildId)

src/helpers/guilds/create_guild.ts

@@ -4,8 +4,7 @@ import { endpoints } from "../../util/constants.ts";
 
 /** Create a new guild. Returns a guild object on success. Fires a Guild Create Gateway event. This endpoint can be used only by bots in less than 10 guilds. */
 export async function createGuild(options: CreateServerOptions) {
-  const guild =
+  const guild = (await rest.runMethod(
-    (await rest.runMethod(
     "post",
     endpoints.GUILDS,
     options,

src/helpers/guilds/get_audit_logs.ts

@@ -18,7 +18,8 @@ export async function getAuditLogs(
         ? AuditLogs[options.action_type]
         : undefined,
       limit: options.limit && options.limit >= 1 && options.limit <= 100
-        ? options.limit : 50,
+        ? options.limit
+        : 50,
     },
   );
 

src/helpers/guilds/get_bans.ts

@@ -7,8 +7,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
 export async function getBans(guildId: string) {
   await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]);
 
-  const results =
+  const results = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.GUILD_BANS(guildId),
   )) as BannedUser[];

src/helpers/guilds/get_prune_count.ts

@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 import { camelKeysToSnakeCase } from "../../util/utils.ts";

src/helpers/guilds/get_widget.ts

@@ -1,5 +1,6 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns the widget for the guild. */

src/helpers/guilds/get_widget_image_url.ts

@@ -1,4 +1,5 @@
 import { cacheHandlers } from "../../cache.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns the widget image URL for the guild. */

src/helpers/invites/delete_invite.ts

@@ -1,5 +1,6 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   botHasChannelPermissions,

src/helpers/members/edit_bot_profile.ts

@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { urlToBase64 } from "../../util/utils.ts";
 

src/helpers/members/edit_member.ts

@@ -1,6 +1,7 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   requireBotChannelPermissions,

src/helpers/members/fetch_members.ts

@@ -1,5 +1,7 @@
 import { identifyPayload } from "../../bot.ts";
 import { Member } from "../../structures/mod.ts";
+import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { Collection } from "../../util/collection.ts";
 import { requestAllMembers } from "../../ws/shard_manager.ts";
 import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts";

src/helpers/members/get_member.ts

@@ -1,5 +1,4 @@
 import { cacheHandlers } from "../../cache.ts";
-import { RequestManager } from "../../rest/request_manager.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
 import { endpoints } from "../../util/constants.ts";
@@ -16,7 +15,9 @@ export async function getMember(
   const guild = await cacheHandlers.get("guilds", guildId);
   if (!guild && !options?.force) return;
 
-  const data = (await rest.runMethod("get",
+  const data =
+    (await rest.runMethod(
+      "get",
       endpoints.GUILD_MEMBER(guildId, id),
     )) as MemberCreatePayload;
 

src/helpers/members/get_members.ts

@@ -2,6 +2,9 @@ import { identifyPayload } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { Member, structures } from "../../structures/mod.ts";
+import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts";
+import { DiscordGuildMember } from "../../types/guilds/guild_member.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
 
@@ -14,7 +17,7 @@ import { endpoints } from "../../util/constants.ts";
  * GW(fetchMembers): 120/m(PER shard) rate limit. Meaning if you have 8 shards your limit is 960/m.
  */
 export async function getMembers(guildId: string, options?: GetMemberOptions) {
-  if (!(identifyPayload.intents && Intents.GUILD_MEMBERS)) {
+  if (!(identifyPayload.intents && DiscordGatewayIntents.GUILD_MEMBERS)) {
     throw new Error(Errors.MISSING_INTENT_GUILD_MEMBERS);
   }
 
@@ -39,19 +42,12 @@ export async function getMembers(guildId: string, options?: GetMemberOptions) {
       );
     }
 
-    const result =
+    const result = (await rest.runMethod(
-      (await rest.runMethod(
       "get",
       `${endpoints.GUILD_MEMBERS(guildId)}?limit=${
-          membersLeft > 1000
+        membersLeft > 1000 ? 1000 : membersLeft
-            ? 1000
+      }${options?.after ? `&after=${options.after}` : ""}`,
-            : membersLeft
+    )) as DiscordGuildMember[];
-        }${
-          options?.after
-            ? `&after=${options.after}`
-            : ""
-        }`,
-      )) as MemberCreatePayload[];
 
     const memberStructures = await Promise.all(
       result.map(async (member) => {

src/helpers/members/kick_member.ts

@@ -1,5 +1,6 @@
 import { botId } from "../../bot.ts";
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   highestRole,

src/helpers/members/prune_members.ts

@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 import { camelKeysToSnakeCase } from "../../util/utils.ts";

src/helpers/messages/delete_messages.ts

@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 

src/helpers/messages/edit_message.ts

@@ -1,6 +1,8 @@
 import { botId } from "../../bot.ts";
 import { rest } from "../../rest/rest.ts";
 import { Message, structures } from "../../structures/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
+import { PermissionStrings } from "../../types/permissions/permission_strings.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 
@@ -15,7 +17,7 @@ export async function editMessage(
 
   if (typeof content === "string") content = { content };
 
-  const requiredPerms: Permission[] = ["SEND_MESSAGES"];
+  const requiredPerms: PermissionStrings[] = ["SEND_MESSAGES"];
 
   if (content.tts) requiredPerms.push("SEND_TTS_MESSAGES");
 

src/helpers/messages/get_message.ts

@@ -10,8 +10,7 @@ export async function getMessage(channelId: string, id: string) {
     "READ_MESSAGE_HISTORY",
   ]);
 
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.CHANNEL_MESSAGE(channelId, id),
   )) as MessageCreateOptions;

src/helpers/messages/get_messages.ts

@@ -19,8 +19,7 @@ export async function getMessages(
 
   if (options?.limit && options.limit > 100) return;
 
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.CHANNEL_MESSAGES(channelId),
     options,

src/helpers/messages/get_reactions.ts

@@ -9,8 +9,7 @@ export async function getReactions(
   reaction: string,
   options?: DiscordGetReactionsParams,
 ) {
-  const users =
+  const users = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.CHANNEL_MESSAGE_REACTION(channelId, messageId, reaction),
     options,

src/helpers/messages/publish_message.ts

@@ -4,8 +4,7 @@ import { endpoints } from "../../util/constants.ts";
 
 /** Crosspost a message in a News Channel to following channels. */
 export async function publishMessage(channelId: string, messageId: string) {
-  const data =
+  const data = (await rest.runMethod(
-    (await rest.runMethod(
     "post",
     endpoints.CHANNEL_MESSAGE_CROSSPOST(channelId, messageId),
   )) as MessageCreateOptions;

src/helpers/messages/send_message.ts

@@ -2,7 +2,8 @@ import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
 import { DiscordChannelTypes } from "../../types/channels/channel_types.ts";
-import { PermissionStrings } from "../../types/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
+import { PermissionStrings } from "../../types/permissions/permission_strings.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 

src/helpers/roles/add_role.ts

@@ -1,5 +1,6 @@
 import { botId } from "../../bot.ts";
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   isHigherPosition,

src/helpers/roles/remove_role.ts

@@ -1,5 +1,6 @@
 import { botId } from "../../bot.ts";
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   isHigherPosition,

src/helpers/templates/create_guild_template.ts

@@ -23,8 +23,7 @@ export async function createGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template =
+  const template = (await rest.runMethod(
-    (await rest.runMethod(
     "post",
     endpoints.GUILD_TEMPLATES(guildId),
     data,

src/helpers/templates/delete_guild_template.ts

@@ -13,8 +13,7 @@ export async function deleteGuildTemplate(
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const deletedTemplate =
+  const deletedTemplate = (await rest.runMethod(
-    (await rest.runMethod(
     "delete",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
   )) as GuildTemplate;

src/helpers/templates/edit_guild_template.ts

@@ -22,8 +22,7 @@ export async function editGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template =
+  const template = (await rest.runMethod(
-    (await rest.runMethod(
     "patch",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
     data,

src/helpers/templates/get_guild_templates.ts

@@ -10,8 +10,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
 export async function getGuildTemplates(guildId: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const templates =
+  const templates = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.GUILD_TEMPLATES(guildId),
   )) as GuildTemplate[];

src/helpers/templates/get_template.ts

@@ -4,8 +4,7 @@ import { endpoints } from "../../util/constants.ts";
 
 /** Returns the guild template if it exists */
 export async function getTemplate(templateCode: string) {
-  const result =
+  const result = (await rest.runMethod(
-    (await rest.runMethod(
     "get",
     endpoints.GUILD_TEMPLATE(templateCode),
   ) as GuildTemplate);

src/helpers/templates/sync_guild_template.ts

@@ -10,8 +10,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
 export async function syncGuildTemplate(guildId: string, templateCode: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const template =
+  const template = (await rest.runMethod(
-    (await rest.runMethod(
     "put",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
   )) as GuildTemplate;

src/helpers/webhooks/create_webhook.ts

@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 import { urlToBase64 } from "../../util/utils.ts";

src/helpers/webhooks/edit_webhook_message.ts

@@ -1,5 +1,6 @@
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 
 export async function editWebhookMessage(

src/helpers/webhooks/execute_webhook.ts

@@ -1,5 +1,6 @@
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
+import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Execute a webhook with webhook Id and webhook token */

src/interactions/server.ts

@@ -90,7 +90,11 @@ async function handleApplicationCommand(
 }
 
 /** Internal function to verify security. Discord will send bad and good data and this function is important to verify it. If it is not verified properly, Discord will kill your bot. */
-export function verifySecurity(buffer: Uint8Array, signature: string, time: string) {
+export function verifySecurity(
+  buffer: Uint8Array,
+  signature: string,
+  time: string,
+) {
   const sig = new Uint8Array(64);
   const timestamp = new TextEncoder().encode(time);
 

src/rest/rest.ts

@@ -22,6 +22,7 @@ export const rest = {
       console.error(error);
     },
     // PLACEHOLDERS TO ALLOW USERS TO CUSTOMIZE
+    debug: function (_type, error) {},
     fetching() {},
     fetched() {},
     fetchSuccess() {},

src/rest/run_method.ts

@@ -1,18 +1,23 @@
+import { Errors } from "../types/misc/errors.ts";
+import { IMAGE_BASE_URL } from "../util/constants.ts";
+import { API_VERSION } from "../util/constants.ts";
+import { BASE_URL } from "../util/constants.ts";
 import { rest } from "./rest.ts";
 
 export function runMethod(
-  method: RequestMethods,
+  method: "get" | "post" | "put" | "delete" | "patch",
   url: string,
   body?: unknown,
   retryCount = 0,
   bucketId?: string | null,
 ) {
-  rest.eventHandlers.debug?.(
+  rest.eventHandlers.debug?.("requestCreate", {
-    {
+    method,
-      type: "requestCreate",
+    url,
-      data: { method, url, body, retryCount, bucketId },
+    body,
-    },
+    retryCount,
-  );
+    bucketId,
+  });
 
   const errorStack = new Error("Location:");
   Error.captureStackTrace(errorStack);
@@ -45,38 +50,49 @@ export function runMethod(
   return new Promise(async (resolve, reject) => {
     const callback = async () => {
       try {
-        const rateLimitResetIn = await rest.checkRatelimits(url);
+        const rateLimitResetIn = rest.checkRateLimits(url);
         if (rateLimitResetIn) {
           return { rateLimited: rateLimitResetIn, beforeFetch: true, bucketId };
         }
 
         const query = method === "get" && body
           ? // deno-lint-ignore no-explicit-any
-            Object.entries(body as any).map(([key, value]) =>
+            Object.entries(body as any)
-              // deno-lint-ignore no-explicit-any
+              .map(
-              `${encodeURIComponent(key)}=${encodeURIComponent(value as any)}`
+                ([key, value]) =>
+                  `${encodeURIComponent(key)}=${
+                    encodeURIComponent(
+                      value as string | number | boolean,
+                    )
+                  }`,
               )
               .join("&")
           : "";
         const urlToUse = method === "get" && query ? `${url}?${query}` : url;
 
-        rest.eventHandlers.debug?.(
+        rest.eventHandlers.debug?.("requestFetch", {
-          {
+          method,
-            type: "requestFetch",
+          url,
-            data: { method, url, body, retryCount, bucketId },
+          body,
-          },
+          retryCount,
-        );
+          bucketId,
+        });
         const response = await fetch(
           urlToUse,
           rest.createRequestBody(body, method),
         );
-        rest.eventHandlers.debug?.(
+        rest.eventHandlers.debug?.("requestFetched", {
-          {
+          method,
-            type: "requestFetched",
+          url,
-            data: { method, url, body, retryCount, bucketId, response },
+          body,
-          },
+          retryCount,
+          bucketId,
+          response,
+        });
+        const bucketIdFromHeaders = rest.processRequestHeaders(
+          url,
+          response.headers,
         );
-        const bucketIdFromHeaders = rest.processHeaders(url, response.headers);
         await rest.handleStatusCode(response, errorStack);
 
         // Sometimes Discord returns an empty 204 response that can't be made to JSON.
@@ -88,12 +104,14 @@ export function runMethod(
           json.message === "You are being rate limited."
         ) {
           if (retryCount > 10) {
-            rest.eventHandlers.debug?.(
+            rest.eventHandlers.error?.("globalRateLimit", {
-              {
+              method,
-                type: "error",
+              url,
-                data: { method, url, body, retryCount, bucketId, errorStack },
+              body,
-              },
+              retryCount,
-            );
+              bucketId,
+              errorStack,
+            });
             throw new Error(Errors.RATE_LIMIT_RETRY_MAXED);
           }
 
@@ -104,20 +122,23 @@ export function runMethod(
           };
         }
 
-        rest.eventHandlers.debug?.(
+        rest.eventHandlers.debug?.("requestSuccess", {
-          {
+          method,
-            type: "requestSuccess",
+          url,
-            data: { method, url, body, retryCount, bucketId },
+          body,
-          },
+          retryCount,
-        );
+          bucketId,
+        });
         return resolve(json);
       } catch (error) {
-        rest.eventHandlers.debug?.(
+        rest.eventHandlers.error?.("unknown", {
-          {
+          method,
-            type: "error",
+          url,
-            data: { method, url, body, retryCount, bucketId, errorStack },
+          body,
-          },
+          retryCount,
-        );
+          bucketId,
+          errorStack,
+        });
         return reject(error);
       }
     };

src/types/gateway/identify.ts

@@ -16,7 +16,7 @@ export interface Identify {
   /** Presence structure for initial presence information */
   presence?: UpdateStatus;
   /** Enables dispatching of guild subscription events (presence and typing events) */
-  guild_subscriptions?: boolean;
+  guildSubscriptions?: boolean;
   /** The Gateway Intents you wish to receive */
   intents: number;
 }

src/types/guilds/list_guild_members.ts

@@ -1,4 +1,3 @@
-
 export interface ListGuildMembers {
   /** Max number of members to return (1-1000). Default: 1 */
   limit?: number;

src/types/users/connection.ts

@@ -1,5 +1,6 @@
 import { SnakeCaseProps } from "../util.ts";
 import { DiscordVisibilityTypes } from "./visibility_types.ts";
+import { Integration } from "../guilds/integration.ts"
 
 export interface Connection {
   /** id of the connection account */

src/util/permissions.ts

@@ -1,15 +1,11 @@
 import { botId } from "../bot.ts";
 import { cacheHandlers } from "../cache.ts";
 import { Channel, Guild, Member, Role } from "../structures/mod.ts";
-import {
+import { Errors } from "../types/misc/errors.ts";
-  DiscordBitwisePermissionFlags,
+import { DiscordBitwisePermissionFlags } from "../types/permissions/bitwise_permission_flags.ts";
-  PermissionStrings,
+import { PermissionStrings } from "../types/permissions/permission_strings.ts";
-} from "../types/mod.ts";
 
-async function getCached(
+async function getCached(table: "guilds", key: string | Guild): Promise<Guild>;
-  table: "guilds",
-  key: string | Guild,
-): Promise<Guild>;
 async function getCached(
   table: "channels",
   key: string | Channel,
@@ -24,7 +20,7 @@ async function getCached(
 ) {
   const cached = typeof key === "string"
     ? // @ts-ignore TS is wrong here
-      (await cacheHandlers.get(table, key))
+      await cacheHandlers.get(table, key)
     : key;
   if (!cached || typeof cached === "string") {
     throw new Error(
@@ -119,14 +115,15 @@ export async function calculateChannelOverwrites(
 /** Checks if the given permission bits are matching the given permissions. `ADMINISTRATOR` always returns `true` */
 export function validatePermissions(
   permissionBits: string,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   if (BigInt(permissionBits) & 8n) return true;
 
   return permissions.every(
     (permission) =>
       // Check if permission is in permissionBits
-      BigInt(permissionBits) & BigInt(Permissions[permission]),
+      BigInt(permissionBits) &
+      BigInt(DiscordBitwisePermissionFlags[permission]),
   );
 }
 
@@ -134,7 +131,7 @@ export function validatePermissions(
 export async function hasGuildPermissions(
   guild: string | Guild,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // First we need the role permission bits this member has
   const basePermissions = await calculateBasePermissions(guild, member);
@@ -145,7 +142,7 @@ export async function hasGuildPermissions(
 /** Checks if the bot has these permissions in the given guild */
 export function botHasGuildPermissions(
   guild: string | Guild,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // Since Bot is a normal member we can use the hasRolePermissions() function
   return hasGuildPermissions(guild, botId, permissions);
@@ -155,13 +152,10 @@ export function botHasGuildPermissions(
 export async function hasChannelPermissions(
   channel: string | Channel,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // First we need the overwrite bits this member has
-  const channelOverwrites = await calculateChannelOverwrites(
+  const channelOverwrites = await calculateChannelOverwrites(channel, member);
-    channel,
-    member,
-  );
   // Second use the validatePermissions function to check if the member has every permission
   return validatePermissions(channelOverwrites, permissions);
 }
@@ -169,7 +163,7 @@ export async function hasChannelPermissions(
 /** Checks if the bot has these permissions f0r the given channel */
 export function botHasChannelPermissions(
   channel: string | Channel,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // Since Bot is a normal member we can use the hasRolePermissions() function
   return hasChannelPermissions(channel, botId, permissions);
@@ -184,8 +178,10 @@ export function missingPermissions(
 
   return permissions.filter(
     (permission) =>
-      !(BigInt(permissionBits) &
+      !(
-        BigInt(DiscordBitwisePermissionFlags[permission])),
+        BigInt(permissionBits) &
+        BigInt(DiscordBitwisePermissionFlags[permission])
+      ),
   );
 }
 
@@ -193,7 +189,7 @@ export function missingPermissions(
 export async function getMissingGuildPermissions(
   guild: string | Guild,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // First we need the role permissino bits this member has
   const permissionBits = await calculateBasePermissions(guild, member);
@@ -205,7 +201,7 @@ export async function getMissingGuildPermissions(
 export async function getMissingChannelPermissions(
   channel: string | Channel,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // First we need the role permissino bits this member has
   const permissionBits = await calculateChannelOverwrites(channel, member);
@@ -217,7 +213,7 @@ export async function getMissingChannelPermissions(
 export async function requireGuildPermissions(
   guild: string | Guild,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   const missing = await getMissingGuildPermissions(guild, member, permissions);
   if (missing.length) {
@@ -229,7 +225,7 @@ export async function requireGuildPermissions(
 /** Throws an error if the bot does not have all permissions */
 export function requireBotGuildPermissions(
   guild: string | Guild,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // Since Bot is a normal member we can use the throwOnMissingGuildPermission() function
   return requireGuildPermissions(guild, botId, permissions);
@@ -239,7 +235,7 @@ export function requireBotGuildPermissions(
 export async function requireChannelPermissions(
   channel: string | Channel,
   member: string | Member,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   const missing = await getMissingChannelPermissions(
     channel,
@@ -255,7 +251,7 @@ export async function requireChannelPermissions(
 /** Throws an error if the bot has not all of the given channel permissions */
 export function requireBotChannelPermissions(
   channel: string | Channel,
-  permissions: Permission[],
+  permissions: PermissionStrings[],
 ) {
   // Since Bot is a normal member we can use the throwOnMissingChannelPermission() function
   return requireChannelPermissions(channel, botId, permissions);
@@ -263,19 +259,20 @@ export function requireBotChannelPermissions(
 
 /** This function converts a bitwise string to permission strings */
 export function calculatePermissions(permissionBits: bigint) {
-  return Object.keys(Permissions).filter((permission) => {
+  return Object.keys(DiscordBitwisePermissionFlags).filter((permission) => {
     // Since Object.keys() not only returns the permission names but also the bit values we need to return false if it is a Number
     if (Number(permission)) return false;
     // Check if permissionBits has this permission
-    return permissionBits & BigInt(Permissions[permission as Permission]);
+    return permissionBits &
-  }) as Permission[];
+      BigInt(DiscordBitwisePermissionFlags[permission as PermissionStrings]);
+  }) as PermissionStrings[];
 }
 
 /** This function converts an array of permissions into the bitwise string. */
-export function calculateBits(permissions: Permission[]) {
+export function calculateBits(permissions: PermissionStrings[]) {
   return permissions
     .reduce((bits, perm) => {
-      bits |= BigInt(Permissions[perm]);
+      bits |= BigInt(DiscordBitwisePermissionFlags[perm]);
       return bits;
     }, 0n)
     .toString();
@@ -289,9 +286,8 @@ export async function highestRole(
   guild = await getCached("guilds", guild);
 
   // Get the roles from the member
-  const memberRoles = (
+  const memberRoles = (await getCached("members", member)).guilds.get(guild.id)
-    await getCached("members", member)
+    ?.roles;
-  ).guilds.get(guild.id)?.roles;
   // This member has no roles so the highest one is the @everyone role
   if (!memberRoles) return guild.roles.get(guild.id) as Role;
 

src/util/utils.ts

@@ -1,5 +1,6 @@
 import { encode } from "../../deps.ts";
-import { DiscordGatewayOpcodes } from "../types/mod.ts";
+import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts";
+import { Errors } from "../types/misc/errors.ts";
 import { basicShards, sendWS } from "../ws/shard.ts";
 import { SLASH_COMMANDS_NAME_REGEX } from "./constants.ts";
 

src/ws/shard_manager.ts

@@ -2,7 +2,7 @@ import { eventHandlers } from "../bot.ts";
 import { cache } from "../cache.ts";
 import { handlers } from "../handlers/mod.ts";
 import { Member } from "../structures/mod.ts";
-import { DiscordGatewayOpcodes } from "../types/mod.ts";
+import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts";
 import { Collection } from "../util/collection.ts";
 import { delay } from "../util/utils.ts";
 import { createShard, requestGuildMembers } from "./mod.ts";