From 6519b300d9394b662d3306146e048fa24702d73f Mon Sep 17 00:00:00 2001
From: Christopher F <foxbot@protonmail.com>
Date: Fri, 25 Nov 2016 22:12:28 -0500
Subject: [PATCH] ModifyAsync will accept an EmbedBuilder

**This is not a breaking change**.

This change begins to implement #379, where IUserMessage.ModifyAsync will now accept a `Discord.ModifyMessageParams` func over a `Discord.API.Rest.ModifyMessageParams` func.
---
 src/Discord.Net.Core/API/DiscordRestApiClient.cs     |  2 +-
 src/Discord.Net.Core/API/Rest/ModifyMessageParams.cs |  2 ++
 .../Entities/Messages/IUserMessage.cs                |  3 +--
 .../Entities/Messages/ModifyMessageParams.cs         | 12 ++++++++++++
 .../Entities/Messages/MessageHelper.cs               |  7 ++++++-
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 src/Discord.Net.Core/Entities/Messages/ModifyMessageParams.cs

diff --git a/src/Discord.Net.Core/API/DiscordRestApiClient.cs b/src/Discord.Net.Core/API/DiscordRestApiClient.cs
index d050f12a4..e280c730f 100644
--- a/src/Discord.Net.Core/API/DiscordRestApiClient.cs
+++ b/src/Discord.Net.Core/API/DiscordRestApiClient.cs
@@ -498,7 +498,7 @@ namespace Discord.API
                     break;
             }
         }
-        public async Task<Message> ModifyMessageAsync(ulong channelId, ulong messageId, ModifyMessageParams args, RequestOptions options = null)
+        public async Task<Message> ModifyMessageAsync(ulong channelId, ulong messageId, Rest.ModifyMessageParams args, RequestOptions options = null)
         {
             Preconditions.NotEqual(channelId, 0, nameof(channelId));
             Preconditions.NotEqual(messageId, 0, nameof(messageId));
diff --git a/src/Discord.Net.Core/API/Rest/ModifyMessageParams.cs b/src/Discord.Net.Core/API/Rest/ModifyMessageParams.cs
index 4901ddc9d..c87d82c51 100644
--- a/src/Discord.Net.Core/API/Rest/ModifyMessageParams.cs
+++ b/src/Discord.Net.Core/API/Rest/ModifyMessageParams.cs
@@ -8,5 +8,7 @@ namespace Discord.API.Rest
     {
         [JsonProperty("content")]
         public Optional<string> Content { get; set; }
+        [JsonProperty("embed")]
+        public Optional<Embed> Embed { get; set; }
     }
 }
diff --git a/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs b/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
index a9dc4735c..c33b3e359 100644
--- a/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
+++ b/src/Discord.Net.Core/Entities/Messages/IUserMessage.cs
@@ -1,5 +1,4 @@
-using Discord.API.Rest;
-using System;
+using System;
 using System.Threading.Tasks;
 
 namespace Discord
diff --git a/src/Discord.Net.Core/Entities/Messages/ModifyMessageParams.cs b/src/Discord.Net.Core/Entities/Messages/ModifyMessageParams.cs
new file mode 100644
index 000000000..cc05e620a
--- /dev/null
+++ b/src/Discord.Net.Core/Entities/Messages/ModifyMessageParams.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Discord
+{
+    public class ModifyMessageParams
+    {
+        public Optional<string> Content { get; set; }
+        public Optional<EmbedBuilder> Embed { get; set; }
+    }
+}
diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
index 358f6f5a9..91ca2ce1b 100644
--- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
+++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
@@ -15,7 +15,12 @@ namespace Discord.Rest
         {
             var args = new ModifyMessageParams();
             func(args);
-            return await client.ApiClient.ModifyMessageAsync(msg.Channel.Id, msg.Id, args, options).ConfigureAwait(false);
+            var apiArgs = new API.Rest.ModifyMessageParams
+            {
+                Content = args.Content,
+                Embed = args.Embed.IsSpecified ? args.Embed.Value.Build() : Optional.Create<API.Embed>()
+            };
+            return await client.ApiClient.ModifyMessageAsync(msg.Channel.Id, msg.Id, apiArgs, options).ConfigureAwait(false);
         }
         public static async Task DeleteAsync(IMessage msg, BaseDiscordClient client,
             RequestOptions options)