moar

src/helpers/messages/get_reactions.ts

@@ -1,5 +1,5 @@
 import { rest } from "../../rest/rest.ts";
-import { User } from "../../types/users/user.ts";
+import { DiscordUser } from "../../types/users/user.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
 
@@ -14,7 +14,7 @@ export async function getReactions(
     "get",
     endpoints.CHANNEL_MESSAGE_REACTION(channelId, messageId, reaction),
     options,
-  )) as User[];
+  )) as DiscordUser[];
 
   return new Collection(users.map((user) => [user.id, user]));
 }

src/helpers/mod.ts

@@ -96,7 +96,6 @@ import { deleteRole } from "./roles/delete_role.ts";
 import { editRole } from "./roles/edit_role.ts";
 import { getRoles } from "./roles/get_roles.ts";
 import { removeRole } from "./roles/remove_role.ts";
-import { swapRoles } from "./roles/swap_roles.ts";
 import { createGuildFromTemplate } from "./templates/create_guild_from_template.ts";
 import { createGuildTemplate } from "./templates/create_guild_template.ts";
 import { deleteGuildTemplate } from "./templates/delete_guild_template.ts";
@@ -230,7 +229,6 @@ export {
   sendMessage,
   startTyping,
   swapChannels,
-  swapRoles,
   syncGuildTemplate,
   syncIntegration,
   unban,
@@ -350,7 +348,6 @@ export let helpers = {
   editRole,
   getRoles,
   removeRole,
-  swapRoles,
   // templates
   createGuildFromTemplate,
   createGuildTemplate,

src/helpers/roles/swap_roles.ts

@@ -1,16 +0,0 @@
-import { rest } from "../../rest/rest.ts";
-import { endpoints } from "../../util/constants.ts";
-import { requireBotGuildPermissions } from "../../util/permissions.ts";
-
-/** Modify the positions of a set of role objects for the guild. Requires the MANAGE_ROLES permission. */
-export async function swapRoles(guildId: string, rolePositions: PositionSwap) {
-  await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
-
-  const result = await rest.runMethod(
-    "patch",
-    endpoints.GUILD_ROLES(guildId),
-    rolePositions,
-  );
-
-  return result;
-}

src/helpers/templates/create_guild_from_template.ts

@@ -1,7 +1,9 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
+import { Guild } from "../../types/guilds/guild.ts";
+import { CreateGuildFromTemplate } from "../../types/templates/create_guild_from_template.ts";
 import { endpoints } from "../../util/constants.ts";
-import { urlToBase64 } from "../../util/utils.ts";
+import { snakeKeysToCamelCase, urlToBase64 } from "../../util/utils.ts";
 
 /**
  * Create a new guild based on a template
@@ -27,5 +29,5 @@ export async function createGuildFromTemplate(
     data,
   );
 
-  return result as CreateGuildPayload;
+  return snakeKeysToCamelCase<Guild>(result);
 }

src/helpers/templates/create_guild_template.ts

@@ -1,6 +1,6 @@
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
-import { DiscordTemplate } from "../../types/templates/template.ts";
+import { DiscordTemplate, Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
 
@@ -12,7 +12,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
  */
 export async function createGuildTemplate(
   guildId: string,
-  data: CreateGuildTemplate,
+  data: Template,
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 

src/helpers/templates/edit_guild_template.ts

@@ -1,5 +1,6 @@
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
+import { ModifyGuildTemplate } from "../../types/templates/modify_guild_template.ts";
 import { DiscordTemplate } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
@@ -11,7 +12,7 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
 export async function editGuildTemplate(
   guildId: string,
   templateCode: string,
-  data: EditGuildTemplate,
+  data: ModifyGuildTemplate,
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);