this is the biggest pain ever

src/helpers/guilds/create_guild.ts

@@ -2,8 +2,8 @@ import { botId } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { CreateGuild } from "../../types/guilds/create_guild.ts";
-import { Guild } from "../../types/guilds/guild.ts";
+import type { CreateGuild } from "../../types/guilds/create_guild.ts";
+import type { Guild } from "../../types/guilds/guild.ts";
 import { endpoints } from "../../util/constants.ts";
 import { getMember } from "../members/get_member.ts";
 

src/helpers/guilds/edit_guild.ts

@@ -1,8 +1,8 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { Guild } from "../../types/guilds/guild.ts";
-import { ModifyGuild } from "../../types/guilds/modify_guild.ts";
+import type { Guild } from "../../types/guilds/guild.ts";
+import type { ModifyGuild } from "../../types/guilds/modify_guild.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 import { urlToBase64 } from "../../util/utils.ts";

src/helpers/guilds/edit_welcome_screen.ts

@@ -1,6 +1,6 @@
 import { rest } from "../../rest/rest.ts";
-import { ModifyGuildWelcomeScreen } from "../../types/guilds/modify_guild_welcome_screen.ts";
-import { WelcomeScreen } from "../../types/mod.ts";
+import type { ModifyGuildWelcomeScreen } from "../../types/guilds/modify_guild_welcome_screen.ts";
+import type { WelcomeScreen } from "../../types/guilds/welcome_screen.ts";
 import { endpoints } from "../../util/constants.ts";
 import { camelKeysToSnakeCase } from "../../util/utils.ts";
 

src/helpers/guilds/edit_widget.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { GuildWidget } from "../../types/guilds/guild_widget.ts";
+import type { GuildWidget } from "../../types/guilds/guild_widget.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 

src/helpers/guilds/get_audit_logs.ts

@@ -1,6 +1,6 @@
 import { rest } from "../../rest/rest.ts";
-import { AuditLog } from "../../types/audit_log/audit_log.ts";
-import { GetGuildAuditLog } from "../../types/audit_log/get_guild_audit_log.ts";
+import type { AuditLog } from "../../types/audit_log/audit_log.ts";
+import type { GetGuildAuditLog } from "../../types/audit_log/get_guild_audit_log.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 import { camelKeysToSnakeCase } from "../../util/utils.ts";

src/helpers/guilds/get_available_voice_regions.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { VoiceRegion } from "../../types/voice/voice_region.ts";
+import type { VoiceRegion } from "../../types/voice/voice_region.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns an array of voice regions that can be used when creating servers. */

src/helpers/guilds/get_ban.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { Ban } from "../../types/guilds/ban.ts";
+import type { Ban } from "../../types/guilds/ban.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 

src/helpers/guilds/get_bans.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { Ban } from "../../types/guilds/ban.ts";
+import type { Ban } from "../../types/guilds/ban.ts";
 import { snowflakeToBigint } from "../../util/bigint.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";

src/helpers/guilds/get_guild.ts

@@ -1,7 +1,7 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { Guild } from "../../types/guilds/guild.ts";
+import type { Guild } from "../../types/guilds/guild.ts";
 import { endpoints } from "../../util/constants.ts";
 import { ws } from "../../ws/ws.ts";
 

src/helpers/guilds/get_guild_preview.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { GuildPreview } from "../../types/guilds/guild_preview.ts";
+import type { GuildPreview } from "../../types/guilds/guild_preview.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns the guild preview object for the given id. If the bot is not in the guild, then the guild must be Discoverable. */

src/helpers/guilds/get_prune_count.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { GetGuildPruneCountQuery } from "../../types/guilds/get_guild_prune_count.ts";
+import type { GetGuildPruneCountQuery } from "../../types/guilds/get_guild_prune_count.ts";
 import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";

src/helpers/guilds/get_vainty_url.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { InviteMetadata } from "../../types/invites/invite_metadata.ts";
+import type { InviteMetadata } from "../../types/invites/invite_metadata.ts";
 import { endpoints } from "../../util/constants.ts";
 
 /** Returns the code and uses of the vanity url for this server if it is enabled else `code` will be null. Requires the `MANAGE_GUILD` permission. */

src/helpers/guilds/get_voice_regions.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { VoiceRegion } from "../../types/voice/voice_region.ts";
+import type { VoiceRegion } from "../../types/voice/voice_region.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
 

