From 3a249d91d437824dfcd2a9a0fea7a9d9d77a0b6d Mon Sep 17 00:00:00 2001
From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com>
Date: Mon, 8 Mar 2021 09:52:59 -0500
Subject: [PATCH] Revert "Revert "fix(handlers/webhook): return Message object
 instead of raw payload (#611)" (#634)" (#643)

This reverts commit a515765abfae94cfcef309f29c9085e19a919291.
---
 src/api/handlers/webhook.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/api/handlers/webhook.ts b/src/api/handlers/webhook.ts
index ba07414c6..1d2b56d8e 100644
--- a/src/api/handlers/webhook.ts
+++ b/src/api/handlers/webhook.ts
@@ -255,9 +255,10 @@ export async function editWebhookMessage(
   const result = await RequestManager.patch(
     endpoints.WEBHOOK_MESSAGE(webhookID, webhookToken, messageID),
     { ...options, allowed_mentions: options.allowed_mentions },
-  );
+  ) as MessageCreateOptions;
 
-  return result;
+  const message = await structures.createMessage(result);
+  return message;
 }
 
 export async function deleteWebhookMessage(
@@ -599,5 +600,11 @@ export async function editSlashResponse(
     options,
   );
 
-  return result;
+  // If the original message was edited, this will not return a message
+  if (!options.messageID) return result;
+
+  const message = await structures.createMessage(
+    result as MessageCreateOptions,
+  );
+  return message;
 }