From cccc0a33596fd6f8532cca9052e78bd9059c54da Mon Sep 17 00:00:00 2001
From: ITOH <to@itoh.at>
Date: Thu, 10 Jun 2021 16:09:31 +0200
Subject: [PATCH] requested changes

---
 src/helpers/messages/edit_message.ts |  7 ++++---
 src/helpers/messages/send_message.ts | 11 +++++++----
 src/helpers/webhooks/send_webhook.ts |  4 +---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/helpers/messages/edit_message.ts b/src/helpers/messages/edit_message.ts
index 338df5cad..192cbe665 100644
--- a/src/helpers/messages/edit_message.ts
+++ b/src/helpers/messages/edit_message.ts
@@ -30,10 +30,11 @@ export async function editMessage(channelId: bigint, messageId: bigint, content:
   }
 
   // TODO: v12 remove
-  if (content.embed) content.embeds = [content.embed, ...(content.embeds || [])];
-  if (content.embeds && content.embeds.length > 10) {
-    content.embeds.splice(10);
+  if (content.embed) {
+    content.embeds = [content.embed, ...(content.embeds || [])];
+    content.embed = undefined;
   }
+  content.embeds?.splice(10);
 
   if (content.content && content.content.length > 2000) {
     throw new Error(Errors.MESSAGE_MAX_LENGTH);
diff --git a/src/helpers/messages/send_message.ts b/src/helpers/messages/send_message.ts
index 915d44431..1023aabcc 100644
--- a/src/helpers/messages/send_message.ts
+++ b/src/helpers/messages/send_message.ts
@@ -35,10 +35,13 @@ export async function sendMessage(channelId: bigint, content: string | CreateMes
 
     if (content.tts) requiredPerms.add("SEND_TTS_MESSAGES");
     // TODO: v12 remove
-    if (content.embed) content.embeds = [content.embed, ...(content.embeds || [])];
-    if (content.embeds?.length) requiredPerms.add("EMBED_LINKS");
-    if (content.embeds && content.embeds.length > 10) {
-      content.embeds.splice(10);
+    if (content.embed) {
+      content.embeds = [content.embed, ...(content.embeds || [])];
+      content.embed = undefined;
+    }
+    if (content.embeds?.length) {
+      requiredPerms.add("EMBED_LINKS");
+      content.embeds?.splice(10);
     }
 
     if (content.messageReference?.messageId || content.allowedMentions?.repliedUser) {
diff --git a/src/helpers/webhooks/send_webhook.ts b/src/helpers/webhooks/send_webhook.ts
index 1403dfd36..6d208d725 100644
--- a/src/helpers/webhooks/send_webhook.ts
+++ b/src/helpers/webhooks/send_webhook.ts
@@ -17,9 +17,7 @@ export async function sendWebhook(webhookId: bigint, webhookToken: string, optio
     throw Error(Errors.MESSAGE_MAX_LENGTH);
   }
 
-  if (options.embeds && options.embeds.length > 10) {
-    options.embeds.splice(10);
-  }
+  options.embeds?.splice(10);
 
   if (options.allowedMentions) {
     if (options.allowedMentions.users?.length) {