From 23a4c0f864e91f99bf2a7cdcc82bbe22ecc72f93 Mon Sep 17 00:00:00 2001
From: ITOH <72305210+itohatweb@users.noreply.github.com>
Date: Thu, 15 Apr 2021 18:09:40 +0200
Subject: [PATCH] removed templatestruct

---
 .../templates/create_guild_template.ts        |  8 +--
 .../templates/delete_guild_template.ts        | 10 ++--
 src/helpers/templates/edit_guild_template.ts  | 10 ++--
 src/helpers/templates/get_guild_templates.ts  |  8 +--
 src/helpers/templates/get_template.ts         | 11 ++--
 src/helpers/templates/sync_guild_template.ts  | 10 ++--
 src/structures/mod.ts                         |  2 -
 src/structures/template.ts                    | 53 -------------------
 8 files changed, 28 insertions(+), 84 deletions(-)
 delete mode 100644 src/structures/template.ts

diff --git a/src/helpers/templates/create_guild_template.ts b/src/helpers/templates/create_guild_template.ts
index bcb02f290..6bc726bbe 100644
--- a/src/helpers/templates/create_guild_template.ts
+++ b/src/helpers/templates/create_guild_template.ts
@@ -1,8 +1,8 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
 import { DiscordTemplate, 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 +24,11 @@ export async function createGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template = (await rest.runMethod(
+  const template = await rest.runMethod<DiscordTemplate>(
     "post",
     endpoints.GUILD_TEMPLATES(guildId),
     data,
-  )) as DiscordTemplate;
+  );
 
-  return structures.createTemplateStruct(template);
+  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/delete_guild_template.ts b/src/helpers/templates/delete_guild_template.ts
index 171350d60..cfbcbc6a9 100644
--- a/src/helpers/templates/delete_guild_template.ts
+++ b/src/helpers/templates/delete_guild_template.ts
@@ -1,8 +1,8 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
-import { DiscordTemplate } from "../../types/templates/template.ts";
+import { DiscordTemplate, 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 +14,10 @@ export async function deleteGuildTemplate(
 ) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const deletedTemplate = (await rest.runMethod(
+  const deletedTemplate = await rest.runMethod<DiscordTemplate>(
     "delete",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
-  )) as DiscordTemplate;
+  );
 
-  return structures.createTemplateStruct(deletedTemplate);
+  return snakeKeysToCamelCase<Template>(deletedTemplate);
 }
diff --git a/src/helpers/templates/edit_guild_template.ts b/src/helpers/templates/edit_guild_template.ts
index b1a82a0a3..746dc4d12 100644
--- a/src/helpers/templates/edit_guild_template.ts
+++ b/src/helpers/templates/edit_guild_template.ts
@@ -1,9 +1,9 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
 import { ModifyGuildTemplate } from "../../types/templates/modify_guild_template.ts";
-import { DiscordTemplate } from "../../types/templates/template.ts";
+import { DiscordTemplate, 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 +24,11 @@ export async function editGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template = (await rest.runMethod(
+  const template = await rest.runMethod<DiscordTemplate>(
     "patch",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
     data,
-  )) as DiscordTemplate;
+  );
 
-  return structures.createTemplateStruct(template);
+  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/get_guild_templates.ts b/src/helpers/templates/get_guild_templates.ts
index 1a2ad579d..d0f5c372a 100644
--- a/src/helpers/templates/get_guild_templates.ts
+++ b/src/helpers/templates/get_guild_templates.ts
@@ -1,9 +1,9 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
+import { DiscordTemplate, 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 { DiscordTemplate } from "../../types/templates/template.ts";
-import { Collection } from "../../util/collection.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Returns an array of templates.
@@ -20,7 +20,7 @@ export async function getGuildTemplates(guildId: string) {
   return new Collection(
     templates.map((template) => [
       template.code,
-      structures.createTemplateStruct(template),
+      snakeKeysToCamelCase<Template>(template),
     ]),
   );
 }
diff --git a/src/helpers/templates/get_template.ts b/src/helpers/templates/get_template.ts
index 1c41af8a1..7aa7d9574 100644
--- a/src/helpers/templates/get_template.ts
+++ b/src/helpers/templates/get_template.ts
@@ -1,15 +1,14 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
+import { DiscordTemplate, Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
-import { DiscordTemplate } from "../../types/templates/template.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /** Returns the guild template if it exists */
 export async function getTemplate(templateCode: string) {
-  const result = (await rest.runMethod(
+  const template = await rest.runMethod<DiscordTemplate>(
     "get",
     endpoints.GUILD_TEMPLATE(templateCode),
-  ) as DiscordTemplate);
-  const template = await structures.createTemplateStruct(result);
+  );
 
-  return template;
+  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/helpers/templates/sync_guild_template.ts b/src/helpers/templates/sync_guild_template.ts
index a0c84495e..c46738883 100644
--- a/src/helpers/templates/sync_guild_template.ts
+++ b/src/helpers/templates/sync_guild_template.ts
@@ -1,8 +1,8 @@
 import { rest } from "../../rest/rest.ts";
-import { structures } from "../../structures/mod.ts";
+import { DiscordTemplate, Template } from "../../types/templates/template.ts";
 import { endpoints } from "../../util/constants.ts";
 import { requireBotGuildPermissions } from "../../util/permissions.ts";
-import { DiscordTemplate } from "../../types/templates/template.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
 /**
  * Syncs the template to the guild's current state.
@@ -11,10 +11,10 @@ import { DiscordTemplate } from "../../types/templates/template.ts";
 export async function syncGuildTemplate(guildId: string, templateCode: string) {
   await requireBotGuildPermissions(guildId, ["MANAGE_GUILD"]);
 
-  const template = (await rest.runMethod(
+  const template = await rest.runMethod<DiscordTemplate>(
     "put",
     `${endpoints.GUILD_TEMPLATES(guildId)}/${templateCode}`,
-  )) as DiscordTemplate;
+  );
 
-  return structures.createTemplateStruct(template);
+  return snakeKeysToCamelCase<Template>(template);
 }
diff --git a/src/structures/mod.ts b/src/structures/mod.ts
index 22f8340c3..e883f17d7 100644
--- a/src/structures/mod.ts
+++ b/src/structures/mod.ts
@@ -3,7 +3,6 @@ import { createDiscordenoGuild } from "./guild.ts";
 import { createDiscordenoMember } from "./member.ts";
 import { createDiscordenoMessage } from "./message.ts";
 import { createDiscordenoRole } from "./role.ts";
-import { createTemplateStruct } from "./template.ts";
 
 /** This is the placeholder where the structure creation functions are kept. */
 export let structures = {
@@ -12,7 +11,6 @@ export let structures = {
   createDiscordenoMember,
   createDiscordenoMessage,
   createDiscordenoRole,
-  createTemplateStruct,
 };
 
 // export type { Channel, Guild, Member, Message, Role, Template };
diff --git a/src/structures/template.ts b/src/structures/template.ts
deleted file mode 100644
index 22c0f9911..000000000
--- a/src/structures/template.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { eventHandlers } from "../bot.ts";
-import { cache } from "../cache.ts";
-import { DiscordTemplate, Template } from "../types/templates/template.ts";
-import { createNewProp } from "../util/utils.ts";
-import { DiscordenoGuild } from "./guild.ts";
-
-const baseTemplate: Partial<DiscordenoTemplate> = {
-  get sourceGuild() {
-    // deno-lint-ignore getter-return
-    if (!this.sourceGuildId) return;
-    return cache.guilds.get(this.sourceGuildId);
-  },
-};
-
-export function createTemplateStruct(
-  data: DiscordTemplate,
-) {
-  const {
-    usage_count: usageCount,
-    creator_id: creatorId,
-    created_at: createdAt,
-    updated_at: updatedAt,
-    source_guild_id: sourceGuildId,
-    serialized_source_guild: serializedSourceGuild,
-    is_dirty: isDirty,
-    ...rest
-  } = data;
-
-  const restProps: Record<string, Partial<PropertyDescriptor>> = {};
-  for (const key of Object.keys(rest)) {
-    eventHandlers.debug?.(
-      "loop",
-      `Running for of loop in createTemplateStruct function.`,
-    );
-    // @ts-ignore index signature
-    restProps[key] = createNewProp(rest[key]);
-  }
-
-  return Object.create(baseTemplate, {
-    ...restProps,
-    usageCount: createNewProp(sourceGuildId),
-    creatorId: createNewProp(creatorId),
-    createdAt: createNewProp(createdAt),
-    updatedAt: createNewProp(updatedAt),
-    sourceGuildId: createNewProp(sourceGuildId),
-    serializedSourceGuild: createNewProp(serializedSourceGuild),
-    isDirty: createNewProp(isDirty),
-  }) as DiscordenoTemplate;
-}
-
-export interface DiscordenoTemplate extends Template {
-  sourceGuild?: DiscordenoGuild;
-}