Bugfix with temp ban/mute using weeks/months

* cant Instant#plus weeks and months
* also some improvements to the option order (UX)
* added fixme for code duplication

Author: Zabuzard

application/src/main/java/org/togetherjava/tjbot/commands/moderation/BanCommand.java

@@ -48,7 +48,7 @@ public final class BanCommand extends SlashCommandAdapter {
     private static final String ACTION_VERB = "ban";
     private static final String PERMANENT_DURATION = "permanent";
     private static final List<String> DURATIONS = List.of(PERMANENT_DURATION, "1 hour", "3 hours",
-            "1 day", "2 days", "3 days", "7 days", "1 month");
+            "1 day", "2 days", "3 days", "7 days", "30 days");
     private final Predicate<String> hasRequiredRole;
     private final ModerationActionsStore actionsStore;
 
@@ -151,15 +151,13 @@ private static Optional<RestAction<InteractionHook>> handleNotAlreadyBannedRespo
             return Optional.empty();
         }
 
-        // 1 day, 1 days, 1 month, ...
+        // 1 minute, 1 day, 2 days, ...
         String[] data = durationText.split(" ", 2);
         int duration = Integer.parseInt(data[0]);
         ChronoUnit unit = switch (data[1]) {
             case "minute", "minutes" -> ChronoUnit.MINUTES;
             case "hour", "hours" -> ChronoUnit.HOURS;
             case "day", "days" -> ChronoUnit.DAYS;
-            case "week", "weeks" -> ChronoUnit.WEEKS;
-            case "month", "months" -> ChronoUnit.MONTHS;
             default -> throw new IllegalArgumentException(
                     "Unsupported ban duration: " + durationText);
         };

application/src/main/java/org/togetherjava/tjbot/commands/moderation/MuteCommand.java

@@ -40,8 +40,8 @@ public final class MuteCommand extends SlashCommandAdapter {
     private static final String COMMAND_NAME = "mute";
     private static final String ACTION_VERB = "mute";
     private static final String PERMANENT_DURATION = "permanent";
-    private static final List<String> DURATIONS = List.of(PERMANENT_DURATION, "1 hour", "3 hours",
-            "1 day", "2 days", "3 days", "7 days", "1 month");
+    private static final List<String> DURATIONS = List.of("10 minutes", "30 minutes", "1 hour",
+            "3 hours", "1 day", "3 days", "7 days", PERMANENT_DURATION);
     private final Predicate<String> hasRequiredRole;
     private final ModerationActionsStore actionsStore;
 
@@ -106,21 +106,20 @@ private static RestAction<Boolean> sendDm(@NotNull ISnowflake target,
                 target.getUser(), durationText + dmNoticeText, reason);
     }
 
+    // FIXME Code duplication with BanCommand, get rid of it
     private static @NotNull Optional<TemporaryMuteData> computeTemporaryMuteData(
             @NotNull String durationText) {
         if (PERMANENT_DURATION.equals(durationText)) {
             return Optional.empty();
         }
 
-        // 1 day, 1 days, 1 month, ...
+        // 1 minute, 1 day, 2 days, ...
         String[] data = durationText.split(" ", 2);
         int duration = Integer.parseInt(data[0]);
         ChronoUnit unit = switch (data[1]) {
             case "minute", "minutes" -> ChronoUnit.MINUTES;
             case "hour", "hours" -> ChronoUnit.HOURS;
             case "day", "days" -> ChronoUnit.DAYS;
-            case "week", "weeks" -> ChronoUnit.WEEKS;
-            case "month", "months" -> ChronoUnit.MONTHS;
             default -> throw new IllegalArgumentException(
                     "Unsupported mute duration: " + durationText);
         };

application/src/main/java/org/togetherjava/tjbot/commands/moderation/temp/TemporaryModerationRoutine.java

@@ -12,8 +12,6 @@
 import org.togetherjava.tjbot.commands.moderation.ModerationActionsStore;
 
 import java.time.Instant;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Executors;