Merge pull request #431 from danthe1st/report-resolve

automatically resolve reports when performing mod (inter)actions

Author: MoonTM-GIT

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

@@ -58,9 +58,20 @@ public void handleButton(@NotNull ButtonInteractionEvent event, Button button) {
 		}
 		Responses.info(event.getHook(), "Report resolved", "Successfully resolved this report!").queue();
 		event.getMessage().editMessageComponents(ActionRow.of(Button.secondary("report-resolved", "Resolved by " + UserUtils.getUserTag(event.getUser())).asDisabled())).queue();
-		thread.sendMessage("This thread was resolved by " + event.getUser().getAsMention()).queue(
-				success -> thread.getManager()
-						.setName(String.format("[Resolved] %s", thread.getName()))
+		resolveReport(event.getUser(), thread);
+	}
+
+	/**
+	 * Resolves a report thread.
+	 * This closes the current thread.
+	 * Tis method does not check whether the current thread is actually a report thread.
+	 * @param resolver the {@link User} responsible for resolving the report
+	 * @param reportThread the thread of the report to resolve
+	 */
+	public void resolveReport(User resolver, ThreadChannel reportThread) {
+		reportThread.sendMessage("This thread was resolved by " + resolver.getAsMention()).queue(
+				success -> reportThread.getManager()
+						.setName(String.format("[Resolved] %s", reportThread.getName()))
 						.setArchived(true)
 						.queue()
 		);

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

@@ -9,6 +9,9 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
@@ -28,6 +31,7 @@
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.config.GuildConfig;
 import net.javadiscord.javabot.systems.moderation.ModerationService;
+import net.javadiscord.javabot.systems.moderation.report.ReportManager;
 import net.javadiscord.javabot.systems.moderation.warn.dao.WarnRepository;
 import net.javadiscord.javabot.systems.moderation.warn.model.WarnSeverity;
 import net.javadiscord.javabot.systems.notification.NotificationService;
@@ -72,6 +76,7 @@ public class InteractionUtils implements ButtonHandler, ModalHandler, StringSele
 	private final BotConfig botConfig;
 	private final WarnRepository warnRepository;
 	private final ExecutorService asyncPool;
+	private final ReportManager reportManager;
 
 	/**
 	 * Deletes a message, only if the person deleting the message is the author
@@ -106,10 +111,11 @@ private void kick(ModalInteraction interaction, @NotNull Guild guild, String mem
 			return;
 		}
 		ModerationService service = new ModerationService(notificationService, botConfig, interaction, warnRepository, asyncPool);
-		guild.retrieveMemberById(memberId).queue(
-				member -> {
-					service.kick(member.getUser(), reason, interaction.getMember(), interaction.getMessageChannel(), false);
+		guild.getJDA().retrieveUserById(memberId).queue(
+				user -> {
+					service.kick(user, reason, interaction.getMember(), interaction.getMessageChannel(), false);
 					interaction.getMessage().editMessageComponents(ActionRow.of(Button.danger(interaction.getModalId(), "Kicked by " + UserUtils.getUserTag(interaction.getUser())).asDisabled())).queue();
+					resolveIfInReport(interaction.getChannel(), user);
 				}, error -> Responses.error(interaction.getHook(), "Could not find member: " + error.getMessage()).queue()
 		);
 	}
@@ -120,10 +126,11 @@ private void warn(ModalInteraction interaction, @NotNull Guild guild, String mem
 			return;
 		}
 		ModerationService service = new ModerationService(notificationService, botConfig, interaction, warnRepository, asyncPool);
-		guild.retrieveMemberById(memberId).queue(
-				member -> {
-					service.warn(member.getUser(), severity, reason, interaction.getMember(), interaction.getMessageChannel(), false);
+		guild.getJDA().retrieveUserById(memberId).queue(
+				user -> {
+					service.warn(user, severity, reason, interaction.getMember(), interaction.getMessageChannel(), false);
 					interaction.getHook().editOriginalComponents(ActionRow.of(Button.primary(interaction.getModalId(), "Warned by " + UserUtils.getUserTag(interaction.getUser())).asDisabled())).queue();
+					resolveIfInReport(interaction.getChannel(), user);
 				}, error -> Responses.error(interaction.getHook(), "Could not find member: " + error.getMessage()).queue()
 		);
 	}
@@ -138,9 +145,21 @@ private void ban(ModalInteraction interaction, @NotNull Guild guild, String memb
 				user -> {
 					service.ban(user, reason, interaction.getMember(), interaction.getMessageChannel(), false);
 					interaction.getMessage().editMessageComponents(ActionRow.of(Button.danger(interaction.getModalId(), "Banned by " + UserUtils.getUserTag(interaction.getUser())).asDisabled())).queue();
+					resolveIfInReport(interaction.getChannel(), user);
 				}, error -> Responses.error(interaction.getHook(), "Could not find member: " + error.getMessage()).queue()
 		);
 	}
+	
+	private void resolveIfInReport(MessageChannelUnion currentChannel, User actioner) {
+		if (!currentChannel.getType().isThread()) {
+			return;
+		}
+		ThreadChannel currentThread = currentChannel.asThreadChannel();
+		if (currentThread.getParentChannel().getIdLong() != botConfig.get(currentThread.getGuild()).getModerationConfig().getReportChannelId()) {
+			return;
+		}
+		reportManager.resolveReport(actioner, currentThread);
+	}
 
 	private void unban(ModalInteraction interaction, long memberId, String reason) {
 		if(!interaction.getMember().hasPermission(Permission.BAN_MEMBERS)) {