fix order of webhook messages for qotw answer threads

Author: danthe1st

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

@@ -7,6 +7,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import club.minnced.discord.webhook.receive.ReadonlyMessage;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
@@ -89,9 +90,10 @@ public static void copyMessagesToNewThread(StandardGuildMessageChannel targetCha
 				message -> message.createThreadChannel(newThreadName).queue(
 						thread -> {
 							WebhookUtil.ensureWebhookExists(targetChannel, wh->{
-								messages.forEach(m -> {
-									WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong());
-								});
+								CompletableFuture<ReadonlyMessage> future = CompletableFuture.completedFuture(null);
+								for (Message m : messages) {
+									future = future.thenCompose(unused -> WebhookUtil.mirrorMessageToWebhook(wh, m, m.getContentRaw(), thread.getIdLong()));
+								}
 							});
 							onFinish.accept(thread);
 						}

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

@@ -2,6 +2,7 @@
 
 import club.minnced.discord.webhook.WebhookClientBuilder;
 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.WebhookMessageBuilder;
 import club.minnced.discord.webhook.send.component.LayoutComponent;
@@ -72,7 +73,7 @@ public static void ensureWebhookExists(@NotNull StandardGuildMessageChannel chan
 	 * @return a {@link CompletableFuture} representing the action of sending
 	 * the message
 	 */
-	public static CompletableFuture<Void> 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, LayoutComponent @NotNull ... components) {
 		JDAWebhookClient client = new WebhookClientBuilder(webhook.getIdLong(), webhook.getToken())
 				.setThreadId(threadId).buildJDA();
 		WebhookMessageBuilder message = new WebhookMessageBuilder().setContent(newMessageContent)
@@ -90,7 +91,7 @@ public static CompletableFuture<Void> mirrorMessageToWebhook(@NotNull Webhook we
 			futures[i] = attachment.getProxy().download().thenAccept(
 					is -> message.addFile((attachment.isSpoiler() ? "SPOILER_" : "") + attachment.getFileName(), is));
 		}
-		return CompletableFuture.allOf(futures).thenAccept(unused -> client.send(message.build()))
+		return CompletableFuture.allOf(futures).thenCompose(unused -> client.send(message.build()))
 				.whenComplete((result, err) -> client.close());
 	}
 }