Merge pull request #54 from Zavarov/master

Fix UnsupportedOperationException when sending DataMessages

Author: MinnDevelopment

src/main/java/club/minnced/discord/webhook/send/WebhookMessageBuilder.java

@@ -433,7 +433,6 @@ public static WebhookMessageBuilder fromJDA(@NotNull net.dv8tion.jda.api.entitie
         WebhookMessageBuilder builder = new WebhookMessageBuilder();
         builder.setTTS(message.isTTS());
         builder.setContent(message.getContentRaw());
-        builder.setEphemeral(message.isEphemeral());
         message.getEmbeds().forEach(embed -> builder.addEmbeds(WebhookEmbedBuilder.fromJDA(embed).build()));
 
         if (message instanceof DataMessage) {
@@ -460,6 +459,7 @@ public static WebhookMessageBuilder fromJDA(@NotNull net.dv8tion.jda.api.entitie
                     .collect(Collectors.toList()));
             allowedMentions.withParseEveryone(message.mentionsEveryone());
             builder.setAllowedMentions(allowedMentions);
+            builder.setEphemeral(message.isEphemeral());
         }
         return builder;
     }

src/test/java/root/send/MessageTest.java

@@ -21,6 +21,12 @@
 import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
 import club.minnced.discord.webhook.send.WebhookMessage;
 import club.minnced.discord.webhook.send.WebhookMessageBuilder;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.internal.entities.DataMessage;
+import net.dv8tion.jda.internal.entities.ReceivedMessage;
 import okhttp3.RequestBody;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -38,6 +44,10 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
+
 public class MessageTest {
     private WebhookMessageBuilder builder;
 
@@ -127,6 +137,55 @@ public void buildMessageWithFiles() throws IOException {
         Assert.assertEquals("dog.png", message.getAttachments()[1].getName());
         Assert.assertEquals("bird.png", message.getAttachments()[2].getName());
     }
+    
+    @Test
+    public void buildMessageWithDataMessage() {
+        MessageEmbed jdaEmbed = new EmbedBuilder()
+              .setTitle("myEmbed")
+              .build();
+        
+        Message jdaMessage = new MessageBuilder()
+              .setTTS(true)
+              .setContent("myContent")
+              .setEmbeds(jdaEmbed)
+              .build();
+        
+        WebhookMessage webhookMessage = WebhookMessageBuilder.fromJDA(jdaMessage).build();
+        List<WebhookEmbed> webhookEmbeds = webhookMessage.getEmbeds();
+        
+        Assert.assertEquals(webhookEmbeds.size(), 1);
+        
+        WebhookEmbed webhookEmbed = webhookEmbeds.get(0);
+        
+        Assert.assertTrue(jdaMessage instanceof DataMessage);
+        Assert.assertTrue(webhookMessage.isTTS());
+        Assert.assertEquals(webhookMessage.getContent(), "myContent");
+        Assert.assertEquals(webhookEmbed.getTitle().getText(), "myEmbed");
+    }
+    
+    @Test
+    public void buildMessageWithReceivedMessage() {
+        MessageEmbed jdaEmbed = new EmbedBuilder()
+              .setTitle("myEmbed")
+              .build();
+    
+        Message jdaMessage = mock(ReceivedMessage.class, CALLS_REAL_METHODS);
+        when(jdaMessage.isTTS()).thenReturn(true);
+        when(jdaMessage.getContentRaw()).thenReturn("myContent");
+        when(jdaMessage.getEmbeds()).thenReturn(Arrays.asList(jdaEmbed));
+
+        WebhookMessage webhookMessage = WebhookMessageBuilder.fromJDA(jdaMessage).build();
+        List<WebhookEmbed> webhookEmbeds = webhookMessage.getEmbeds();
+        
+        Assert.assertEquals(webhookEmbeds.size(), 1);
+        
+        WebhookEmbed webhookEmbed = webhookEmbeds.get(0);
+        
+        Assert.assertTrue(jdaMessage instanceof ReceivedMessage);
+        Assert.assertTrue(webhookMessage.isTTS());
+        Assert.assertEquals(webhookMessage.getContent(), "myContent");
+        Assert.assertEquals(webhookEmbed.getTitle().getText(), "myEmbed");
+    }
 
     @Test
     public void factoryEmbeds() {