Fix handling of passing null to setMessageReference (#2749)

discord-jda · Oct 8, 2024 · e24fc59 · e24fc59
1 parent c54a3a5
commit e24fc59
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageCreateActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageCreateActionImpl.java
@@ -149,8 +149,13 @@ public MessageCreateAction setMessageReference(@Nonnull MessageReference.Message
     @Override
     public MessageCreateAction setMessageReference(@Nullable String messageId)
     {
-        if (messageId != null)
-            Checks.isSnowflake(messageId);
+        if (messageId == null)
+        {
+            this.messageReference = null;
+            return this;
+        }
+
+        Checks.isSnowflake(messageId);
         String guildId = null;
         if (channel instanceof GuildChannel)
             guildId = ((GuildChannel) channel).getGuild().getId();

diff --git a/src/test/java/net/dv8tion/jda/test/restaction/MessageCreateActionTest.java b/src/test/java/net/dv8tion/jda/test/restaction/MessageCreateActionTest.java
@@ -266,6 +266,21 @@ void testFullFromBuilder()
             .whenQueueCalled();
     }
 
+    @Test
+    void testSetMessageReferenceNull()
+    {
+        MessageCreateActionImpl action = new MessageCreateActionImpl(channel);
+
+        action.setMessageReference((String) null);
+        action.setContent("test content");
+        action.failOnInvalidReply(true);
+
+        assertThatRequestFrom(action)
+            .hasBodyEqualTo(defaultMessageRequest()
+                .put("content", "test content"))
+            .whenQueueCalled();
+    }
+
     @Nonnull
     protected DataObject normalizeRequestBody(@Nonnull DataObject body)
     {