From 67c2e566478aa7bbce5ba0ccaa0a8bc2060d6b95 Mon Sep 17 00:00:00 2001
From: monbrey <monbrey@gmail.com>
Date: Wed, 7 Oct 2020 14:18:17 +1100
Subject: [PATCH] refactor(InlineReplies): rename property, rework Message
 resolution

---
 src/structures/APIMessage.js | 15 ++++++++++-----
 typings/index.d.ts           |  7 ++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/structures/APIMessage.js b/src/structures/APIMessage.js
index 46a93063..bb884ccd 100644
--- a/src/structures/APIMessage.js
+++ b/src/structures/APIMessage.js
@@ -199,11 +199,16 @@ class APIMessage {
     }
 
     let message_reference;
-    if (this.options.messageReference) {
-      message_reference = {
-        message_id: this.target.messages.resolveID(this.options.messageReference),
-        channel_id: this.target.id,
-      };
+    if (this.options.inlineReplyTo) {
+      const message = this.target.messages.resolve(this.options.inlineReplyTo);
+      if (message) {
+        message_reference = { message_id: message.id, channel_id: message.channel.id };
+      } else {
+        message_reference = {
+          message_id: this.options.inlineReplyTo.messageID,
+          channel_id: this.options.inlineReplyTo.channelID,
+        };
+      }
     }
 
     this.data = {
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 777305a4..63e6d66d 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2831,7 +2831,7 @@ declare module 'discord.js' {
     code?: string | boolean;
     split?: boolean | SplitOptions;
     reply?: UserResolvable;
-    messageReference?: MessageResolvable;
+    inlineReplyTo?: MessageResolvable | MessageReplyReference;
   }
 
   type MessageReactionResolvable = MessageReaction | Snowflake;
@@ -2842,6 +2842,11 @@ declare module 'discord.js' {
     messageID: string | null;
   }
 
+  interface MessageReplyReference {
+    channelID: Snowflake;
+    messageID: Snowflake;
+  }
+
   type MessageResolvable = Message | Snowflake;
 
   type MessageTarget = TextChannel | NewsChannel | DMChannel | User | GuildMember | Webhook | WebhookClient;