From 27c30b1e0ceba4347c72b33bae1a379a14f05201 Mon Sep 17 00:00:00 2001
From: Shay <shay.dewael@discordapp.com>
Date: Fri, 8 Apr 2022 14:48:43 -0700
Subject: [PATCH] throw API errors

---
 commands.js |  6 ++++--
 utils.js    | 14 +++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/commands.js b/commands.js
index 9331100..6521ada 100644
--- a/commands.js
+++ b/commands.js
@@ -15,17 +15,19 @@ async function HasGuildCommand(appId, guildId, command) {
   try {
     const res = await DiscordRequest(endpoint, { method: 'GET' });
     const data = await res.json();
+
     if (data) {
       const installedNames = data.map((c) => c['name']);
       // This is just matching on the name, so it's not good for updates
       if (!installedNames.includes(command['name'])) {
+        console.log(`Installing "${command['name']}"`);
         InstallGuildCommand(appId, guildId, command);
       } else {
         console.log(`"${command['name']}" command already installed`);
       }
     }
   } catch (err) {
-    console.error('Error installing commands: ', err);
+    console.error(err);
   }
 }
 
@@ -37,7 +39,7 @@ export async function InstallGuildCommand(appId, guildId, command) {
   try {
     await DiscordRequest(endpoint, { method: 'POST', body: command });
   } catch (err) {
-    console.error('Error installing commands: ', err);
+    console.error(err);
   }
 }
 
diff --git a/utils.js b/utils.js
index a4c0ab7..578617c 100644
--- a/utils.js
+++ b/utils.js
@@ -15,19 +15,27 @@ export function VerifyDiscordRequest(clientKey) {
   };
 }
 
-export function DiscordRequest(endpoint, options) {
+export async function DiscordRequest(endpoint, options) {
   // append endpoint to root API URL
   const url = 'https://discord.com/api/v9/' + endpoint;
   // Stringify payloads
   if (options.body) options.body = JSON.stringify(options.body);
   // Use node-fetch to make requests
-  return fetch(url, {
-	  headers: {
+  const res = await fetch(url, {
+    headers: {
       Authorization: `Bot ${process.env.DISCORD_TOKEN}`,
       'Content-Type': 'application/json; charset=UTF-8',
     },
     ...options
   });
+  // throw API errors
+  if (!res.ok) {
+    const data = await res.json();
+    console.log(res.status);
+    throw new Error(JSON.stringify(data));
+  }
+  // return original response
+  return res;
 }
 
 // Simple method that returns a random emoji from list