src/helpers/guilds/get_welcome_screen.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { WelcomeScreen } from "../../types/mod.ts";
+import type { WelcomeScreen } from "../../types/mod.ts";
 import { endpoints } from "../../util/constants.ts";
 
 export async function getWelcomeScreen(guildId: bigint) {

src/helpers/guilds/get_widget.ts

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

src/helpers/guilds/get_widget_image_url.ts

@@ -1,5 +1,5 @@
 import { cacheHandlers } from "../../cache.ts";
-import { GetGuildWidgetImageQuery } from "../../types/guilds/get_guild_widget_image.ts";
+import type { GetGuildWidgetImageQuery } from "../../types/guilds/get_guild_widget_image.ts";
 import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 

src/helpers/guilds/get_widget_settings.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { GuildWidget } from "../../types/guilds/guild_widget.ts";
+import type { GuildWidget } from "../../types/guilds/guild_widget.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 

src/helpers/guilds/guild_banner_url.ts

@@ -1,5 +1,5 @@
-import { DiscordImageFormat } from "../../types/misc/image_format.ts";
-import { DiscordImageSize } from "../../types/misc/image_size.ts";
+import type { DiscordImageFormat } from "../../types/misc/image_format.ts";
+import type { DiscordImageSize } from "../../types/misc/image_size.ts";
 import { endpoints } from "../../util/constants.ts";
 import { formatImageURL } from "../../util/utils.ts";
 

src/helpers/guilds/guild_icon_url.ts

@@ -1,5 +1,5 @@
-import { DiscordImageFormat } from "../../types/misc/image_format.ts";
-import { DiscordImageSize } from "../../types/misc/image_size.ts";
+import type { DiscordImageFormat } from "../../types/misc/image_format.ts";
+import type { DiscordImageSize } from "../../types/misc/image_size.ts";
 import { endpoints } from "../../util/constants.ts";
 import { formatImageURL } from "../../util/utils.ts";
 

src/helpers/guilds/guild_splash_url.ts

@@ -1,5 +1,5 @@
-import { DiscordImageFormat } from "../../types/misc/image_format.ts";
-import { DiscordImageSize } from "../../types/misc/image_size.ts";
+import type { DiscordImageFormat } from "../../types/misc/image_format.ts";
+import type { DiscordImageSize } from "../../types/misc/image_size.ts";
 import { endpoints } from "../../util/constants.ts";
 import { formatImageURL } from "../../util/utils.ts";
 

src/helpers/guilds/update_bot_voice_state.ts

@@ -1,6 +1,5 @@
-import { RequestManager } from "../../rest/request_manager.ts";
-import {
-  DiscordUpdateSelfVoiceState,
+import { rest } from "../../rest/rest.ts";
+import type {
   UpdateSelfVoiceState,
 } from "../../types/guilds/update_self_voice_state.ts";
 import { endpoints } from "../../util/constants.ts";
@@ -15,14 +14,13 @@ import { camelKeysToSnakeCase } from "../../util/utils.ts";
  *  - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
  *  - You are able to set `request_to_speak_timestamp` to any present or future time.
  */
-export function updateBotVoiceState(
+export async function updateBotVoiceState(
   guildId: bigint,
   data: UpdateSelfVoiceState,
 ) {
-  const payload = camelKeysToSnakeCase<DiscordUpdateSelfVoiceState>(data);
-
-  return RequestManager.patch(
+  return await rest.runMethod(
+    "patch",
     endpoints.UPDATE_VOICE_STATE(guildId),
-    payload,
+    camelKeysToSnakeCase(data),
   );
 }

src/helpers/guilds/update_user_voice_state.ts

@@ -1,6 +1,5 @@
-import { RequestManager } from "../../rest/request_manager.ts";
-import {
-  DiscordUpdateOthersVoiceState,
+import { rest } from "../../rest/rest.ts";
+import type {
   UpdateOthersVoiceState,
 } from "../../types/guilds/update_others_voice_state.ts";
 import { endpoints } from "../../util/constants.ts";
@@ -20,10 +19,9 @@ export function updateVoiceState(
   userId: bigint,
   data: UpdateOthersVoiceState,
 ) {
-  const payload = camelKeysToSnakeCase<DiscordUpdateOthersVoiceState>(data);
-
-  return RequestManager.patch(
+  return rest.runMethod(
+    "patch",
     endpoints.UPDATE_VOICE_STATE(guildId, userId),
-    payload,
+    camelKeysToSnakeCase(data),
   );
 }