From 25a5025802830d47ce4e4269e653436af3d18585 Mon Sep 17 00:00:00 2001
From: DjDeveloperr <djsandhu2005@gmail.com>
Date: Tue, 17 Nov 2020 09:05:25 +0530
Subject: [PATCH] fix(Message): Fix inline replies; feat(RESTManager): handle
 status codes correctly

---
 src/models/rest.ts            | 15 +++++++++------
 src/structures/message.ts     |  2 +-
 src/structures/textChannel.ts | 10 +++++-----
 src/types/channel.ts          |  3 +--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/models/rest.ts b/src/models/rest.ts
index 603b8ce..417d2fe 100644
--- a/src/models/rest.ts
+++ b/src/models/rest.ts
@@ -24,6 +24,10 @@ export interface RequestHeaders {
   [name: string]: string
 }
 
+export class DiscordAPIError extends Error {
+  name = 'DiscordAPIError'
+}
+
 export interface QueuedItem {
   bucket?: string | null
   url: string
@@ -263,7 +267,7 @@ export class RESTManager {
     if (text === 'undefined') text = undefined
 
     if (status === HttpResponseCode.Unauthorized)
-      throw new Error(`Request was not successful (Unauthorized). Invalid Token.\n${text}`)
+      throw new DiscordAPIError(`Request was not successful (Unauthorized). Invalid Token.\n${text}`)
 
     // At this point we know it is error
     let error = { url: response.url, status, method: data.method, body: data.body }
@@ -275,10 +279,10 @@ export class RESTManager {
       HttpResponseCode.Forbidden,
       HttpResponseCode.MethodNotAllowed
     ].includes(status)) {
-      throw new Error(Deno.inspect(error))
+      throw new DiscordAPIError(Deno.inspect(error))
     } else if (status === HttpResponseCode.GatewayUnavailable) {
-      throw new Error(Deno.inspect(error))
-    } else throw new Error('Request - Unknown Error')
+      throw new DiscordAPIError(Deno.inspect(error))
+    } else throw new DiscordAPIError('Request - Unknown Error')
   }
 
   async make(
@@ -327,8 +331,7 @@ export class RESTManager {
           if (response.status === 204) return resolve(undefined)
 
           const json: any = await response.json()
-          // eslint-disable-next-line @typescript-eslint/no-floating-promises
-          this.handleStatusCode(response, json, requestData)
+          await this.handleStatusCode(response, json, requestData)
 
           if (
             json.retry_after !== undefined ||
diff --git a/src/structures/message.ts b/src/structures/message.ts
index 71c26ab..95bbb40 100644
--- a/src/structures/message.ts
+++ b/src/structures/message.ts
@@ -111,7 +111,7 @@ export class Message extends Base {
 
   /** These will **not** work in all servers, as this feature is coming slowly. */
   async reply(text?: string | AllMessageOptions, option?: AllMessageOptions): Promise<Message> {
-    return this.channel.send(text, Object.assign(option, { reply: this }))
+    return this.channel.send(text, option, this)
   }
 
   async delete (): Promise<void> {
diff --git a/src/structures/textChannel.ts b/src/structures/textChannel.ts
index 44cb3e9..9ab87dd 100644
--- a/src/structures/textChannel.ts
+++ b/src/structures/textChannel.ts
@@ -27,7 +27,7 @@ export class TextChannel extends Channel {
     this.lastPinTimestamp = data.last_pin_timestamp ?? this.lastPinTimestamp
   }
 
-  async send(text?: string | AllMessageOptions, option?: AllMessageOptions): Promise<Message> {
+  async send(text?: string | AllMessageOptions, option?: AllMessageOptions, reply?: Message): Promise<Message> {
     if (typeof text === "object") {
       option = text
       text = undefined
@@ -47,11 +47,11 @@ export class TextChannel extends Channel {
       allowed_mentions: option?.allowedMention
     }
 
-    if (option?.reply !== undefined) {
+    if (reply !== undefined) {
       const reference: MessageReference = {
-        message_id: option.reply.id,
-        channel_id: option.reply.channel.id,
-        guild_id: option.reply.guild?.id,
+        message_id: reply.id,
+        channel_id: reply.channel.id,
+        guild_id: reply.guild?.id,
       }
       payload.message_reference = reference
     }
diff --git a/src/types/channel.ts b/src/types/channel.ts
index 509ea94..58ba24d 100644
--- a/src/types/channel.ts
+++ b/src/types/channel.ts
@@ -106,8 +106,7 @@ export interface MessageOption {
     parse: ['everyone', 'users', 'roles']
     roles: string[]
     users: string[]
-  },
-  reply?: Message
+  }
 }
 
 export interface ChannelMention {