Merge pull request #375 from danthe1st/copy-report-message

Author: jasonlessenich

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

@@ -29,10 +29,13 @@
 import net.javadiscord.javabot.data.config.guild.ModerationConfig;
 import net.javadiscord.javabot.util.InteractionUtils;
 import net.javadiscord.javabot.util.Responses;
+import net.javadiscord.javabot.util.WebhookUtil;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Instant;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Manages all interactions regarding the report-system.
@@ -154,7 +157,11 @@ private void handleMessageReport(ModalInteractionEvent event, String messageId)
 			embed.setTitle(String.format("%s reported a Message from %s", event.getUser().getName(), target.getAuthor().getName()));
 			embed.addField("Message", String.format("[Jump to Message](%s)", target.getJumpUrl()), false);
 			MessageChannel reportChannel = config.getModerationConfig().getReportChannel();
-			reportChannel.sendMessageEmbeds(embed.build()).queue(m -> createReportThread(m, target.getAuthor().getIdLong(), config.getModerationConfig()));
+			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());
+				});
+			}));
 			embed.setDescription("Successfully reported " + "`" + target.getAuthor().getAsTag() + "`!\nYour report has been send to our Moderators");
 			event.getHook().sendMessageEmbeds(embed.build()).queue();
 		}, failure -> {
@@ -173,13 +180,24 @@ private ActionRow setComponents(long targetId, long threadId) {
 	}
 
 	private void createReportThread(Message message, long targetId, ModerationConfig config) {
+		createReportThread(message, targetId, config, thread->{});
+	}
+
+	private void createReportThread(Message message, long targetId, ModerationConfig config, Consumer<ThreadChannel> onSuccess) {
 		message.createThreadChannel(message.getEmbeds().get(0).getTitle()).queue(
-				thread -> thread.sendMessage(config.getStaffRole().getAsMention())
+				thread -> {
+					thread.sendMessage(config.getStaffRole().getAsMention())
 						.setComponents(setComponents(targetId, thread.getIdLong()))
-						.queue()
+						.queue();
+					onSuccess.accept(thread);
+				}
 		);
 	}
 
+
+
+
+
 	private EmbedBuilder buildReportEmbed(User reported, User reportedBy, String reason, Channel channel) {
 		return new EmbedBuilder()
 				.setAuthor(reported.getAsTag(), null, reported.getEffectiveAvatarUrl())

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

@@ -9,7 +9,7 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.Message.Attachment;
 import net.dv8tion.jda.api.entities.Webhook;
-import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.attribute.IWebhookContainer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -32,9 +32,8 @@ private WebhookUtil() {
 	 * @param callback an action that is executed once a webhook is
 	 *                 found/created
 	 */
-	public static void ensureWebhookExists(StandardGuildMessageChannel channel, Consumer<? super Webhook> callback) {
-		ensureWebhookExists(channel, callback, err -> {
-		});
+	public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotNull Consumer<? super Webhook> callback) {
+		ensureWebhookExists(channel, callback, ExceptionLogger::capture);
 	}
 
 	/**
@@ -47,7 +46,7 @@ public static void ensureWebhookExists(StandardGuildMessageChannel channel, Cons
 	 * @param failureCallback an action that is executed if the webhook
 	 *                        lookup/creation failed
 	 */
-	public static void ensureWebhookExists(@NotNull StandardGuildMessageChannel channel, Consumer<? super Webhook> callback, Consumer<? super Throwable> failureCallback) {
+	public static void ensureWebhookExists(@NotNull IWebhookContainer channel, @NotNull Consumer<? super Webhook> callback, @NotNull Consumer<? super Throwable> failureCallback) {
 
 		channel.retrieveWebhooks().queue(webhooks -> {
 			Optional<Webhook> hook = webhooks.stream()