From 9d5d0f0872c202402186eeb64dd42dd68fd5a4a6 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 12 Apr 2021 22:29:21 +0400
Subject: [PATCH] some moar fixes lol

---
 src/helpers/misc/get_user.ts     |  7 +++++--
 src/helpers/roles/create_role.ts | 24 ++++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/helpers/misc/get_user.ts b/src/helpers/misc/get_user.ts
index 1b2ea2bda..254779a7f 100644
--- a/src/helpers/misc/get_user.ts
+++ b/src/helpers/misc/get_user.ts
@@ -1,9 +1,12 @@
 import { rest } from "../../rest/rest.ts";
+import { DiscordUser } from "../../types/users/user.ts";
+import { User } from "../../types/users/user.ts";
 import { endpoints } from "../../util/constants.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** This function will return the raw user payload in the rare cases you need to fetch a user directly from the API. */
 export async function getUser(userId: string) {
-  const result = await rest.runMethod("get", endpoints.USER(userId));
+  const result: User = await rest.runMethod("get", endpoints.USER(userId));
 
-  return result as UserPayload;
+  return snakeKeysToCamelCase<DiscordUser>(result);
 }
diff --git a/src/helpers/roles/create_role.ts b/src/helpers/roles/create_role.ts
index e5e52b6ca..b8cdf1079 100644
--- a/src/helpers/roles/create_role.ts
+++ b/src/helpers/roles/create_role.ts
@@ -1,6 +1,8 @@
 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 { endpoints } from "../../util/constants.ts";
 import {
   calculateBits,
@@ -10,19 +12,25 @@ import {
 /** Create a new role for the guild. Requires the MANAGE_ROLES permission. */
 export async function createRole(
   guildId: string,
-  options: CreateRoleOptions,
+  options: CreateGuildRole,
   reason?: string,
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_ROLES"]);
 
-  const result = await rest.runMethod("post", endpoints.GUILD_ROLES(guildId), {
-    ...options,
-    permissions: calculateBits(options?.permissions || []),
-    reason,
-  });
+  const result: DiscordRole = await rest.runMethod(
+    "post",
+    endpoints.GUILD_ROLES(guildId),
+    {
+      ...options,
+      permissions: calculateBits(options?.permissions || []),
+      reason,
+    },
+  );
 
-  const roleData = result as RoleData;
-  const role = await structures.createDiscordenoRole({role: roleData, guild_id: guildId});
+  const role = await structures.createDiscordenoRole({
+    role: result,
+    guild_id: guildId,
+  });
   const guild = await cacheHandlers.get("guilds", guildId);
   guild?.roles.set(role.id, role);