Merge pull request #401 from danthe1st/timeout-on-warn

timeout users when exceeding specific warn severity

Author: MoonTM-GIT

src/main/java/net/javadiscord/javabot/data/config/guild/ModerationConfig.java

@@ -55,6 +55,17 @@ public class ModerationConfig extends GuildConfigItem {
 	 */
 	private int maxWarnSeverity = 100;
 
+	/**
+	 * The maximum total severity that a user can accrue from warnings before
+	 * being timeouted in the server.
+	 */
+	private int timeoutSeverity = 50;
+
+	/**
+	 * The duration (in hours) to timeout users when they exceeded {@link #timeoutSeverity}.
+	 */
+	private int warnTimeoutHours = 2;
+	
 	/**
 	 * ID of the channel where direct user notifications should be sent to (using private threads).
 	 * @see net.javadiscord.javabot.systems.notification.UserNotificationService

src/main/java/net/javadiscord/javabot/systems/moderation/AutoMod.java

@@ -184,7 +184,7 @@ private void handleSpam(@Nonnull Message msg, Member member) {
 		}
 		new ModerationService(notificationService, botConfig.get(member.getGuild()), warnRepository, asyncPool)
 				.timeout(
-						member,
+						member.getUser(),
 						"Automod: Spam",
 						msg.getGuild().getSelfMember(),
 						Duration.of(6, ChronoUnit.HOURS),

src/main/java/net/javadiscord/javabot/systems/moderation/ModerationService.java

@@ -93,6 +93,9 @@ public void warn(User user, WarnSeverity severity, String reason, Member warnedB
 				if (!quiet && channel.getIdLong() != moderationConfig.getLogChannelId()) {
 					channel.sendMessageEmbeds(warnEmbed).queue();
 				}
+				if (totalSeverity > moderationConfig.getTimeoutSeverity() && totalSeverity-severity.getWeight() <= moderationConfig.getTimeoutSeverity()) {
+					timeout(user, "Too many warns", warnedBy, Duration.ofHours(moderationConfig.getWarnTimeoutHours()), channel, quiet);
+				}
 				if (totalSeverity > moderationConfig.getMaxWarnSeverity()) {
 					ban(user, "Too many warns", warnedBy, channel, quiet);
 				}
@@ -179,18 +182,18 @@ public List<Warn> getAllWarns(long userId) {
 	/**
 	 * Adds a Timeout to the member.
 	 *
-	 * @param member     The member to time out.
+	 * @param user       The user to time out.
 	 * @param reason     The reason for adding this Timeout.
 	 * @param timedOutBy The member who is responsible for adding this Timeout.
 	 * @param duration   How long the Timeout should last.
 	 * @param channel    The channel in which the Timeout was issued.
 	 * @param quiet      If true, don't send a message in the channel.
 	 */
-	public void timeout(@Nonnull Member member, @Nonnull String reason, @Nonnull Member timedOutBy, @Nonnull Duration duration, @Nonnull MessageChannel channel, boolean quiet) {
-		MessageEmbed timeoutEmbed = buildTimeoutEmbed(member, timedOutBy, reason, duration);
-		member.getGuild().timeoutFor(member, duration).queue(s -> {
-			notificationService.withUser(member.getUser(), timedOutBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(timeoutEmbed));
-			notificationService.withGuild(member.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(timeoutEmbed));
+	public void timeout(@Nonnull User user, @Nonnull String reason, @Nonnull Member timedOutBy, @Nonnull Duration duration, @Nonnull MessageChannel channel, boolean quiet) {
+		MessageEmbed timeoutEmbed = buildTimeoutEmbed(user, timedOutBy, reason, duration);
+		timedOutBy.getGuild().timeoutFor(user, duration).queue(s -> {
+			notificationService.withUser(user, timedOutBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(timeoutEmbed));
+			notificationService.withGuild(timedOutBy.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(timeoutEmbed));
 			if (!quiet) channel.sendMessageEmbeds(timeoutEmbed).queue();
 		}, ExceptionLogger::capture);
 	}
@@ -359,8 +362,8 @@ public void kick(User user, String reason, Member kickedBy, MessageChannel chann
 				.build();
 	}
 
-	private @NotNull MessageEmbed buildTimeoutEmbed(@NotNull Member member, Member timedOutBy, String reason, Duration duration) {
-		return buildModerationEmbed(member.getUser(), timedOutBy, reason)
+	private @NotNull MessageEmbed buildTimeoutEmbed(@NotNull User user, Member timedOutBy, String reason, Duration duration) {
+		return buildModerationEmbed(user, timedOutBy, reason)
 				.setTitle("Timeout")
 				.setColor(Responses.Type.ERROR.getColor())
 				.addField("Ends", String.format("<t:%d:R>", Instant.now().plus(duration).getEpochSecond()), true)

src/main/java/net/javadiscord/javabot/systems/moderation/timeout/AddTimeoutSubcommand.java

@@ -80,7 +80,7 @@ protected ReplyCallbackAction handleTimeoutCommand(@NotNull SlashCommandInteract
 			return Responses.error(event, "Could not timeout %s; they're already timed out.", member.getAsMention());
 		}
 		ModerationService service = new ModerationService(notificationService, botConfig, event.getInteraction(), warnRepository, asyncPool);
-		service.timeout(member, reasonOption.getAsString(), event.getMember(), duration, channel, quiet);
+		service.timeout(member.getUser(), reasonOption.getAsString(), event.getMember(), duration, channel, quiet);
 		return Responses.success(event, "User Timed Out", "%s has been timed out.", member.getAsMention());
 	}
 }