Merge pull request #381 from Java-Discord/dynxsty/fix_qotw_embeds

Attach Embed to Submission Webhook Mirror

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/listener/HugListener.java

@@ -96,7 +96,7 @@ private char copyCase(String original, int index, char newChar) {
 	}
 
 	private void sendWebhookMessage(Webhook webhook, Message originalMessage, String newMessageContent, long threadId) {
-		WebhookUtil.mirrorMessageToWebhook(webhook, originalMessage, newMessageContent, threadId)
+		WebhookUtil.mirrorMessageToWebhook(webhook, originalMessage, newMessageContent, threadId, null, null)
 				.thenAccept(unused -> originalMessage.delete().queue()).exceptionally(e -> {
 					log.error("replacing the content 'fuck' with 'hug' in an incoming message failed", e);
 					return null;

src/main/java/net/javadiscord/javabot/listener/MessageLinkListener.java

@@ -15,6 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34,7 +35,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 			Optional<RestAction<Message>> optional = parseMessageUrl(matcher.group(), event.getJDA());
 			optional.ifPresent(action -> action.queue(
 					m -> WebhookUtil.ensureWebhookExists(event.getChannel().asTextChannel(),
-							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), 0, ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message")))
+							wh -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), 0, List.of(ActionRow.of(Button.link(m.getJumpUrl(), "Jump to Message"))), null)
 					), e -> ExceptionLogger.capture(e, getClass().getSimpleName())
 			));
 		}

src/main/java/net/javadiscord/javabot/systems/moderation/report/ReportManager.java

@@ -159,7 +159,7 @@ private void handleMessageReport(ModalInteractionEvent event, String messageId)
 			MessageChannel reportChannel = config.getModerationConfig().getReportChannel();
 			reportChannel.sendMessageEmbeds(embed.build()).queue(m -> createReportThread(m, target.getAuthor().getIdLong(), config.getModerationConfig(), thread->{
 				WebhookUtil.ensureWebhookExists(thread.getParentChannel().asStandardGuildMessageChannel(), wh->{
-					WebhookUtil.mirrorMessageToWebhook(wh, target, target.getContentRaw(), thread.getIdLong());
+					WebhookUtil.mirrorMessageToWebhook(wh, target, target.getContentRaw(), thread.getIdLong(), null, null);
 				});
 			}));
 			embed.setDescription("Successfully reported " + "`" + target.getAuthor().getAsTag() + "`!\nYour report has been send to our Moderators");

src/main/java/net/javadiscord/javabot/systems/qotw/submissions/SubmissionManager.java

@@ -148,15 +148,15 @@ public void acceptSubmission(InteractionHook hook, @NotNull ThreadChannel thread
 			WebhookUtil.ensureWebhookExists(newestPost.getParentChannel().asForumChannel(), wh ->
 					getMessagesByUser(thread, author).thenAccept(messages -> {
 						for (Message message : messages) {
+							boolean lastMessage = messages.indexOf(message) + 1 == messages.size();
 							if (message.getAuthor().isBot() || message.getType() != MessageType.DEFAULT) continue;
 							if (message.getContentRaw().length() > 2000) {
-								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(0, 2000), newestPost.getIdLong());
-								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(2000), newestPost.getIdLong());
+								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(0, 2000), newestPost.getIdLong(), null, null);
+								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw().substring(2000), newestPost.getIdLong(), null, lastMessage ? List.of(buildAuthorEmbed(author, bestAnswer)) : null);
 							} else {
-								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong());
+								WebhookUtil.mirrorMessageToWebhook(wh, message, message.getContentRaw(), newestPost.getIdLong(), null, lastMessage ? List.of(buildAuthorEmbed(author, bestAnswer)) : null);
 							}
 						}
-						newestPost.sendMessageEmbeds(buildAuthorEmbed(author, bestAnswer)).queue();
 					}));
 		}
 		thread.getManager().setLocked(true).setArchived(true).queue();

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

