From d626efb96b12826835710ab98f8eb91a9e2123ec Mon Sep 17 00:00:00 2001
From: lazuee <lazuee.dev@gmail.com>
Date: Thu, 21 Apr 2022 23:55:56 +0800
Subject: [PATCH] Update MessagePayload.js

---
 src/structures/MessagePayload.js | 74 +++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/structures/MessagePayload.js b/src/structures/MessagePayload.js
index 387f4a7..f61ca7d 100644
--- a/src/structures/MessagePayload.js
+++ b/src/structures/MessagePayload.js
@@ -118,6 +118,47 @@ class MessagePayload {
     return content;
   }
 
+   /**
+   * Makes the webembed content of this message.
+   * @returns {?string}
+   */
+  async makeWebEmbed() {
+    let content;
+
+    if (this.options.embeds) {
+      if (!Array.isArray(this.options.embeds)) {
+        this.options.embeds = [this.options.embeds];
+      }
+
+      const webembeds = this.options.embeds.filter(e => e instanceof WebEmbed);
+      this.options.embeds = this.options.embeds.filter(e => e instanceof MessageEmbed);
+
+      if (webembeds.length > 0) {
+        if (!content) content = '';
+        // Add hidden embed link
+        content += `${WebEmbed.hiddenEmbed} `;
+
+        for (const webE of webembeds) {
+          const data = await webE.toMessage();
+          content += `${data} `;
+        }
+
+        content = content.trim();
+      }
+
+      // Check content
+      if (typeof content == 'string' && content.length > 2000) {
+        console.warn('[WARN] WebEmbed is longer than 2000 characters.');
+      }
+      if (typeof content == 'string' && content.length > 4000) {
+        // Max length if user has nitro boost
+        throw new RangeError('MESSAGE_EMBED_LINK_LENGTH');
+      }
+    }
+
+    return content;
+  }
+  
   /**
    * Resolves data.
    * @returns {MessagePayload}
@@ -128,6 +169,7 @@ class MessagePayload {
     const isWebhook = this.isWebhook;
 
     let content = this.makeContent();
+    let webembed = await this.makeWebEmbed();
     const tts = Boolean(this.options.tts);
 
     let nonce;
@@ -189,38 +231,8 @@ class MessagePayload {
       this.options.attachments = attachments;
     }
 
-    if (this.options.embeds) {
-      if (!Array.isArray(this.options.embeds)) {
-        this.options.embeds = [this.options.embeds];
-      }
-
-      const webembeds = this.options.embeds.filter(e => e instanceof WebEmbed);
-      this.options.embeds = this.options.embeds.filter(e => e instanceof MessageEmbed);
-
-      if (webembeds.length > 0) {
-        if (!content) content = '';
-        // Add hidden embed link
-        content += `\n${WebEmbed.hiddenEmbed} \n`;
-        if (webembeds.length > 1) {
-          console.warn('Multiple webembeds are not supported, this will be ignored.');
-        }
-        // Const embed = webembeds[0];
-        for (const webE of webembeds) {
-          const data = await webE.toMessage();
-          content += `\n${data}`;
-        }
-      }
-      // Check content
-      if (typeof content == 'string' && content.length > 2000) {
-        console.warn('[WARN] Content is longer than 2000 characters.');
-      }
-      if (typeof content == 'string' && content.length > 4000) {
-        // Max length if user has nitro boost
-        throw new RangeError('MESSAGE_EMBED_LINK_LENGTH');
-      }
-    }
-
     this.data = {
+      webembed,
       content,
       tts,
       nonce,