From 973ec219cc9cae8efadbc7230d935a1022abbffd Mon Sep 17 00:00:00 2001
From: ITOH <72305210+itohatweb@users.noreply.github.com>
Date: Sat, 24 Apr 2021 19:42:11 +0200
Subject: [PATCH] templates

---
 src/helpers/templates/create_guild_from_template.ts | 8 ++++----
 src/helpers/templates/create_guild_template.ts      | 7 ++-----
 src/helpers/templates/delete_guild_template.ts      | 7 ++-----
 src/helpers/templates/edit_guild_template.ts        | 7 ++-----
 src/helpers/templates/get_guild_templates.ts        | 9 ++++-----
 src/helpers/templates/get_template.ts               | 7 ++-----
 src/helpers/templates/sync_guild_template.ts        | 7 ++-----
 7 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/helpers/templates/create_guild_from_template.ts b/src/helpers/templates/create_guild_from_template.ts
index 92399604c..770f71299 100644
--- a/src/helpers/templates/create_guild_from_template.ts
+++ b/src/helpers/templates/create_guild_from_template.ts
@@ -3,7 +3,7 @@ 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 { snakeKeysToCamelCase, urlToBase64 } from "../../util/utils.ts";
+import { urlToBase64 } from "../../util/utils.ts";
 
 /**
  * Create a new guild based on a template
@@ -23,11 +23,11 @@ export async function createGuildFromTemplate(
     data.icon = await urlToBase64(data.icon);
   }
 
-  const result = await rest.runMethod(
+  // TODO: discordeno guild?
+
+  return await rest.runMethod<Guild>(
     "post",
     endpoints.GUILD_TEMPLATE(templateCode),
     data,
   );
-
-  return snakeKeysToCamelCase<Guild>(result);
 }
diff --git a/src/helpers/templates/create_guild_template.ts b/src/helpers/templates/create_guild_template.ts
index 6bc726bbe..a66d8f069 100644
--- a/src/helpers/templates/create_guild_template.ts
+++ b/src/helpers/templates/create_guild_template.ts
@@ -1,8 +1,7 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Creates a template for the guild.
@@ -24,11 +23,9 @@ export async function createGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template = await rest.runMethod<DiscordTemplate>(
+  return await rest.runMethod<Template>(
     "post",
     endpoints.GUILD_TEMPLATES(guildId),
     data,
   );
-
-  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/delete_guild_template.ts b/src/helpers/templates/delete_guild_template.ts
index cfbcbc6a9..a587fde2c 100644
--- a/src/helpers/templates/delete_guild_template.ts
+++ b/src/helpers/templates/delete_guild_template.ts
@@ -1,8 +1,7 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Deletes a template from a guild.
@@ -14,10 +13,8 @@ export async function deleteGuildTemplate(
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const deletedTemplate = await rest.runMethod<DiscordTemplate>(
+  return await rest.runMethod<Template>(
     "delete",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
   );
-
-  return snakeKeysToCamelCase<Template>(deletedTemplate);
 }
diff --git a/src/helpers/templates/edit_guild_template.ts b/src/helpers/templates/edit_guild_template.ts
index 746dc4d12..fc90ad2ad 100644
--- a/src/helpers/templates/edit_guild_template.ts
+++ b/src/helpers/templates/edit_guild_template.ts
@@ -1,9 +1,8 @@
 import { rest } from "../../rest/rest.ts";
 import { ModifyGuildTemplate } from "../../types/templates/modify_guild_template.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Edit a template's metadata.
@@ -24,11 +23,9 @@ export async function editGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template = await rest.runMethod<DiscordTemplate>(
+  return await rest.runMethod<Template>(
     "patch",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
     data,
   );
-
-  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/get_guild_templates.ts b/src/helpers/templates/get_guild_templates.ts
index d0f5c372a..b94f08115 100644
--- a/src/helpers/templates/get_guild_templates.ts
+++ b/src/helpers/templates/get_guild_templates.ts
@@ -1,9 +1,8 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.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 an array of templates.
@@ -12,15 +11,15 @@ import { snakeKeysToCamelCase } from "../../util/utils.ts";
 export async function getGuildTemplates(guildId: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const templates = (await rest.runMethod(
+  const templates = await rest.runMethod<Template[]>(
     "get",
     endpoints.GUILD_TEMPLATES(guildId),
-  )) as DiscordTemplate[];
+  );
 
   return new Collection(
     templates.map((template) => [
       template.code,
-      snakeKeysToCamelCase<Template>(template),
+      template,
     ]),
   );
 }
diff --git a/src/helpers/templates/get_template.ts b/src/helpers/templates/get_template.ts
index 7aa7d9574..41213e967 100644
--- a/src/helpers/templates/get_template.ts
+++ b/src/helpers/templates/get_template.ts
@@ -1,14 +1,11 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Returns the guild template if it exists */
 export async function getTemplate(templateCode: string) {
-  const template = await rest.runMethod<DiscordTemplate>(
+  return await rest.runMethod<Template>(
     "get",
     endpoints.GUILD_TEMPLATE(templateCode),
   );
-
-  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/sync_guild_template.ts b/src/helpers/templates/sync_guild_template.ts
index c46738883..19ab2e070 100644
--- a/src/helpers/templates/sync_guild_template.ts
+++ b/src/helpers/templates/sync_guild_template.ts
@@ -1,8 +1,7 @@
 import { rest } from "../../rest/rest.ts";
-import { DiscordTemplate, Template } from "../../types/templates/template.ts";
+import { Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Syncs the template to the guild's current state.
@@ -11,10 +10,8 @@ import { snakeKeysToCamelCase } from "../../util/utils.ts";
 export async function syncGuildTemplate(guildId: string, templateCode: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const template = await rest.runMethod<DiscordTemplate>(
+  return await rest.runMethod<Template>(
     "put",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
   );
-
-  return snakeKeysToCamelCase<Template>(template);
 }