From 3153487b513b954ea48ea46ea499a7e6bba9b486 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 12 Apr 2021 23:01:39 +0400
Subject: [PATCH] nothin'

---
 src/helpers/invites/create_invite.ts | 17 +++--------------
 src/helpers/invites/delete_invite.ts |  9 +++++++--
 src/helpers/invites/get_invite.ts    |  9 +++++++--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/helpers/invites/create_invite.ts b/src/helpers/invites/create_invite.ts
index 83c9f273a..3aae2e41b 100644
--- a/src/helpers/invites/create_invite.ts
+++ b/src/helpers/invites/create_invite.ts
@@ -1,27 +1,16 @@
 import { rest } from "../../rest/rest.ts";
+import { InviteCreate } from "../../types/invites/invite_create.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotChannelPermissions } from "../../util/permissions.ts";
 
 /** Creates a new invite for this channel. Requires CREATE_INSTANT_INVITE */
 export async function createInvite(
   channelId: string,
-  options: CreateInviteOptions,
+  options: InviteCreate,
 ) {
   await requireBotChannelPermissions(channelId, ["CREATE_INSTANT_INVITE"]);
 
-  if (options.max_age && (options.max_age > 604800 || options.max_age < 0)) {
-    console.log(
-      `The max age for invite created in ${channelId} was not between 0-604800. Using default values instead.`,
-    );
-    options.max_age = undefined;
-  }
-
-  if (options.max_uses && (options.max_uses > 100 || options.max_uses < 0)) {
-    console.log(
-      `The max uses for invite created in ${channelId} was not between 0-100. Using default values instead.`,
-    );
-    options.max_uses = undefined;
-  }
+  // TODO: add proper options validation
 
   const result = await rest.runMethod(
     "post",
diff --git a/src/helpers/invites/delete_invite.ts b/src/helpers/invites/delete_invite.ts
index 643cbdde9..a0e9cead8 100644
--- a/src/helpers/invites/delete_invite.ts
+++ b/src/helpers/invites/delete_invite.ts
@@ -1,11 +1,13 @@
 import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
+import { DiscordInvite, Invite } from "../../types/invites/invite.ts";
 import { Errors } from "../../types/misc/errors.ts";
 import { endpoints } from "../../util/constants.ts";
 import {
   botHasChannelPermissions,
   requireBotGuildPermissions,
 } from "../../util/permissions.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Deletes an invite for the given code. Requires `MANAGE_CHANNELS` or `MANAGE_GUILD` permission */
 export async function deleteInvite(channelId: string, inviteCode: string) {
@@ -21,7 +23,10 @@ export async function deleteInvite(channelId: string, inviteCode: string) {
     await requireBotGuildPermissions(channel!.guildId, ["MANAGE_GUILD"]);
   }
 
-  const result = await rest.runMethod("delete", endpoints.INVITE(inviteCode));
+  const result: DiscordInvite = await rest.runMethod(
+    "delete",
+    endpoints.INVITE(inviteCode),
+  );
 
-  return result as InvitePayload;
+  return snakeKeysToCamelCase<Invite>(result);
 }
diff --git a/src/helpers/invites/get_invite.ts b/src/helpers/invites/get_invite.ts
index a55eaa458..68ec7158d 100644
--- a/src/helpers/invites/get_invite.ts
+++ b/src/helpers/invites/get_invite.ts
@@ -1,9 +1,14 @@
 import { rest } from "../../rest/rest.ts";
+import { DiscordInvite, Invite } from "../../types/invites/invite.ts";
 import { endpoints } from "../../util/constants.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Returns an invite for the given code. */
 export async function getInvite(inviteCode: string) {
-  const result = await rest.runMethod("get", endpoints.INVITE(inviteCode));
+  const result: DiscordInvite = await rest.runMethod(
+    "get",
+    endpoints.INVITE(inviteCode),
+  );
 
-  return result as InvitePayload;
+  return snakeKeysToCamelCase<Invite>(result);
 }