roles

src/helpers/roles/add_role.ts

@@ -25,11 +25,9 @@ export async function addRole(
 
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = await rest.runMethod(
+  return await rest.runMethod<undefined>(
     "put",
     endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId),
     { reason },
   );
-
-  return result;
 }

src/helpers/roles/create_role.ts

@@ -2,7 +2,7 @@ import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
 import { CreateGuildRole } from "../../types/guilds/create_guild_role.ts";
-import { DiscordRole } from "../../types/permissions/role.ts";
+import { Role } from "../../types/permissions/role.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   calculateBits,
@@ -17,7 +17,7 @@ export async function createRole(
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result: DiscordRole = await rest.runMethod(
+  const result = await rest.runMethod<Role>(
     "post",
     endpoints.GUILD_ROLES(guildId),
     {
@@ -34,5 +34,6 @@ export async function createRole(
   const guild = await cacheHandlers.get("guilds", guildId);
   guild?.roles.set(role.id, role);
 
+  // TODO: ADD TO CACHE?
   return role;
 }

src/helpers/roles/delete_role.ts

@@ -6,10 +6,8 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts";
 export async function deleteRole(guildId: string, id: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = await rest.runMethod(
+  return await rest.runMethod<undefined>(
     "delete",
     endpoints.GUILD_ROLE(guildId, id),
   );
-
-  return result;
 }

src/helpers/roles/edit_role.ts

@@ -1,5 +1,6 @@
 import { rest } from "../../rest/rest.ts";
-import { CreateGuildRole } from "../../types/mod.ts";
+import { structures } from "../../structures/mod.ts";
+import { CreateGuildRole, Role } from "../../types/mod.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   calculateBits,
@@ -14,7 +15,7 @@ export async function editRole(
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = await rest.runMethod(
+  const result = await rest.runMethod<Role>(
     "patch",
     endpoints.GUILD_ROLE(guildId, id),
     {
@@ -25,5 +26,5 @@ export async function editRole(
     },
   );
 
-  return result;
+  return await structures.createDiscordenoRole(result);
 }

src/helpers/roles/get_roles.ts

@@ -1,9 +1,8 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordRole, Role } from "../../types/permissions/role.ts";
+import { Role } from "../../types/permissions/role.ts";
 import { Collection } from "../../util/collection.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Returns a list of role objects for the guild.
  *
@@ -12,12 +11,14 @@ import { snakeKeysToCamelCase } from "../../util/utils.ts";
 export async function getRoles(guildId: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = (await rest.runMethod(
+  const result = await rest.runMethod<Role[]>(
     "get",
     endpoints.GUILD_ROLES(guildId),
-  )) as DiscordRole[];
+  );
+
+  // TODO: addToCache
 
   return new Collection(
-    result.map((role) => [role.id, snakeKeysToCamelCase<Role>(role)]),
+    result.map((role) => [role.id, role]),
   );
 }

src/helpers/roles/remove_role.ts

@@ -27,11 +27,9 @@ export async function removeRole(
 
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = await rest.runMethod(
+  return await rest.runMethod<undefined>(
     "delete",
     endpoints.GUILD_MEMBER_ROLE(guildId, memberId, roleId),
     { reason },
   );
-
-  return result;
 }