change /warn discard-all to only discard active warns

Author: danthe1st

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

@@ -97,7 +97,7 @@ public void warn(User user, WarnSeverity severity, String reason, Member warnedB
 	 */
 	public SeverityInformation getTotalSeverityWeight(Guild guild, long userId) {
 		ModerationConfig moderationConfig = botConfig.get(guild).getModerationConfig();
-		List<Warn> activeWarns = warnRepository.getActiveWarnsByUserId(userId, LocalDateTime.now().minusDays(moderationConfig.getMaxWarnValidityDays()));
+		List<Warn> activeWarns = warnRepository.getActiveWarnsByUserId(userId, getEarliestActiveWarnTimestamp(moderationConfig));
 		return calculateSeverityWeight(moderationConfig, activeWarns);
 	}
 
@@ -132,9 +132,10 @@ static SeverityInformation calculateSeverityWeight(ModerationConfig moderationCo
 	 * @param clearedBy The user who cleared the warns.
 	 */
 	public void discardAllWarns(User user, Member clearedBy) {
+		ModerationConfig moderationConfig = getModerationConfig(clearedBy);
 		asyncPool.execute(() -> {
 			try {
-				warnRepository.discardAll(user.getIdLong());
+				warnRepository.discardAll(user.getIdLong(), getEarliestActiveWarnTimestamp(moderationConfig));
 				MessageEmbed embed = buildClearWarnsEmbed(user, clearedBy.getUser());
 				notificationService.withUser(user, clearedBy.getGuild()).sendDirectMessage(c -> c.sendMessageEmbeds(embed));
 				notificationService.withGuild(clearedBy.getGuild()).sendToModerationLog(c -> c.sendMessageEmbeds(embed));
@@ -144,6 +145,10 @@ public void discardAllWarns(User user, Member clearedBy) {
 		});
 	}
 
+	private LocalDateTime getEarliestActiveWarnTimestamp(ModerationConfig moderationConfig) {
+		return LocalDateTime.now().minusDays(moderationConfig.getMaxWarnValidityDays());
+	}
+
 	/**
 	 * Clears a warn by discarding the Warn with the corresponding id.
 	 *
@@ -177,7 +182,7 @@ public List<Warn> getWarns(Guild guild, long userId) {
 		try {
 			ModerationConfig moderationConfig = botConfig.get(guild).getModerationConfig();
 			WarnRepository repo = warnRepository;
-			LocalDateTime cutoff = LocalDateTime.now().minusDays(moderationConfig.getMaxWarnValidityDays());
+			LocalDateTime cutoff = getEarliestActiveWarnTimestamp(moderationConfig);
 			return repo.getActiveWarnsByUserId(userId, cutoff);
 		} catch (DataAccessException e) {
 			ExceptionLogger.capture(e, getClass().getSimpleName());

src/main/java/net/discordjug/javabot/systems/moderation/warn/dao/WarnRepository.java

@@ -63,16 +63,18 @@ public Optional<Warn> findById(long id) throws DataAccessException {
 	}
 
 	/**
-	 * Discards all warnings that have been issued to a given user.
+	 * Discards all warnings that have been issued to a given user after a given timestamp.
 	 *
 	 * @param userId The id of the user to discard warnings for.
+	 * @param cutoff timestamp specifying which warns should be discarded. Only warns after the cutoff are discarded.
 	 * @throws SQLException If an error occurs.
 	 */
-	public void discardAll(long userId) throws DataAccessException {
+	public void discardAll(long userId, LocalDateTime cutoff) throws DataAccessException {
 		jdbcTemplate.update("""
 				UPDATE warn SET discarded = TRUE
-				WHERE user_id = ?""",
-				userId);
+				WHERE user_id = ?
+				AND created_at > ?""",
+				userId, Timestamp.valueOf(cutoff));
 	}
 
 	/**