From 3ce5871eb921cec409df21af375722e386555608 Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Mon, 12 Apr 2021 18:22:47 +0000
Subject: [PATCH] fix: few more typings errors

---
 src/handlers/messages/MESSAGE_CREATE.ts         | 6 +++---
 src/helpers/members/edit_member.ts              | 3 ++-
 src/helpers/webhooks/edit_webhook.ts            | 9 ++++++---
 src/helpers/webhooks/edit_webhook_message.ts    | 2 +-
 src/helpers/webhooks/edit_webhook_with_token.ts | 3 ++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/handlers/messages/MESSAGE_CREATE.ts b/src/handlers/messages/MESSAGE_CREATE.ts
index 6738476fa..ba084b5ee 100644
--- a/src/handlers/messages/MESSAGE_CREATE.ts
+++ b/src/handlers/messages/MESSAGE_CREATE.ts
@@ -7,7 +7,7 @@ import { DiscordMessage, Message } from "../../types/messages/message.ts";
 import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 export async function handleMessageCreate(data: DiscordGatewayPayload) {
-  const payload: Message = snakeKeysToCamelCase(data.d as DiscordMessage);
+  const payload = snakeKeysToCamelCase(data.d as DiscordMessage) as Message;
   const channel = await cacheHandlers.get("channels", payload.channelId);
   if (channel) channel.lastMessageId = payload.id;
 
@@ -34,13 +34,13 @@ export async function handleMessageCreate(data: DiscordGatewayPayload) {
 
       return cacheHandlers.set(
         "members",
-        discordenoMember.id,
+        mention.id,
         discordenoMember,
       );
     }
   }));
 
-  const message = await structures.createDiscordenoMessage(payload);
+  const message = await structures.createDiscordenoMessage(data.d as DiscordMessage);
   // Cache the message
   await cacheHandlers.set("messages", payload.id, message);
 
diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts
index a849b4653..45d2327dd 100644
--- a/src/helpers/members/edit_member.ts
+++ b/src/helpers/members/edit_member.ts
@@ -9,6 +9,7 @@ import {
   requireBotChannelPermissions,
   requireBotGuildPermissions,
 } from "../../util/permissions.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Edit the member */
 export async function editMember(
@@ -72,7 +73,7 @@ export async function editMember(
     endpoints.GUILD_MEMBER(guildId, memberId),
     options,
   ) as DiscordGuildMember;
-  const member = await structures.createDiscordenoMember(result, guildId);
+  const member = await structures.createDiscordenoMember(snakeKeysToCamelCase(result), guildId);
 
   return member;
 }
diff --git a/src/helpers/webhooks/edit_webhook.ts b/src/helpers/webhooks/edit_webhook.ts
index 5b6b9afbf..99018e94d 100644
--- a/src/helpers/webhooks/edit_webhook.ts
+++ b/src/helpers/webhooks/edit_webhook.ts
@@ -1,12 +1,15 @@
 import { rest } from "../../rest/rest.ts";
+import { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts";
+import { Webhook, DiscordWebhook } from "../../types/webhooks/webhook.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Edit a webhook. Requires the `MANAGE_WEBHOOKS` permission. Returns the updated webhook object on success. */
 export async function editWebhook(
   channelId: string,
   webhookId: string,
-  options: WebhookEditOptions,
+  options: ModifyWebhook
 ) {
   await requireBotChannelPermissions(channelId, ["MANAGE_WEBHOOKS"]);
 
@@ -16,8 +19,8 @@ export async function editWebhook(
     {
       ...options,
       channel_id: options.channelId,
-    },
+    }
   );
 
-  return result as WebhookPayload;
+  return snakeKeysToCamelCase(result as DiscordWebhook) as Webhook;
 }
diff --git a/src/helpers/webhooks/edit_webhook_message.ts b/src/helpers/webhooks/edit_webhook_message.ts
index 1d3d99d39..f83fb2eec 100644
--- a/src/helpers/webhooks/edit_webhook_message.ts
+++ b/src/helpers/webhooks/edit_webhook_message.ts
@@ -22,7 +22,7 @@ export async function editWebhookMessage(
 
   if (options.allowedMentions) {
     if (options.allowedMentions.users?.length) {
-      if (options.allowedMentions.parse.includes("users")) {
+      if (options.allowedMentions.parse.includes(DiscordAllowedMentionsTypes.UserMentions)) {
         options.allowedMentions.parse = options.allowedMentions.parse.filter(
           (p) => p !== "users"
         );
diff --git a/src/helpers/webhooks/edit_webhook_with_token.ts b/src/helpers/webhooks/edit_webhook_with_token.ts
index 6a1e7e877..5b10e324d 100644
--- a/src/helpers/webhooks/edit_webhook_with_token.ts
+++ b/src/helpers/webhooks/edit_webhook_with_token.ts
@@ -1,4 +1,5 @@
 import { rest } from "../../rest/rest.ts";
+import { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts";
 import { Webhook } from "../../types/webhooks/webhook.ts";
 import { endpoints } from "../../util/constants.ts";
 import { snakeKeysToCamelCase } from "../../util/utils.ts";
@@ -7,7 +8,7 @@ import { snakeKeysToCamelCase } from "../../util/utils.ts";
 export async function editWebhookWithToken(
   webhookId: string,
   webhookToken: string,
-  options: Omit<WebhookEditOptions, "channelId">,
+  options: Omit<ModifyWebhook, "channelId">,
 ) {
   const result = await rest.runMethod(
     "patch",