From f9fddf7621a619860ddc681aa41604b535878561 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Fri, 13 Nov 2020 22:53:54 +0400
Subject: [PATCH 01/27] =?UTF-8?q?Server=20Templates=20=F0=9F=8E=89?=
 =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/handlers/guild.ts | 28 ++++++++++++++++++++++++++++
 src/types/guild.ts    | 27 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 47385b112..8db3f76ea 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -622,3 +622,31 @@ export function getGuild(guildID: string, counts = true) {
     { with_counts: counts },
   ) as Promise<UpdateGuildPayload>;
 }
+
+/** 
+ * Get a template by its code
+ * @param code The code of the template
+ */
+export function getTemplate(code: string) {
+  const endpoint = `${endpoints.GUILDS}/templates/${code}`;
+  return RequestManager.get(endpoint);
+}
+
+/**
+ * Create a new guild based on a template.
+ * NOTE: This endpoint can be used only by bots in less than 10 guilds.
+ * @param code the code of the template to create a new guild from
+ * @param name name of the guild (2-100 characters)
+ * @param icon base64 128x128 image for the guild icon
+ */
+export function createGuildFromTemplate(
+  code: string,
+  name: string,
+  icon?: any,
+) {
+  const endpoint = `${endpoints.GUILDS}/templates/${code}`;
+  return RequestManager.post(endpoint, {
+    name,
+    icon,
+  });
+}
diff --git a/src/types/guild.ts b/src/types/guild.ts
index 7bcd4991e..e1a903fe7 100644
--- a/src/types/guild.ts
+++ b/src/types/guild.ts
@@ -1,3 +1,4 @@
+import { Guild } from "../structures/guild.ts";
 import { ChannelCreatePayload, ChannelTypes } from "./channel.ts";
 import { Emoji, StatusType } from "./discord.ts";
 import { MemberCreatePayload } from "./member.ts";
@@ -606,3 +607,29 @@ export interface CreateServerOptions {
   /** the id of the channel where guild notices such as welcome messages and boost events are posted */
   system_channel_id?: string;
 }
+
+// https://discord.com/developers/docs/resources/template#template-object
+export interface GuildTemplate {
+  /** the template code (unique ID) */
+  code: string;
+  /** template name */
+  name: string;
+  /** the description for the template */
+  description: string | null;
+  /** number of times this template has been used */
+  usage_count: number;
+  /** the ID of the user who created the template */
+  creator_id: string;
+  /** the user who created the template */
+  user: UserPayload;
+  /** when this template was created */
+  created_at: string;
+  /** when this template was last synced to the source guild */
+  updated_at: string;
+  /** the ID of the guild this template is based on */
+  source_guild_id: string;
+  /** the guild snapshot this template contains */
+  serialized_source_guild: Guild;
+  /** whether the template has unsynced changes */
+  is_dirty: boolean | null;
+}

From 985a4358f91071ba3e116e39edb303202c78c78d Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Fri, 13 Nov 2020 23:41:41 +0400
Subject: [PATCH 02/27] Rename GuildTemplate interface to Template

---
 src/types/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/guild.ts b/src/types/guild.ts
index e1a903fe7..b3d64044a 100644
--- a/src/types/guild.ts
+++ b/src/types/guild.ts
@@ -609,7 +609,7 @@ export interface CreateServerOptions {
 }
 
 // https://discord.com/developers/docs/resources/template#template-object
