From 49259edcae92bb2e380de43526beaada28ec6001 Mon Sep 17 00:00:00 2001
From: Shubham Parihar <shubhamparihar391@gmail.com>
Date: Sat, 5 Jun 2021 22:41:10 +0530
Subject: [PATCH 1/2] fix(Webhook): #editMessage throws error when content is
 null

---
 src/structures/Webhook.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/structures/Webhook.js b/src/structures/Webhook.js
index 429a548a9cdc..9fce415a28c3 100644
--- a/src/structures/Webhook.js
+++ b/src/structures/Webhook.js
@@ -98,7 +98,7 @@ class Webhook {
    * Options that can be passed into editMessage.
    * @typedef {Object} WebhookEditMessageOptions
    * @property {MessageEmbed[]|Object[]} [embeds] See {@link WebhookMessageOptions#embeds}
-   * @property {string} [content] See {@link BaseMessageOptions#content}
+   * @property {?string} [content] See {@link BaseMessageOptions#content}
    * @property {FileOptions[]|BufferResolvable[]|MessageAttachment[]} [files] See {@link BaseMessageOptions#files}
    * @property {MessageMentionOptions} [allowedMentions] See {@link BaseMessageOptions#allowedMentions}
    */
@@ -242,14 +242,14 @@ class Webhook {
   /**
    * Edits a message that was sent by this webhook.
    * @param {MessageResolvable|'@original'} message The message to edit
-   * @param {string|APIMessage} [content] The new content for the message
+   * @param {?(string|APIMessage)} [content] The new content for the message
    * @param {WebhookEditMessageOptions|MessageAdditions} [options] The options to provide
    * @returns {Promise<Message|Object>} Returns the raw message data if the webhook was instantiated as a
    * {@link WebhookClient} or if the channel is uncached, otherwise a {@link Message} will be returned
    */
   async editMessage(message, content, options) {
     const { data, files } = await (
-      content.resolveData?.() ?? APIMessage.create(this, content, options).resolveData()
+      content?.resolveData?.() ?? APIMessage.create(this, content, options).resolveData()
     ).resolveFiles();
     const d = await this.client.api
       .webhooks(this.id, this.token)

From 47cc616318aef35ff70500bc85343ad96f321211 Mon Sep 17 00:00:00 2001
From: Shubham Parihar <shubhamparihar391@gmail.com>
Date: Sat, 5 Jun 2021 23:26:38 +0530
Subject: [PATCH 2/2] refactor: remove nullable symbol from content prop

---
 src/structures/Webhook.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/structures/Webhook.js b/src/structures/Webhook.js
index 9fce415a28c3..903c97586775 100644
--- a/src/structures/Webhook.js
+++ b/src/structures/Webhook.js
@@ -98,7 +98,7 @@ class Webhook {
    * Options that can be passed into editMessage.
    * @typedef {Object} WebhookEditMessageOptions
    * @property {MessageEmbed[]|Object[]} [embeds] See {@link WebhookMessageOptions#embeds}
-   * @property {?string} [content] See {@link BaseMessageOptions#content}
+   * @property {string} [content] See {@link BaseMessageOptions#content}
    * @property {FileOptions[]|BufferResolvable[]|MessageAttachment[]} [files] See {@link BaseMessageOptions#files}
    * @property {MessageMentionOptions} [allowedMentions] See {@link BaseMessageOptions#allowedMentions}
    */