@@ -92,7 +92,7 @@ public static void copyMessagesToNewThread(StandardGuildMessageChannel targetCha
 						thread -> WebhookUtil.ensureWebhookExists(targetChannel, wh->{
 							CompletableFuture<ReadonlyMessage> future = CompletableFuture.completedFuture(null);
 							for (Message m : messages) {
-								future = future.thenCompose(unused -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong()));
+								future = future.thenCompose(unused -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong(), null, null));
 							}
 							future.thenAccept(unused -> onFinish.accept(thread));
 						})

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

@@ -4,13 +4,16 @@
 import club.minnced.discord.webhook.external.JDAWebhookClient;
 import club.minnced.discord.webhook.receive.ReadonlyMessage;
 import club.minnced.discord.webhook.send.AllowedMentions;
+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.Message;
 import net.dv8tion.jda.api.entities.Message.Attachment;
+import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.Webhook;
 import net.dv8tion.jda.api.entities.channel.attribute.IWebhookContainer;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
@@ -28,7 +31,7 @@ private WebhookUtil() {
 	 * Makes sure that a writable webhook exists in a specific channel. if no
 	 * suitable webhook is found, one is created.
 	 *
-	 * @param channel  the {@link StandardGuildMessageChannel} the webhook should exist in
+	 * @param channel  the {@link IWebhookContainer} the webhook should exist in
 	 * @param callback an action that is executed once a webhook is
 	 *                 found/created
 	 */
@@ -40,7 +43,7 @@ public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotN
 	 * Makes sure that a writable webhook exists in a specific channel. if no
 	 * suitable webhook is found, one is created.
 	 *
-	 * @param channel         the {@link StandardGuildMessageChannel} the webhook should exist in
+	 * @param channel         the {@link IWebhookContainer} the webhook should exist in
 	 * @param callback        an action that is executed once a webhook is
 	 *                        found/created
 	 * @param failureCallback an action that is executed if the webhook
@@ -68,20 +71,24 @@ public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotN
 	 * @param newMessageContent the new (custom) content
 	 * @param threadId          the thread to send the message in or {@code 0} if the
 	 *                          message should be sent directly
-	 * @param components        An optional array of {@link LayoutComponent}s.
+	 * @param components        A nullable list of {@link LayoutComponent}s.
+	 * @param embeds            A nullable list of {@link MessageEmbed}s.
 	 * @return a {@link CompletableFuture} representing the action of sending
 	 * the message
 	 */
-	public static CompletableFuture<ReadonlyMessage> mirrorMessageToWebhook(@NotNull Webhook webhook, @NotNull Message originalMessage, String newMessageContent, long threadId, LayoutComponent @NotNull ... components) {
+	public static CompletableFuture<ReadonlyMessage> mirrorMessageToWebhook(@NotNull Webhook webhook, @NotNull Message originalMessage, String newMessageContent, long threadId, @Nullable List<LayoutComponent> components, @Nullable List<MessageEmbed> embeds) {
 		JDAWebhookClient client = new WebhookClientBuilder(webhook.getIdLong(), webhook.getToken())
 				.setThreadId(threadId).buildJDA();
 		WebhookMessageBuilder message = new WebhookMessageBuilder().setContent(newMessageContent)
 				.setAllowedMentions(AllowedMentions.none())
 				.setAvatarUrl(originalMessage.getMember().getEffectiveAvatarUrl())
 				.setUsername(originalMessage.getMember().getEffectiveName());
-		if (components.length > 0) {
+		if (components != null && !components.isEmpty()) {
 			message.addComponents(components);
 		}
+		if (embeds != null && !embeds.isEmpty()) {
+			message.addEmbeds(embeds.stream().map(e -> WebhookEmbedBuilder.fromJDA(e).build()).toList());
+		}
 		List<Attachment> attachments = originalMessage.getAttachments();
 		@SuppressWarnings("unchecked")
 		CompletableFuture<?>[] futures = new CompletableFuture<?>[attachments.size()];