-export interface GuildTemplate {
+export interface Template {
   /** the template code (unique ID) */
   code: string;
   /** template name */

From 1f2c5853de273d2599f7fda24833800eaa06e265 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 00:10:13 +0400
Subject: [PATCH 03/27] =?UTF-8?q?=F0=9F=8E=89=20Server=20Templates=20?=
 =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/discord.ts |   3 ++
 src/handlers/guild.ts    | 101 ++++++++++++++++++++++++++++++++-------
 2 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/src/constants/discord.ts b/src/constants/discord.ts
index fa334574b..3cf526388 100644
--- a/src/constants/discord.ts
+++ b/src/constants/discord.ts
@@ -89,6 +89,9 @@ export const endpoints = {
     `${baseEndpoints.CDN_URL}/splashes/${id}/${icon}`,
   GUILD_VANITY_URL: (id: string) => `${GUILDS_BASE(id)}/vanity-url`,
   GUILD_WEBHOOKS: (id: string) => `${GUILDS_BASE(id)}/webhooks`,
+  GUILD_TEMPLATE: (code: string) =>
+    `${baseEndpoints.BASE_URL}/guilds/templates/${code}`,
+  GUILD_TEMPLATES: (id: string) => `${GUILDS_BASE(id)}/templates`,
 
   WEBHOOK: (id: string, token: string) =>
     `${baseEndpoints.BASE_URL}/webhooks/${id}/${token}`,
diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 8db3f76ea..e3919cd22 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -623,30 +623,99 @@ export function getGuild(guildID: string, counts = true) {
   ) as Promise<UpdateGuildPayload>;
 }
 
-/** 
- * Get a template by its code
- * @param code The code of the template
+/**
+ * Returns the guild template if it exists
+ * @param guildID The ID of the guild
+ * @param code The code of the template to get
  */
-export function getTemplate(code: string) {
-  const endpoint = `${endpoints.GUILDS}/templates/${code}`;
+export function getGuildTemplate(guildID: string, code: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
   return RequestManager.get(endpoint);
 }
 
 /**
- * Create a new guild based on a template.
+ * Create a new guild based on a template
  * NOTE: This endpoint can be used only by bots in less than 10 guilds.
- * @param code the code of the template to create a new guild from
- * @param name name of the guild (2-100 characters)
- * @param icon base64 128x128 image for the guild icon
+ * @param code The code of the template to create a guild from
  */
 export function createGuildFromTemplate(
   code: string,
-  name: string,
-  icon?: any,
+  data: CreateGuildFromTemplate,
 ) {
-  const endpoint = `${endpoints.GUILDS}/templates/${code}`;
-  return RequestManager.post(endpoint, {
-    name,
-    icon,
-  });
+  return RequestManager.post(endpoints.GUILD_TEMPLATE(code), data);
+}
+
+export interface CreateGuildFromTemplate {
+  /** name of the guild (2-100 characters) */
+  name: string;
+  /** base64 128x128 image for the guild icon */
+  icon?: string;
+}
+
+/**
+ * Returns an array of guild templates
+ * @param guildID The ID of the guild
+ */
+export function getGuildTemplates(guildID: string) {
+  return RequestManager.get(endpoints.GUILD_TEMPLATES(guildID));
+}
+
+/**
+ * Deletes a template from a guild
+ * @param guildID The guild ID to delete the template from
+ */
+export function deleteGuildTemplate(guildID: string, code: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+  return RequestManager.delete(endpoint);
+}
+
+/**
+ * Creates a template for the guild
+ * @param guildID The ID of the guild to create a template in
+ * @param name name of the template (1-100 characters)
+ * @param description description for the template (0-120 characters
+ */
+export function createGuildTemplate(
+  guildID: string,
+  data: CreateGuildTemplate,
+) {
+  return RequestManager.post(endpoints.GUILD_TEMPLATES(guildID), data);
+}
+
+export interface CreateGuildTemplate {
+  /** name of the template (1-100 characters) */
+  name: string;
+  /** description for the template (0-120 characters) */
+  description?: string | null;
+}
+
+/**
+ * Syncs the template to the guild's current state
+ * @param guildID The ID of the guild
+ * @param code The code of the template to sync
+ */
+export function syncGuildTemplate(guildID: string, code: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+  return RequestManager.put(endpoint);
+}
+
+/**
+ * Edit a template's metadata
+ * @param guildID The ID of the guild
+ * @param code The code of the template to edit
+ */
+export function editGuildTemplate(
+  guildID: string,
+  code: string,
+  data: EditGuildTemplate,
+) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+  return RequestManager.patch(endpoint, data);
+}
+
+export interface EditGuildTemplate {
+  /** name of the template (1-100 characters) */
+  name?: string;
+  /** description for the template (0-120 characters) */
+  description?: string | null;
 }

From dd60de628c011c295453d8dfa1d32267148d593d Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 00:41:25 +0400
Subject: [PATCH 04/27] Rename code parameter to templateCode to reduce
 ambiguity

---
 src/handlers/guild.ts | 49 +++++++++++++------------------------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index e3919cd22..979492b63 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -623,26 +623,21 @@ export function getGuild(guildID: string, counts = true) {
   ) as Promise<UpdateGuildPayload>;
 }
 
-/**
- * Returns the guild template if it exists
- * @param guildID The ID of the guild
- * @param code The code of the template to get
- */
-export function getGuildTemplate(guildID: string, code: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+/** Returns the guild template if it exists */
+export function getGuildTemplate(guildID: string, templateCode: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
   return RequestManager.get(endpoint);
 }
 
 /**
  * Create a new guild based on a template
  * NOTE: This endpoint can be used only by bots in less than 10 guilds.
- * @param code The code of the template to create a guild from
  */
 export function createGuildFromTemplate(
-  code: string,
+  templateCode: string,
   data: CreateGuildFromTemplate,
 ) {
-  return RequestManager.post(endpoints.GUILD_TEMPLATE(code), data);
+  return RequestManager.post(endpoints.GUILD_TEMPLATE(templateCode), data);
 }
 
 export interface CreateGuildFromTemplate {
@@ -652,20 +647,14 @@ export interface CreateGuildFromTemplate {
   icon?: string;
 }
 
-/**
- * Returns an array of guild templates
- * @param guildID The ID of the guild
- */
+/** Returns an array of guild templates */
 export function getGuildTemplates(guildID: string) {
   return RequestManager.get(endpoints.GUILD_TEMPLATES(guildID));
 }
 
-/**
- * Deletes a template from a guild
- * @param guildID The guild ID to delete the template from
- */
-export function deleteGuildTemplate(guildID: string, code: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+/** Deletes a template from a guild */
+export function deleteGuildTemplate(guildID: string, templateCode: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
   return RequestManager.delete(endpoint);
 }
 
@@ -689,27 +678,19 @@ export interface CreateGuildTemplate {
   description?: string | null;
 }
 
-/**
- * Syncs the template to the guild's current state
- * @param guildID The ID of the guild
- * @param code The code of the template to sync
- */
-export function syncGuildTemplate(guildID: string, code: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+/** Syncs the template to the guild's current state */
+export function syncGuildTemplate(guildID: string, templateCode: string) {
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
   return RequestManager.put(endpoint);
 }
 
-/**
- * Edit a template's metadata
- * @param guildID The ID of the guild
- * @param code The code of the template to edit
- */
+/** Edit a template's metadata */
 export function editGuildTemplate(
   guildID: string,
-  code: string,
+  templateCode: string,
   data: EditGuildTemplate,
 ) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${code}`;
+  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
   return RequestManager.patch(endpoint, data);
 }
 

From 9c5031259f7bf89b496e4190579389f5e8f86d7a Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 10:43:08 +0400
Subject: [PATCH 05/27] Embed endpoint into function instead of assigning to
 var

---
 src/handlers/guild.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 979492b63..df17cff35 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -625,8 +625,9 @@ export function getGuild(guildID: string, counts = true) {
 
 /** Returns the guild template if it exists */
 export function getGuildTemplate(guildID: string, templateCode: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
-  return RequestManager.get(endpoint);
+  return RequestManager.get(
+    `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
+  );
 }
 
 /**
@@ -654,8 +655,9 @@ export function getGuildTemplates(guildID: string) {
 
 /** Deletes a template from a guild */
 export function deleteGuildTemplate(guildID: string, templateCode: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
-  return RequestManager.delete(endpoint);
+  return RequestManager.delete(
+    `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
+  );
 }
 
 /**
@@ -680,8 +682,9 @@ export interface CreateGuildTemplate {
 
 /** Syncs the template to the guild's current state */
 export function syncGuildTemplate(guildID: string, templateCode: string) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
-  return RequestManager.put(endpoint);
+  return RequestManager.put(
+    `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
+  );
 }
 
 /** Edit a template's metadata */
@@ -690,8 +693,10 @@ export function editGuildTemplate(
   templateCode: string,
   data: EditGuildTemplate,
 ) {
-  const endpoint = `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`;
-  return RequestManager.patch(endpoint, data);
+  return RequestManager.patch(
+    `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
+    data,
+  );
 }
 
 export interface EditGuildTemplate {

From d31cf09c64a2927c22e2979b7b128026a1c43c12 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 10:44:58 +0400
Subject: [PATCH 06/27] Better types for getGuildTemplate()

---
 src/handlers/guild.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index df17cff35..1d227f79d 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -24,6 +24,7 @@ import {
   PositionSwap,
   PruneOptions,
   PrunePayload,
+  Template,
   UpdateGuildPayload,
   UserPayload,
 } from "../types/guild.ts";
@@ -624,10 +625,13 @@ export function getGuild(guildID: string, counts = true) {
 }
 
 /** Returns the guild template if it exists */
-export function getGuildTemplate(guildID: string, templateCode: string) {
+export function getGuildTemplate(
+  guildID: string,
+  templateCode: string,
+): Promise<Template> {
   return RequestManager.get(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  );
+  ) as any;
 }
 
 /**

From 087f1f1df70ae90bf7f36c7fe1157e165006cd04 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 11:06:44 +0400
Subject: [PATCH 07/27] Add permission-checking

---
 src/handlers/guild.ts | 97 ++++++++++++++++++++++++++++++-------------
 src/types/guild.ts    | 21 ++++++++++
 2 files changed, 90 insertions(+), 28 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 1d227f79d..2fb0db114 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -14,9 +14,12 @@ import {
   BanOptions,
   ChannelCreateOptions,
   CreateEmojisOptions,
+  CreateGuildFromTemplate,
+  CreateGuildTemplate,
   CreateRoleOptions,
   CreateServerOptions,
   EditEmojisOptions,
+  EditGuildTemplate,
   EditIntegrationOptions,
   FetchMembersOptions,
   GetAuditLogsOptions,
@@ -32,6 +35,7 @@ import { MemberCreatePayload } from "../types/member.ts";
 import { Intents } from "../types/options.ts";
 import { Permissions } from "../types/permission.ts";
 import { RoleData } from "../types/role.ts";
+import { cache } from "../utils/cache.ts";
 import { formatImageURL } from "../utils/cdn.ts";
 import { Collection } from "../utils/collection.ts";
 import { botHasPermission, calculateBits } from "../utils/permissions.ts";
@@ -638,27 +642,47 @@ export function getGuildTemplate(
  * Create a new guild based on a template
  * NOTE: This endpoint can be used only by bots in less than 10 guilds.
  */
-export function createGuildFromTemplate(
+export async function createGuildFromTemplate(
   templateCode: string,
   data: CreateGuildFromTemplate,
-) {
-  return RequestManager.post(endpoints.GUILD_TEMPLATE(templateCode), data);
-}
+): Promise<Guild> {
+  if (cache.guilds.size >= 10) {
+    throw new Error(
+      "This function can only be used by bots in less than 10 guilds.",
+    );
+  }
 
-export interface CreateGuildFromTemplate {
-  /** name of the guild (2-100 characters) */
-  name: string;
-  /** base64 128x128 image for the guild icon */
-  icon?: string;
+  if (data.icon) {
+    data.icon = await urlToBase64(data.icon);
+  }
+
+  try {
+    const guild = RequestManager.post(
+      endpoints.GUILD_TEMPLATE(templateCode),
+      data,
+    ) as any;
+    return guild;
+  } catch (error) {
+    throw error;
+  }
 }
 
 /** Returns an array of guild templates */
-export function getGuildTemplates(guildID: string) {
+export async function getGuildTemplates(guildID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
+
   return RequestManager.get(endpoints.GUILD_TEMPLATES(guildID));
 }
 
 /** Deletes a template from a guild */
-export function deleteGuildTemplate(guildID: string, templateCode: string) {
+export async function deleteGuildTemplate(
+  guildID: string,
+  templateCode: string,
+) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
+
   return RequestManager.delete(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
   );
@@ -670,42 +694,59 @@ export function deleteGuildTemplate(guildID: string, templateCode: string) {
  * @param name name of the template (1-100 characters)
  * @param description description for the template (0-120 characters
  */
-export function createGuildTemplate(
+export async function createGuildTemplate(
   guildID: string,
   data: CreateGuildTemplate,
 ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
+
+  if (data.name.length < 1 || data.name.length > 100) {
+    throw new Error("The name can only be in between 1-100 characters.");
+  }
+
+  if (
+    data.description?.length &&
+    data.description.length > 120
+  ) {
+    throw new Error("The description can only be in between 0-120 characters.");
+  }
+
   return RequestManager.post(endpoints.GUILD_TEMPLATES(guildID), data);
 }
 
-export interface CreateGuildTemplate {
-  /** name of the template (1-100 characters) */
-  name: string;
-  /** description for the template (0-120 characters) */
-  description?: string | null;
-}
-
 /** Syncs the template to the guild's current state */
-export function syncGuildTemplate(guildID: string, templateCode: string) {
+export async function syncGuildTemplate(guildID: string, templateCode: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
+
   return RequestManager.put(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
   );
 }
 
 /** Edit a template's metadata */
-export function editGuildTemplate(
+export async function editGuildTemplate(
   guildID: string,
   templateCode: string,
   data: EditGuildTemplate,
 ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
+
+  if (data.name?.length && (data.name.length < 1 || data.name.length > 100)) {
+    throw new Error("The name can only be in between 1-100 characters.");
+  }
+
+  if (
+    data.description?.length &&
+    data.description.length > 120
+  ) {
+    throw new Error("The description can only be in between 0-120 characters.");
+  }
+
   return RequestManager.patch(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
     data,
   );
 }
-
-export interface EditGuildTemplate {
-  /** name of the template (1-100 characters) */
-  name?: string;
-  /** description for the template (0-120 characters) */
-  description?: string | null;
-}
diff --git a/src/types/guild.ts b/src/types/guild.ts
index b3d64044a..96402bd89 100644
--- a/src/types/guild.ts
+++ b/src/types/guild.ts
@@ -633,3 +633,24 @@ export interface Template {
   /** whether the template has unsynced changes */
   is_dirty: boolean | null;
 }
+
+export interface CreateGuildFromTemplate {
+  /** name of the guild (2-100 characters) */
+  name: string;
+  /** base64 128x128 image for the guild icon */
+  icon?: string;
+}
+
+export interface CreateGuildTemplate {
+  /** name of the template (1-100 characters) */
+  name: string;
+  /** description for the template (0-120 characters) */
+  description?: string;
+}
+
+export interface EditGuildTemplate {
+  /** name of the template (1-100 characters) */
+  name?: string;
+  /** description for the template (0-120 characters) */
+  description?: string;
+}

From 1ead67238650d2c4e70d4f9e8a6b509d01e60117 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 11:28:08 +0400
Subject: [PATCH 08/27] New template structure

---
 src/handlers/guild.ts      | 58 +++++++++++++++++++++++++++-----------
 src/structures/mod.ts      |  2 ++
 src/structures/template.ts | 31 ++++++++++++++++++++
 src/types/guild.ts         |  2 +-
 4 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 src/structures/template.ts

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 2fb0db114..8612d300f 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -6,6 +6,7 @@ import { requestAllMembers } from "../module/shardingManager.ts";
 import { Guild } from "../structures/guild.ts";
 import { Member } from "../structures/member.ts";
 import { structures } from "../structures/mod.ts";
+import { Template } from "../structures/template.ts";
 import { ImageFormats, ImageSize } from "../types/cdn.ts";
 import { ChannelCreatePayload, ChannelTypes } from "../types/channel.ts";
 import { Errors } from "../types/errors.ts";
@@ -15,6 +16,7 @@ import {
   ChannelCreateOptions,
   CreateEmojisOptions,
   CreateGuildFromTemplate,
+  CreateGuildPayload,
   CreateGuildTemplate,
   CreateRoleOptions,
   CreateServerOptions,
@@ -24,10 +26,10 @@ import {
   FetchMembersOptions,
   GetAuditLogsOptions,
   GuildEditOptions,
+  GuildTemplate,
   PositionSwap,
   PruneOptions,
   PrunePayload,
-  Template,
   UpdateGuildPayload,
   UserPayload,
 } from "../types/guild.ts";
@@ -645,7 +647,7 @@ export function getGuildTemplate(
 export async function createGuildFromTemplate(
   templateCode: string,
   data: CreateGuildFromTemplate,
-): Promise<Guild> {
+) {
   if (cache.guilds.size >= 10) {
     throw new Error(
       "This function can only be used by bots in less than 10 guilds.",
@@ -657,7 +659,7 @@ export async function createGuildFromTemplate(
   }
 
   try {
-    const guild = RequestManager.post(
+    const guild: CreateGuildPayload = await RequestManager.post(
       endpoints.GUILD_TEMPLATE(templateCode),
       data,
     ) as any;
@@ -667,15 +669,24 @@ export async function createGuildFromTemplate(
   }
 }
 
-/** Returns an array of guild templates */
+/**
+ * Returns an array of templates.
+ * Requires the `MANAGE_GUILD` permission.
+ */
 export async function getGuildTemplates(guildID: string) {
   const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
   if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
 
-  return RequestManager.get(endpoints.GUILD_TEMPLATES(guildID));
+  const templates = await RequestManager.get(
+    endpoints.GUILD_TEMPLATES(guildID),
+  ) as GuildTemplate[];
+  return templates.map((template) => structures.createTemplate(template));
 }
 
-/** Deletes a template from a guild */
+/**
+ * Deletes a template from a guild.
+ * Requires the `MANAGE_GUILD` permission.
+ */
 export async function deleteGuildTemplate(
   guildID: string,
   templateCode: string,
@@ -683,14 +694,15 @@ export async function deleteGuildTemplate(
   const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
   if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
 
-  return RequestManager.delete(
+  const deletedTemplate: GuildTemplate = await RequestManager.delete(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  );
+  ) as any;
+  return structures.createTemplate(deletedTemplate);
 }
 
 /**
- * Creates a template for the guild
- * @param guildID The ID of the guild to create a template in
+ * Creates a template for the guild.
+ * Requires the `MANAGE_GUILD` permission.
  * @param name name of the template (1-100 characters)
  * @param description description for the template (0-120 characters
  */
@@ -712,20 +724,31 @@ export async function createGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  return RequestManager.post(endpoints.GUILD_TEMPLATES(guildID), data);
+  const template = await RequestManager.post(
+    endpoints.GUILD_TEMPLATES(guildID),
+    data,
+  ) as GuildTemplate;
+  return structures.createTemplate(template);
 }
 
-/** Syncs the template to the guild's current state */
+/**
+ * Syncs the template to the guild's current state.
+ * Requires the `MANAGE_GUILD` permission.
+ */
 export async function syncGuildTemplate(guildID: string, templateCode: string) {
   const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
   if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
 
-  return RequestManager.put(
+  const template: GuildTemplate = await RequestManager.put(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  );
+  ) as any;
+  return structures.createTemplate(template);
 }
 
-/** Edit a template's metadata */
+/**
+ * Edit a template's metadata.
+ * Requires the `MANAGE_GUILD` permission.
+ */
 export async function editGuildTemplate(
   guildID: string,
   templateCode: string,
@@ -745,8 +768,9 @@ export async function editGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  return RequestManager.patch(
+  const template: GuildTemplate = await RequestManager.patch(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
     data,
-  );
+  ) as any;
+  return structures.createTemplate(template);
 }
diff --git a/src/structures/mod.ts b/src/structures/mod.ts
index d69713721..abbdea3b7 100644
--- a/src/structures/mod.ts
+++ b/src/structures/mod.ts
@@ -3,6 +3,7 @@ import { createGuild } from "./guild.ts";
 import { createMember } from "./member.ts";
 import { createMessage } from "./message.ts";
 import { createRole } from "./role.ts";
+import { createTemplate } from "./template.ts";
 
 /** This is the placeholder where the structure creation functions are kept. */
 export let structures = {
@@ -11,6 +12,7 @@ export let structures = {
   createMember,
   createMessage,
   createRole,
+  createTemplate,
 };
 
 export type Structures = typeof structures;
diff --git a/src/structures/template.ts b/src/structures/template.ts
new file mode 100644
index 000000000..59d84a99a
--- /dev/null
+++ b/src/structures/template.ts
@@ -0,0 +1,31 @@
+import { GuildTemplate } from "../types/guild.ts";
+
+export function createTemplate(
+  data: GuildTemplate,
+) {
+  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 template = {
+    ...rest,
+    usageCount,
+    creatorID,
+    createdAt,
+    updatedAt,
+    sourceGuildID,
+    serializedSourceGuild,
+    isDirty,
+  };
+
+  return template;
+}
+
+export interface Template extends ReturnType<typeof createTemplate> {}
diff --git a/src/types/guild.ts b/src/types/guild.ts
index 96402bd89..315d03454 100644
--- a/src/types/guild.ts
+++ b/src/types/guild.ts
@@ -609,7 +609,7 @@ export interface CreateServerOptions {
 }
 
 // https://discord.com/developers/docs/resources/template#template-object
-export interface Template {
+export interface GuildTemplate {
   /** the template code (unique ID) */
   code: string;
   /** template name */

From 357f2d06a4e0326809c0a2651f76c563f8399fce Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 14:23:59 +0400
Subject: [PATCH 09/27] Idk

---
 src/types/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/guild.ts b/src/types/guild.ts
index 315d03454..905bee298 100644
--- a/src/types/guild.ts
+++ b/src/types/guild.ts
@@ -652,5 +652,5 @@ export interface EditGuildTemplate {
   /** name of the template (1-100 characters) */
   name?: string;
   /** description for the template (0-120 characters) */
-  description?: string;
+  description?: string | null;
 }

From d88bbf266af11c0b03b210361dc39e9a9866512a Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 15:02:14 +0400
Subject: [PATCH 10/27] Convert Retry-After to ms

---
 src/module/requestManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/module/requestManager.ts b/src/module/requestManager.ts
index ee96700da..36c5b1aa6 100644
--- a/src/module/requestManager.ts
+++ b/src/module/requestManager.ts
@@ -365,7 +365,7 @@ function processHeaders(url: string, headers: Headers) {
 
   // If there is no remaining global limit, we save it in cache
   if (global) {
-    const reset = Date.now() + Number(retryAfter);
+    const reset = Date.now() + (Number(retryAfter) * 1000);
     eventHandlers.debug?.(
       { type: "globallyRateLimited", data: { url, reset } },
     );

From e86658ad2a98b4f663ce644cf66eb3de731af90e Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:31:41 +0400
Subject: [PATCH 11/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 8612d300f..d0d08103a 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -634,7 +634,7 @@ export function getGuild(guildID: string, counts = true) {
 export function getGuildTemplate(
   guildID: string,
   templateCode: string,
-): Promise<Template> {
+) {
   return RequestManager.get(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
   ) as any;

From dfba8ec8afaeaf292d84f661f3921cf635f753b4 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:31:54 +0400
Subject: [PATCH 12/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index d0d08103a..079cb1184 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -637,7 +637,7 @@ export function getGuildTemplate(
 ) {
   return RequestManager.get(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  ) as any;
+  ) as Promise<Template>;
 }
 
 /**

From 873a20d89da0467e8afb1db694d339655d37e000 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:33:02 +0400
Subject: [PATCH 13/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 079cb1184..49c8eaceb 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -694,7 +694,7 @@ export async function deleteGuildTemplate(
   const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
   if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
 
-  const deletedTemplate: GuildTemplate = await RequestManager.delete(
+  const deletedTemplate = await RequestManager.delete(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
   ) as any;
   return structures.createTemplate(deletedTemplate);

From de6696aa8395091e0c6c2fc8f4f103e542fc4cbb Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:33:13 +0400
Subject: [PATCH 14/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 49c8eaceb..d962aecfd 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -696,7 +696,7 @@ export async function deleteGuildTemplate(
 
   const deletedTemplate = await RequestManager.delete(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  ) as any;
+  ) as GuildTemplate;
   return structures.createTemplate(deletedTemplate);
 }
 

From 0efa33d00d94a44ffc569ec6fb75317973c02eb8 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:33:23 +0400
Subject: [PATCH 15/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index d962aecfd..5e6c8d9d5 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -741,7 +741,7 @@ export async function syncGuildTemplate(guildID: string, templateCode: string) {
 
   const template: GuildTemplate = await RequestManager.put(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
-  ) as any;
+  ) as GuildTemplate;
   return structures.createTemplate(template);
 }
 

From 2c2c2e95e4d4b4727d7aea06544487c835aaa2fa Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:33:34 +0400
Subject: [PATCH 16/27] Update src/handlers/guild.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 5e6c8d9d5..d7e9763d2 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -739,7 +739,7 @@ export async function syncGuildTemplate(guildID: string, templateCode: string) {
   const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
   if (!hasPerm) throw new Error(Errors.MISSING_MANAGE_GUILD);
 
-  const template: GuildTemplate = await RequestManager.put(
+  const template = await RequestManager.put(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
   ) as GuildTemplate;
   return structures.createTemplate(template);

From 8bb9095a748bb2c7f9e48fa290e5954435e7c118 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 16:36:09 +0400
Subject: [PATCH 17/27] Suggestions

---
 src/handlers/guild.ts | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index d7e9763d2..bcc8f60a6 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -658,15 +658,11 @@ export async function createGuildFromTemplate(
     data.icon = await urlToBase64(data.icon);
   }
 
-  try {
-    const guild: CreateGuildPayload = await RequestManager.post(
-      endpoints.GUILD_TEMPLATE(templateCode),
-      data,
-    ) as any;
-    return guild;
-  } catch (error) {
-    throw error;
-  }
+  const guild = await RequestManager.post(
+    endpoints.GUILD_TEMPLATE(templateCode),
+    data,
+  ) as Promise<CreateGuildPayload>;
+  return guild;
 }
 
 /**
@@ -768,9 +764,9 @@ export async function editGuildTemplate(
     throw new Error("The description can only be in between 0-120 characters.");
   }
 
-  const template: GuildTemplate = await RequestManager.patch(
+  const template = await RequestManager.patch(
     `${endpoints.GUILD_TEMPLATES(guildID)}/${templateCode}`,
     data,
-  ) as any;
+  ) as GuildTemplate;
   return structures.createTemplate(template);
 }

From 223ee10bc3b8a6df854920179e2d12489400e8ae Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 17:00:16 +0400
Subject: [PATCH 18/27] Add size() to cacheHandlers

---
 src/controllers/cache.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controllers/cache.ts b/src/controllers/cache.ts
index 55829c14a..ca984bcfe 100644
--- a/src/controllers/cache.ts
+++ b/src/controllers/cache.ts
@@ -93,6 +93,11 @@ export let cacheHandlers = {
     return cache[table].has(key);
   },
 
+  /** Get the number of key-value pairs */
+  size: (table: TableName) => {
+    return cache[table].size;
+  },
+
   // Done differently to have overloads
   /** Add a key value pair to the cache */
   set,

From 8d7157cc60bb175a15d43300c5bf81b30ae49372 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 17:18:28 +0400
Subject: [PATCH 19/27] Use cacheHandler instead of cache

---
 src/handlers/guild.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index bcc8f60a6..fc2f9a872 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -37,7 +37,6 @@ import { MemberCreatePayload } from "../types/member.ts";
 import { Intents } from "../types/options.ts";
 import { Permissions } from "../types/permission.ts";
 import { RoleData } from "../types/role.ts";
-import { cache } from "../utils/cache.ts";
 import { formatImageURL } from "../utils/cdn.ts";
 import { Collection } from "../utils/collection.ts";
 import { botHasPermission, calculateBits } from "../utils/permissions.ts";
@@ -648,7 +647,7 @@ export async function createGuildFromTemplate(
   templateCode: string,
   data: CreateGuildFromTemplate,
 ) {
-  if (cache.guilds.size >= 10) {
+  if (cacheHandlers.size("guilds") >= 10) {
     throw new Error(
       "This function can only be used by bots in less than 10 guilds.",
     );

From 3583ad16c53b2d2e1f91a24df8aaca0d24010d29 Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Sat, 14 Nov 2020 08:26:58 -0500
Subject: [PATCH 20/27] Update src/handlers/guild.ts

---
 src/handlers/guild.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index fc2f9a872..3ad18fae8 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -647,7 +647,7 @@ export async function createGuildFromTemplate(
   templateCode: string,
   data: CreateGuildFromTemplate,
 ) {
-  if (cacheHandlers.size("guilds") >= 10) {
+  if (await cacheHandlers.size("guilds") >= 10) {
     throw new Error(
       "This function can only be used by bots in less than 10 guilds.",
     );

From f40530ab9a39c3831d921735ced3c83c363f555b Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Sat, 14 Nov 2020 08:41:37 -0500
Subject: [PATCH 21/27] Update cache.ts

---
 src/controllers/cache.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/cache.ts b/src/controllers/cache.ts
index ca984bcfe..a0588c6ac 100644
--- a/src/controllers/cache.ts
+++ b/src/controllers/cache.ts
@@ -94,7 +94,7 @@ export let cacheHandlers = {
   },
 
   /** Get the number of key-value pairs */
-  size: (table: TableName) => {
+  size: async (table: TableName) => {
     return cache[table].size;
   },
 

From ead9bc7baa156bf48a38771ec4e8c377ba811b6c Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sat, 14 Nov 2020 19:28:49 +0400
Subject: [PATCH 22/27] Resolve promise for all instances of botHasPermission()

---
 src/handlers/guild.ts | 194 ++++++++++++++++++++++--------------------
 1 file changed, 104 insertions(+), 90 deletions(-)

diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 3ad18fae8..793a0d997 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -104,7 +104,11 @@ export async function createGuildChannel(
   name: string,
   options?: ChannelCreateOptions,
 ) {
-  if (!botHasPermission(guild.id, [Permissions.MANAGE_CHANNELS])) {
+  const hasPerm = await botHasPermission(
+    guild.id,
+    [Permissions.MANAGE_CHANNELS],
+  );
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_CHANNELS);
   }
 
@@ -133,12 +137,16 @@ export async function createGuildChannel(
 }
 
 /** Delete a channel in your server. Bot needs MANAGE_CHANNEL permissions in the server. */
-export function deleteChannel(
+export async function deleteChannel(
   guildID: string,
   channelID: string,
   reason?: string,
 ) {
-  if (!botHasPermission(guildID, [Permissions.MANAGE_CHANNELS])) {
+  const hasPerm = await botHasPermission(
+    guildID,
+    [Permissions.MANAGE_CHANNELS],
+  );
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_CHANNELS);
   }
 
@@ -230,9 +238,8 @@ export async function createEmoji(
   image: string,
   options: CreateEmojisOptions,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_EMOJIS])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_EMOJIS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_EMOJIS);
   }
 
@@ -248,16 +255,16 @@ export async function createEmoji(
 }
 
 /** Modify the given emoji. Requires the MANAGE_EMOJIS permission. */
-export function editEmoji(
+export async function editEmoji(
   guildID: string,
   id: string,
   options: EditEmojisOptions,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_EMOJIS])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_EMOJIS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_EMOJIS);
   }
+
   return RequestManager.patch(endpoints.GUILD_EMOJI(guildID, id), {
     name: options.name,
     roles: options.roles,
@@ -265,12 +272,16 @@ export function editEmoji(
 }
 
 /** Delete the given emoji. Requires the MANAGE_EMOJIS permission. Returns 204 No Content on success. */
-export function deleteEmoji(guildID: string, id: string, reason?: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_EMOJIS])
-  ) {
+export async function deleteEmoji(
+  guildID: string,
+  id: string,
+  reason?: string,
+) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_EMOJIS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_EMOJIS);
   }
+
   return RequestManager.delete(
     endpoints.GUILD_EMOJI(guildID, id),
     { reason },
@@ -288,11 +299,11 @@ export async function createGuildRole(
   options: CreateRoleOptions,
   reason?: string,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   const result = await RequestManager.post(
     endpoints.GUILD_ROLES(guildID),
     {
@@ -314,16 +325,16 @@ export async function createGuildRole(
 }
 
 /** Edit a guild role. Requires the MANAGE_ROLES permission. */
-export function editRole(
+export async function editRole(
   guildID: string,
   id: string,
   options: CreateRoleOptions,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   return RequestManager.patch(endpoints.GUILD_ROLE(guildID, id), {
     ...options,
     permissions: options.permissions
@@ -333,12 +344,12 @@ export function editRole(
 }
 
 /** Delete a guild role. Requires the MANAGE_ROLES permission. */
-export function deleteRole(guildID: string, id: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
-  ) {
+export async function deleteRole(guildID: string, id: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   return RequestManager.delete(endpoints.GUILD_ROLE(guildID, id));
 }
 
@@ -346,22 +357,22 @@ export function deleteRole(guildID: string, id: string) {
 *
 * ⚠️ **If you need this, you are probably doing something wrong. This is not intended for use. Your roles will be cached in your guild.**
 */
-export function getRoles(guildID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
-  ) {
+export async function getRoles(guildID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   return RequestManager.get(endpoints.GUILD_ROLES(guildID));
 }
 
 /** Modify the positions of a set of role objects for the guild. Requires the MANAGE_ROLES permission. */
-export function swapRoles(guildID: string, rolePositons: PositionSwap) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
-  ) {
+export async function swapRoles(guildID: string, rolePositons: PositionSwap) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   return RequestManager.patch(endpoints.GUILD_ROLES(guildID), rolePositons);
 }
 
@@ -370,9 +381,9 @@ export async function getPruneCount(guildID: string, options: PruneOptions) {
   if (options.days < 1) {
     throw new Error(Errors.PRUNE_MIN_DAYS);
   }
-  if (
-    !botHasPermission(guildID, [Permissions.KICK_MEMBERS])
-  ) {
+
+  const hasPerm = await botHasPermission(guildID, [Permissions.KICK_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_KICK_MEMBERS);
   }
 
@@ -385,13 +396,13 @@ export async function getPruneCount(guildID: string, options: PruneOptions) {
 }
 
 /** Begin pruning all members in the given time period */
-export function pruneMembers(guildID: string, options: PruneOptions) {
+export async function pruneMembers(guildID: string, options: PruneOptions) {
   if (options.days < 1) {
     throw new Error(Errors.PRUNE_MIN_DAYS);
   }
-  if (
-    !botHasPermission(guildID, [Permissions.KICK_MEMBERS])
-  ) {
+
+  const hasPerm = await botHasPermission(guildID, [Permissions.KICK_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_KICK_MEMBERS);
   }
 
@@ -412,8 +423,12 @@ export function fetchMembers(guild: Guild, options?: FetchMembersOptions) {
 }
 
 /** Returns the audit logs for the guild. Requires VIEW AUDIT LOGS permission */
-export function getAuditLogs(guildID: string, options: GetAuditLogsOptions) {
-  if (!botHasPermission(guildID, [Permissions.VIEW_AUDIT_LOG])) {
+export async function getAuditLogs(
+  guildID: string,
+  options: GetAuditLogsOptions,
+) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.VIEW_AUDIT_LOG]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_VIEW_AUDIT_LOG);
   }
 
@@ -426,26 +441,26 @@ export function getAuditLogs(guildID: string, options: GetAuditLogsOptions) {
 }
 
 /** Returns the guild embed object. Requires the MANAGE_GUILD permission. */
-export function getEmbed(guildID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+export async function getEmbed(guildID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.get(endpoints.GUILD_EMBED(guildID));
 }
 
 /** Modify a guild embed object for the guild. Requires the MANAGE_GUILD permission. */
-export function editEmbed(
+export async function editEmbed(
   guildID: string,
   enabled: boolean,
   channelID?: string | null,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.patch(
     endpoints.GUILD_EMBED(guildID),
     { enabled, channel_id: channelID },
@@ -458,26 +473,26 @@ export function getVanityURL(guildID: string) {
 }
 
 /** Returns a list of integrations for the guild. Requires the MANAGE_GUILD permission. */
-export function getIntegrations(guildID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+export async function getIntegrations(guildID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.get(endpoints.GUILD_INTEGRATIONS(guildID));
 }
 
 /** Modify the behavior and settings of an integration object for the guild. Requires the MANAGE_GUILD permission. */
-export function editIntegration(
+export async function editIntegration(
   guildID: string,
   id: string,
   options: EditIntegrationOptions,
 ) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.patch(
     endpoints.GUILD_INTEGRATION(guildID, id),
     options,
@@ -485,30 +500,29 @@ export function editIntegration(
 }
 
 /** Delete the attached integration object for the guild with this id. Requires MANAGE_GUILD permission. */
-export function deleteIntegration(guildID: string, id: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+export async function deleteIntegration(guildID: string, id: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.delete(endpoints.GUILD_INTEGRATION(guildID, id));
 }
 
 /** Sync an integration. Requires the MANAGE_GUILD permission. */
-export function syncIntegration(guildID: string, id: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+export async function syncIntegration(guildID: string, id: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.post(endpoints.GUILD_INTEGRATION_SYNC(guildID, id));
 }
 
 /** Returns a list of ban objects for the users banned from this guild. Requires the BAN_MEMBERS permission. */
 export async function getBans(guildID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.BAN_MEMBERS])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.BAN_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_BAN_MEMBERS);
   }
 
@@ -522,10 +536,9 @@ export async function getBans(guildID: string) {
 }
 
 /** Returns a ban object for the given user or a 404 not found if the ban cannot be found. Requires the BAN_MEMBERS permission. */
-export function getBan(guildID: string, memberID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.BAN_MEMBERS])
-  ) {
+export async function getBan(guildID: string, memberID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.BAN_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_BAN_MEMBERS);
   }
 
@@ -535,10 +548,9 @@ export function getBan(guildID: string, memberID: string) {
 }
 
 /** Ban a user from the guild and optionally delete previous messages sent by the user. Requires the BAN_MEMBERS permission. */
-export function ban(guildID: string, id: string, options: BanOptions) {
-  if (
-    !botHasPermission(guildID, [Permissions.BAN_MEMBERS])
-  ) {
+export async function ban(guildID: string, id: string, options: BanOptions) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.BAN_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_BAN_MEMBERS);
   }
 
@@ -549,10 +561,9 @@ export function ban(guildID: string, id: string, options: BanOptions) {
 }
 
 /** Remove the ban for a user. REquires BAN_MEMBERS permission */
-export function unban(guildID: string, id: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.BAN_MEMBERS])
-  ) {
+export async function unban(guildID: string, id: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.BAN_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_BAN_MEMBERS);
   }
   return RequestManager.delete(endpoints.GUILD_BAN(guildID, id));
@@ -560,9 +571,8 @@ export function unban(guildID: string, id: string) {
 
 /** Modify a guilds settings. Requires the MANAGE_GUILD permission. */
 export async function editGuild(guildID: string, options: GuildEditOptions) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
 
@@ -582,12 +592,12 @@ export async function editGuild(guildID: string, options: GuildEditOptions) {
 }
 
 /** Get all the invites for this guild. Requires MANAGE_GUILD permission */
-export function getInvites(guildID: string) {
-  if (
-    !botHasPermission(guildID, [Permissions.MANAGE_GUILD])
-  ) {
+export async function getInvites(guildID: string) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_GUILD]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_GUILD);
   }
+
   return RequestManager.get(endpoints.GUILD_INVITES(guildID));
 }
 
@@ -602,8 +612,12 @@ export function getVoiceRegions(guildID: string) {
 }
 
 /** Returns a list of guild webhooks objects. Requires the MANAGE_WEBHOOKs permission. */
-export function getWebhooks(guildID: string) {
-  if (!botHasPermission(guildID, [Permissions.MANAGE_WEBHOOKS])) {
+export async function getWebhooks(guildID: string) {
+  const hasPerm = await botHasPermission(
+    guildID,
+    [Permissions.MANAGE_WEBHOOKS],
+  );
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_WEBHOOKS);
   }
 

From ca9a3095f8fdff085e59b00dbcd5b34367e4be88 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Sun, 15 Nov 2020 22:22:27 +0400
Subject: [PATCH 23/27] Rename and move constants/discord.ts to
 utils/constants.ts

---
 src/handlers/channel.ts                          | 2 +-
 src/handlers/guild.ts                            | 2 +-
 src/handlers/member.ts                           | 2 +-
 src/handlers/message.ts                          | 2 +-
 src/handlers/webhook.ts                          | 2 +-
 src/module/client.ts                             | 2 +-
 src/module/requestManager.ts                     | 2 +-
 src/{constants/discord.ts => utils/constants.ts} | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{constants/discord.ts => utils/constants.ts} (100%)

diff --git a/src/handlers/channel.ts b/src/handlers/channel.ts
index b74965be7..261c228b9 100644
--- a/src/handlers/channel.ts
+++ b/src/handlers/channel.ts
@@ -1,4 +1,3 @@
-import { endpoints } from "../constants/discord.ts";
 import { cacheHandlers } from "../controllers/cache.ts";
 import { RequestManager } from "../module/requestManager.ts";
 import { structures } from "../structures/mod.ts";
@@ -17,6 +16,7 @@ import { Errors } from "../types/errors.ts";
 import { RawOverwrite } from "../types/guild.ts";
 import { MessageCreateOptions } from "../types/message.ts";
 import { Permissions } from "../types/permission.ts";
+import { endpoints } from "../utils/constants.ts";
 import { botHasChannelPermissions } from "../utils/permissions.ts";
 
 /** Checks if a channel overwrite for a user id or a role id has permission in this channel */
diff --git a/src/handlers/guild.ts b/src/handlers/guild.ts
index 793a0d997..29ae3cf75 100644
--- a/src/handlers/guild.ts
+++ b/src/handlers/guild.ts
@@ -1,4 +1,3 @@
-import { endpoints } from "../constants/discord.ts";
 import { cacheHandlers } from "../controllers/cache.ts";
 import { identifyPayload } from "../module/client.ts";
 import { RequestManager } from "../module/requestManager.ts";
@@ -39,6 +38,7 @@ import { Permissions } from "../types/permission.ts";
 import { RoleData } from "../types/role.ts";
 import { formatImageURL } from "../utils/cdn.ts";
 import { Collection } from "../utils/collection.ts";
+import { endpoints } from "../utils/constants.ts";
 import { botHasPermission, calculateBits } from "../utils/permissions.ts";
 import { urlToBase64 } from "../utils/utils.ts";
 
diff --git a/src/handlers/member.ts b/src/handlers/member.ts
index 0949e65a4..6b4e59d34 100644
--- a/src/handlers/member.ts
+++ b/src/handlers/member.ts
@@ -1,4 +1,3 @@
-import { endpoints } from "../constants/discord.ts";
 import { cacheHandlers } from "../controllers/cache.ts";
 import { botID } from "../module/client.ts";
 import { RequestManager } from "../module/requestManager.ts";
@@ -10,6 +9,7 @@ import { Errors } from "../types/errors.ts";
 import { EditMemberOptions } from "../types/member.ts";
 import { Permissions } from "../types/permission.ts";
 import { formatImageURL } from "../utils/cdn.ts";
+import { endpoints } from "../utils/constants.ts";
 import {
   botHasPermission,
   higherRolePosition,
diff --git a/src/handlers/message.ts b/src/handlers/message.ts
index f592568e0..f5f8f5971 100644
--- a/src/handlers/message.ts
+++ b/src/handlers/message.ts
@@ -1,5 +1,4 @@
 import { delay } from "../../deps.ts";
-import { endpoints } from "../constants/discord.ts";
 import { cacheHandlers } from "../controllers/cache.ts";
 import { botID } from "../module/client.ts";
 import { RequestManager } from "../module/requestManager.ts";
@@ -10,6 +9,7 @@ import { Errors } from "../types/errors.ts";
 import { UserPayload } from "../types/guild.ts";
 import { MessageCreateOptions } from "../types/message.ts";
 import { Permissions } from "../types/permission.ts";
+import { endpoints } from "../utils/constants.ts";
 import { botHasChannelPermissions } from "../utils/permissions.ts";
 
 /** Delete a message with the channel id and message id only. */
diff --git a/src/handlers/webhook.ts b/src/handlers/webhook.ts
index cc7365db7..12fae6e77 100644
--- a/src/handlers/webhook.ts
+++ b/src/handlers/webhook.ts
@@ -1,4 +1,3 @@
-import { endpoints } from "../constants/discord.ts";
 import { RequestManager } from "../module/requestManager.ts";
 import { structures } from "../structures/mod.ts";
 import { Errors } from "../types/errors.ts";
@@ -9,6 +8,7 @@ import {
   WebhookCreateOptions,
   WebhookPayload,
 } from "../types/webhook.ts";
+import { endpoints } from "../utils/constants.ts";
 import { botHasChannelPermissions } from "../utils/permissions.ts";
 import { urlToBase64 } from "../utils/utils.ts";
 
diff --git a/src/module/client.ts b/src/module/client.ts
index 01f311460..6b0104da3 100644
--- a/src/module/client.ts
+++ b/src/module/client.ts
@@ -1,6 +1,6 @@
-import { endpoints } from "../constants/discord.ts";
 import { DiscordBotGatewayData } from "../types/discord.ts";
 import { ClientOptions, EventHandlers } from "../types/options.ts";
+import { endpoints } from "../utils/constants.ts";
 import { RequestManager } from "./requestManager.ts";
 import { spawnShards } from "./shardingManager.ts";
 
diff --git a/src/module/requestManager.ts b/src/module/requestManager.ts
index 36c5b1aa6..4f9b7cf68 100644
--- a/src/module/requestManager.ts
+++ b/src/module/requestManager.ts
@@ -1,8 +1,8 @@
 import { delay } from "../../deps.ts";
-import { baseEndpoints } from "../constants/discord.ts";
 import { HttpResponseCode } from "../types/discord.ts";
 import { Errors } from "../types/errors.ts";
 import { RequestMethods } from "../types/fetch.ts";
+import { baseEndpoints } from "../utils/constants.ts";
 import { authorization, eventHandlers } from "./client.ts";
 
 const pathQueues: { [key: string]: QueuedRequest[] } = {};
diff --git a/src/constants/discord.ts b/src/utils/constants.ts
similarity index 100%
rename from src/constants/discord.ts
rename to src/utils/constants.ts

From 3cce7c2732d7f1d84d398f8ac5b141301381c2eb Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 16 Nov 2020 12:09:32 +0400
Subject: [PATCH 24/27] feat: overridable handlers

---
 src/handlers/mod.ts | 203 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 src/handlers/mod.ts

diff --git a/src/handlers/mod.ts b/src/handlers/mod.ts
new file mode 100644
index 000000000..e726c50ba
--- /dev/null
+++ b/src/handlers/mod.ts
@@ -0,0 +1,203 @@
+import {
+  channelOverwriteHasPermission,
+  createInvite,
+  deleteMessages,
+  editChannel,
+  followChannel,
+  getChannelInvites,
+  getChannelWebhooks,
+  getMessage,
+  getMessages,
+  getPins,
+  isChannelSynced,
+  sendMessage,
+} from "./channel.ts";
+import {
+  ban,
+  categoryChildrenIDs,
+  createEmoji,
+  createGuildChannel,
+  createGuildFromTemplate,
+  createGuildRole,
+  createGuildTemplate,
+  createServer,
+  deleteChannel,
+  deleteEmoji,
+  deleteGuildTemplate,
+  deleteIntegration,
+  deleteRole,
+  deleteServer,
+  editEmbed,
+  editEmoji,
+  editGuild,
+  editGuildTemplate,
+  editIntegration,
+  editRole,
+  emojiURL,
+  fetchMembers,
+  getAuditLogs,
+  getBan,
+  getBans,
+  getChannel,
+  getChannels,
+  getEmbed,
+  getGuild,
+  getGuildTemplate,
+  getGuildTemplates,
+  getIntegrations,
+  getInvites,
+  getMember,
+  getMembersByQuery,
+  getPruneCount,
+  getRoles,
+  getUser,
+  getVanityURL,
+  getVoiceRegions,
+  getWebhooks,
+  guildBannerURL,
+  guildIconURL,
+  guildSplashURL,
+  leaveGuild,
+  pruneMembers,
+  swapChannels,
+  swapRoles,
+  syncGuildTemplate,
+  syncIntegration,
+  unban,
+} from "./guild.ts";
+import {
+  addRole,
+  avatarURL,
+  editBotProfile,
+  editMember,
+  kick,
+  moveMember,
+  rawAvatarURL,
+  removeRole,
+  sendDirectMessage,
+} from "./member.ts";
+import {
+  addReaction,
+  addReactions,
+  deleteMessage,
+  deleteMessageByID,
+  editMessage,
+  getReactions,
+  pin,
+  publishMessage,
+  removeAllReactions,
+  removeReaction,
+  removeReactionEmoji,
+  removeUserReaction,
+  unpin,
+} from "./message.ts";
+import { createWebhook, executeWebhook, getWebhook } from "./webhook.ts";
+
+export let handlers = {
+  // Channel handler
+  channelOverwriteHasPermission,
+  createInvite,
+  deleteMessages,
+  editChannel,
+  followChannel,
+  getChannelInvites,
+  getChannelWebhooks,
+  getMessage,
+  getMessages,
+  getPins,
+  isChannelSynced,
+  sendMessage,
+
+  // Guild handler
+  ban,
+  categoryChildrenIDs,
+  createEmoji,
+  createGuildChannel,
+  createGuildFromTemplate,
+  createGuildRole,
+  createGuildTemplate,
+  createServer,
+  deleteChannel,
+  deleteEmoji,
+  deleteGuildTemplate,
+  deleteIntegration,
+  deleteRole,
+  deleteServer,
+  editEmbed,
+  editEmoji,
+  editGuild,
+  editGuildTemplate,
+  editIntegration,
+  editRole,
+  emojiURL,
+  fetchMembers,
+  getAuditLogs,
+  getBan,
+  getBans,
+  getChannel,
+  getChannels,
+  getEmbed,
+  getGuild,
+  getGuildTemplate,
+  getGuildTemplates,
+  getIntegrations,
+  getInvites,
+  getMember,
+  getMembersByQuery,
+  getPruneCount,
+  getRoles,
+  getUser,
+  getVanityURL,
+  getVoiceRegions,
+  getWebhooks,
+  guildBannerURL,
+  guildIconURL,
+  guildSplashURL,
+  leaveGuild,
+  pruneMembers,
+  swapChannels,
+  swapRoles,
+  syncGuildTemplate,
+  syncIntegration,
+  unban,
+
+  // Member handler
+  addRole,
+  avatarURL,
+  editBotProfile,
+  editMember,
+  kick,
+  moveMember,
+  rawAvatarURL,
+  removeRole,
+  sendDirectMessage,
+
+  // Message handler
+  addReaction,
+  addReactions,
+  deleteMessage,
+  deleteMessageByID,
+  editMessage,
+  getReactions,
+  pin,
+  publishMessage,
+  removeAllReactions,
+  removeReaction,
+  removeReactionEmoji,
+  removeUserReaction,
+  unpin,
+
+  // Webhook handler
+  createWebhook,
+  executeWebhook,
+  getWebhook,
+};
+
+export type Handlers = typeof handlers;
+
+export function updateHandlers(newHandlers: Handlers) {
+  handlers = {
+    ...handlers,
+    ...newHandlers,
+  };
+}

From 6446f1616142902ad21b292253becac403898073 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 16 Nov 2020 12:36:13 +0400
Subject: [PATCH 25/27] Better error messages for request manager

---
 src/module/requestManager.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/module/requestManager.ts b/src/module/requestManager.ts
index 36c5b1aa6..ff6b294cc 100644
--- a/src/module/requestManager.ts
+++ b/src/module/requestManager.ts
@@ -200,7 +200,7 @@ async function runMethod(
     },
   );
 
-  const errorStack = new Error("Location In Your Files:");
+  const errorStack = new Error("Location:");
   Error.captureStackTrace(errorStack);
 
   return new Promise((resolve, reject) => {
@@ -321,13 +321,25 @@ function handleStatusCode(response: Response, errorStack?: unknown) {
 
   switch (status) {
     case HttpResponseCode.BadRequest:
+      throw new Error(
+        "The request was improperly formatted, or the server couldn't understand it.",
+      );
     case HttpResponseCode.Unauthorized:
+      throw new Error("The Authorization header was missing or invalid.");
     case HttpResponseCode.Forbidden:
+      throw new Error(
+        "The Authorization token you passed did not have permission to the resource.",
+      );
     case HttpResponseCode.NotFound:
+      throw new Error("The resource at the location specified doesn't exist.");
     case HttpResponseCode.MethodNotAllowed:
-      throw new Error(Errors.REQUEST_CLIENT_ERROR);
+      throw new Error(
+        "The HTTP method used is not valid for the location specified.",
+      );
     case HttpResponseCode.GatewayUnavailable:
-      throw new Error(Errors.REQUEST_SERVER_ERROR);
+      throw new Error(
+        "There was not a gateway available to process your request. Wait a bit and retry.",
+      );
   }
 
   // left are all unknown

From f7609ad9cd90e6474c430578dc843c0e0a605da9 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 16 Nov 2020 17:35:31 +0400
Subject: [PATCH 26/27] Update src/handlers/mod.ts

Co-authored-by: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
---
 src/handlers/mod.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/handlers/mod.ts b/src/handlers/mod.ts
index e726c50ba..23ecc45b2 100644
--- a/src/handlers/mod.ts
+++ b/src/handlers/mod.ts
@@ -195,7 +195,7 @@ export let handlers = {
 
 export type Handlers = typeof handlers;
 
-export function updateHandlers(newHandlers: Handlers) {
+export function updateHandlers(newHandlers: Partial<Handlers>) {
   handlers = {
     ...handlers,
     ...newHandlers,

From 30d2ba3cf85d3f177b205161410cc4ab972dce45 Mon Sep 17 00:00:00 2001
From: ayntee <ayyantee@gmail.com>
Date: Mon, 16 Nov 2020 19:43:11 +0400
Subject: [PATCH 27/27] Resolve promises

---
 src/handlers/member.ts   | 67 +++++++++++++++++++++++++++++-----------
 src/utils/permissions.ts |  3 +-
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/src/handlers/member.ts b/src/handlers/member.ts
index 6b4e59d34..ad3aa8931 100644
--- a/src/handlers/member.ts
+++ b/src/handlers/member.ts
@@ -54,14 +54,19 @@ export async function addRole(
   reason?: string,
 ) {
   const botsHighestRole = await highestRole(guildID, botID);
-  if (
-    botsHighestRole &&
-    !higherRolePosition(guildID, botsHighestRole.id, roleID)
-  ) {
-    throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW);
+  if (botsHighestRole) {
+    const hasHigherRolePosition = await higherRolePosition(
+      guildID,
+      botsHighestRole.id,
+      roleID,
+    );
+    if (!hasHigherRolePosition) {
+      throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW);
+    }
   }
 
-  if (!botHasPermission(guildID, [Permissions.MANAGE_ROLES])) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
 
@@ -79,16 +84,23 @@ export async function removeRole(
   reason?: string,
 ) {
   const botsHighestRole = await highestRole(guildID, botID);
-  if (
-    botsHighestRole &&
-    !higherRolePosition(guildID, botsHighestRole.id, roleID)
-  ) {
-    throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW);
+
+  if (botsHighestRole) {
+    const hasHigherRolePosition = await higherRolePosition(
+      guildID,
+      botsHighestRole.id,
+      roleID,
+    );
+    if (!hasHigherRolePosition) {
+      throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW);
+    }
   }
 
-  if (!botHasPermission(guildID, [Permissions.MANAGE_ROLES])) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.MANAGE_ROLES]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
+
   return RequestManager.delete(
     endpoints.GUILD_MEMBER_ROLE(guildID, memberID, roleID),
     { reason },
@@ -130,9 +142,11 @@ export async function kick(guildID: string, memberID: string, reason?: string) {
     throw new Error(Errors.BOTS_HIGHEST_ROLE_TOO_LOW);
   }
 
-  if (!botHasPermission(guildID, [Permissions.KICK_MEMBERS])) {
+  const hasPerm = await botHasPermission(guildID, [Permissions.KICK_MEMBERS]);
+  if (!hasPerm) {
     throw new Error(Errors.MISSING_KICK_MEMBERS);
   }
+
   return RequestManager.delete(
     endpoints.GUILD_MEMBER(guildID, memberID),
     { reason },
@@ -140,7 +154,7 @@ export async function kick(guildID: string, memberID: string, reason?: string) {
 }
 
 /** Edit the member */
-export function editMember(
+export async function editMember(
   guildID: string,
   memberID: string,
   options: EditMemberOptions,
@@ -149,30 +163,47 @@ export function editMember(
     if (options.nick.length > 32) {
       throw new Error(Errors.NICKNAMES_MAX_LENGTH);
     }
-    if (!botHasPermission(guildID, [Permissions.MANAGE_NICKNAMES])) {
+
+    const hasManageNickPerm = await botHasPermission(
+      guildID,
+      [Permissions.MANAGE_NICKNAMES],
+    );
+    if (!hasManageNickPerm) {
       throw new Error(Errors.MISSING_MANAGE_NICKNAMES);
     }
   }
 
+  const hasManageRolesPerm = await botHasPermission(
+    guildID,
+    [Permissions.MANAGE_ROLES],
+  );
   if (
     options.roles &&
-    !botHasPermission(guildID, [Permissions.MANAGE_ROLES])
+    !hasManageRolesPerm
   ) {
     throw new Error(Errors.MISSING_MANAGE_ROLES);
   }
 
   if (options.mute) {
+    const hasMuteMembersPerm = await botHasPermission(
+      guildID,
+      [Permissions.MUTE_MEMBERS],
+    );
     // TODO: This should check if the member is in a voice channel
     if (
-      !botHasPermission(guildID, [Permissions.MUTE_MEMBERS])
+      !hasMuteMembersPerm
     ) {
       throw new Error(Errors.MISSING_MUTE_MEMBERS);
     }
   }
 
+  const hasDeafenMembersPerm = await botHasPermission(
+    guildID,
+    [Permissions.DEAFEN_MEMBERS],
+  );
   if (
     options.deaf &&
-    !botHasPermission(guildID, [Permissions.DEAFEN_MEMBERS])
+    !hasDeafenMembersPerm
   ) {
     throw new Error(Errors.MISSING_DEAFEN_MEMBERS);
   }
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index 0c4583a34..b2519f0f7 100644
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -175,7 +175,8 @@ export async function hasChannelPermissions(
   if (permissions.every((perm) => allowedPermissions.has(perm))) return true;
 
   // Some permission was not explicitly allowed so we default to checking role perms directly
-  return botHasPermission(guild.id, permissions);
+  const hasPerms = await botHasPermission(guild.id, permissions);
+  return hasPerms;
 }
 
 /** This function converts a bitwise string to permission strings */