Merge pull request #399 from danthe1st/fix-empty-webhooks

fix embeds for webhooks

Author: MoonTM-GIT

src/main/java/net/javadiscord/javabot/util/WebhookUtil.java

@@ -7,6 +7,7 @@
 import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
 import club.minnced.discord.webhook.send.WebhookMessageBuilder;
 import club.minnced.discord.webhook.send.component.LayoutComponent;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.Message.Attachment;
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -19,6 +20,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 /**
  * Contains utility methods for dealing with Discord Webhooks.
@@ -90,14 +92,16 @@ public static CompletableFuture<ReadonlyMessage> mirrorMessageToWebhook(@NotNull
 				.setThreadId(threadId).buildJDA();
 		WebhookMessageBuilder message = new WebhookMessageBuilder().setContent(newMessageContent)
 				.setAllowedMentions(AllowedMentions.none())
-				.setAvatarUrl(originalMessage.getMember().getEffectiveAvatarUrl())
-				.setUsername(originalMessage.getMember().getEffectiveName());
+				.setAvatarUrl(transformOrNull(originalMessage.getMember(), Member::getEffectiveAvatarUrl))
+				.setUsername(transformOrNull(originalMessage.getMember(), Member::getEffectiveName));
 		if (components != null && !components.isEmpty()) {
 			message.addComponents(components);
 		}
-		if (embeds != null && !embeds.isEmpty()) {
-			message.addEmbeds(embeds.stream().map(e -> WebhookEmbedBuilder.fromJDA(e).build()).toList());
+
+		if (embeds == null || embeds.isEmpty()) {
+			embeds = originalMessage.getEmbeds();
 		}
+		message.addEmbeds(embeds.stream().map(e -> WebhookEmbedBuilder.fromJDA(e).build()).toList());
 		List<Attachment> attachments = originalMessage.getAttachments();
 		@SuppressWarnings("unchecked")
 		CompletableFuture<?>[] futures = new CompletableFuture<?>[attachments.size()];
@@ -106,12 +110,23 @@ public static CompletableFuture<ReadonlyMessage> mirrorMessageToWebhook(@NotNull
 			futures[i] = attachment.getProxy().download().thenAccept(
 					is -> message.addFile((attachment.isSpoiler() ? "SPOILER_" : "") + attachment.getFileName(), is));
 		}
-		return CompletableFuture.allOf(futures).thenCompose(unused -> client.send(message.build()))
+		return CompletableFuture.allOf(futures).thenCompose(unused -> sendMessage(client, message))
 				.whenComplete((result, err) -> {
 					client.close();
 					if( err != null) {
 						ExceptionLogger.capture(err, WebhookUtil.class.getSimpleName());
 					}
 				});
 	}
+
+	private static <T, R> R transformOrNull(T toTransform, Function<T, R> transformer) {
+		return toTransform == null ? null : transformer.apply(toTransform);
+	}
+
+	private static @NotNull CompletableFuture<ReadonlyMessage> sendMessage(JDAWebhookClient client, WebhookMessageBuilder message) {
+		if(message.isEmpty()) {
+			message.setContent("<empty message>");
+		}
+		return client.send(message.build());
+	}
 }