Merge pull request #308 from b-rad15/main

Change thread_id from Form to Query String param
Remora · Jul 27, 2023 · 6970169 · 6970169
2 parents 2c28f3c + df9a6ba
commit 6970169
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Backend/Remora.Discord.Rest/API/Webhooks/DiscordRestWebhookAPI.cs b/Backend/Remora.Discord.Rest/API/Webhooks/DiscordRestWebhookAPI.cs
@@ -317,6 +317,11 @@ public virtual Task<Result<IMessage?>> ExecuteWebhookAsync
                     b.AddQueryParameter("wait", realShouldWait.ToString());
                 }
 
+                if (threadID.TryGet(out var realThreadID))
+                {
+                    b.AddQueryParameter("thread_id", realThreadID.ToString());
+                }
+
                 Optional<IReadOnlyList<IPartialAttachment>> attachmentList = default;
                 if (attachments.TryGet(out var realAttachments))
                 {
@@ -354,7 +359,6 @@ public virtual Task<Result<IMessage?>> ExecuteWebhookAsync
                             json.Write("tts", isTTS, this.JsonOptions);
                             json.Write("embeds", embeds, this.JsonOptions);
                             json.Write("allowed_mentions", allowedMentions, this.JsonOptions);
-                            json.Write("thread_id", threadID, this.JsonOptions);
                             json.Write("components", components, this.JsonOptions);
                             json.Write("attachments", attachmentList, this.JsonOptions);
                             json.Write("flags", flags, this.JsonOptions);

diff --git a/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Webhooks/DiscordRestWebhookAPITests.cs
@@ -816,7 +816,11 @@ public async Task PerformsInThreadRequestCorrectly()
             (
                 b => b
                     .Expect(HttpMethod.Post, $"{Constants.BaseURL}webhooks/{webhookId}/{token}")
-                    .WithQueryString("wait", shouldWait.ToString())
+                    .WithExactQueryString(new Dictionary<string, string>
+                    {
+                        { "wait", shouldWait.ToString() },
+                        { "thread_id", threadID.ToString() },
+                    })
                     .WithJson
                     (
                         j => j.IsObject
@@ -827,7 +831,6 @@ public async Task PerformsInThreadRequestCorrectly()
                                 .WithProperty("avatar_url", p => p.Is(avatarUrl))
                                 .WithProperty("tts", p => p.Is(tts))
                                 .WithProperty("allowed_mentions", p => p.IsObject())
-                                .WithProperty("thread_id", p => p.Is(threadID.ToString()))
                                 .WithProperty("components", p => p.IsArray())
                                 .WithProperty("flags", p => p.Is((int)flags))
                         )