From 7bb688c404196bd2a193ef42ba614575b34965eb Mon Sep 17 00:00:00 2001 From: Daedalus <16168171+RedDaedalus@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:56:29 +0200 Subject: [PATCH 1/2] Fix webhook send & edit where the thread ID was set --- .../restaction/WebhookMessageCreateActionImpl.java | 14 ++++++++++---- .../restaction/WebhookMessageEditActionImpl.java | 11 +++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java index 26d1afc7af..9c16331001 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java @@ -150,10 +150,6 @@ protected RequestBody finalizeData() if (avatar != null) json.put("avatar_url", avatar); - if (threadId != null) - { - json.put("thread_id", threadId); - } else if (threadMetadata != null) { json.put("thread_name", threadMetadata.getName()); @@ -166,6 +162,16 @@ else if (threadMetadata != null) } } + @Override + protected Route.CompiledRoute finalizeRoute() + { + Route.CompiledRoute route = super.finalizeRoute(); + if (threadId != null) + route = route.withQueryParams(""); + + return route; + } + @Override protected void handleSuccess(Response response, Request request) { diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageEditActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageEditActionImpl.java index e6eb836128..55097721fd 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageEditActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageEditActionImpl.java @@ -54,12 +54,19 @@ protected RequestBody finalizeData() try (MessageEditData data = builder.build()) { DataObject payload = data.toData(); - if (threadId != null) - payload.put("thread_id", threadId); return getMultipartBody(data.getFiles(), payload); } } + @Override + protected Route.CompiledRoute finalizeRoute() + { + Route.CompiledRoute route = super.finalizeRoute(); + if (threadId != null) + route = route.withQueryParams("thread_id", threadId); + return route; + } + @Override protected void handleSuccess(Response response, Request request) { From aedc96489d5ecea9f12531bd8bdc2df0603ba26f Mon Sep 17 00:00:00 2001 From: Daedalus <16168171+RedDaedalus@users.noreply.github.com> Date: Mon, 23 Oct 2023 22:58:48 +0200 Subject: [PATCH 2/2] Actually set thread_id oops --- .../requests/restaction/WebhookMessageCreateActionImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java index 9c16331001..e2d73ba854 100644 --- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageCreateActionImpl.java @@ -167,7 +167,7 @@ protected Route.CompiledRoute finalizeRoute() { Route.CompiledRoute route = super.finalizeRoute(); if (threadId != null) - route = route.withQueryParams(""); + route = route.withQueryParams("thread_id", threadId); return route; }