VC Activity command crash fix #300

application/src/main/java/org/togetherjava/tjbot/commands/basic/VcActivityCommand.java

@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Implements the {@code vc-activity} command. Creates VC activities.
@@ -45,6 +46,9 @@ public final class VcActivityCommand extends SlashCommandAdapter {
     private static final String MAX_USES_OPTION = "max-uses";
     private static final String MAX_AGE_OPTION = "max-age";
 
+    private static final long MAX_VALUE_MAX_AGE = TimeUnit.DAYS.toSeconds(7);
+    private static final long MAX_VALE_MAX_USES = 100;
+
     public static final String YOUTUBE_TOGETHER_NAME = "YouTube Together";
     public static final String POKER_NAME = "Poker";
     public static final String BETRAYAL_IO_NAME = "Betrayal.io";
@@ -83,11 +87,12 @@ public final class VcActivityCommand extends SlashCommandAdapter {
             "879863976006127627", LETTERTILE_NAME, "879863686565621790");
 
     private static final List<OptionData> inviteOptions = List.of(
-            new OptionData(OptionType.STRING, MAX_USES_OPTION,
-                    "The amount of times the invite can be used, default is infinity", false),
+            new OptionData(OptionType.INTEGER, MAX_USES_OPTION,
+                    "The amount of times the invite can be used, default is infinity", false)
+                        .setRequiredRange(0, MAX_VALE_MAX_USES),
             new OptionData(OptionType.INTEGER, MAX_AGE_OPTION,
-                    "Max age in seconds. Set this to 0 to never expire, default is 1 day", false));
-
+                    "Max age in seconds. Set this to 0 to never expire, default is 1 day", false)
+                        .setRequiredRange(0, MAX_VALUE_MAX_AGE));
 
     /**
      * Constructs an instance
@@ -148,29 +153,15 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
         OptionMapping maxUsesOption = event.getOption(MAX_USES_OPTION);
         OptionMapping maxAgeOption = event.getOption(MAX_AGE_OPTION);
 
+        String applicationId;
+        String applicationName;
         Integer maxUses;
-
-        // the user already received the error in the handleIntegerTypeOption method
-        // it still throws to tell us to return this method and stop the proceeding code
-        try {
-            maxUses = handleIntegerTypeOption(event, maxUsesOption);
-        } catch (IllegalArgumentException ignore) {
-            return;
-        }
-
         Integer maxAge;
 
-        // the user already received the error in the handleIntegerTypeOption method
-        // it still throws to tell us to return this method and stop the proceeding code
-        try {
-            maxAge = handleIntegerTypeOption(event, maxAgeOption);
-        } catch (IllegalArgumentException ignore) {
-            return;
-        }
 
+        maxUses = handleIntegerTypeOption(maxUsesOption);
+        maxAge = handleIntegerTypeOption(maxAgeOption);
 
-        String applicationId;
-        String applicationName;
 
         if (applicationOption != null) {
             applicationName = applicationOption.getAsString();
@@ -223,51 +214,29 @@ private static void handleErrors(@NotNull SlashCommandEvent event,
         logger.warn("Something went wrong in the VcActivityCommand", throwable);
     }
 
-
     /**
-     * This grabs the OptionMapping, after this it <br />
-     * - validates whenever it's within an {@link Integer Integer's} range <br />
-     * - validates whenever it's positive <br />
+     * This grabs the OptionMapping, after this it returns null of the OptionMapping is null, else
+     * it'll return the number option as an Integer
      *
      * <p>
      * <p/>
      *
-     * @param event the {@link SlashCommandEvent}
      * @param optionMapping the {@link OptionMapping}
      * @return nullable {@link Integer}
-     * @throws java.lang.IllegalArgumentException if the option's value is - outside of
-     *         {@link Integer#MAX_VALUE} - negative
-     */
-    @Contract("_, null -> null")
-    private static @Nullable Integer handleIntegerTypeOption(@NotNull SlashCommandEvent event,
+     **/
+    @Contract("null -> null")
+    private static @Nullable Integer handleIntegerTypeOption(
             @Nullable OptionMapping optionMapping) {
 
         int optionValue;
 
         if (optionMapping == null) {
             return null;
-        }
+        } else {
 
-        try {
             optionValue = Math.toIntExact(optionMapping.getAsLong());
-        } catch (ArithmeticException e) {
-            event
-                .reply("The " + optionMapping.getName() + " is above `" + Integer.MAX_VALUE
-                        + "`, which is too high")
-                .setEphemeral(true)
-                .queue();
-            throw new IllegalArgumentException(
-                    optionMapping.getName() + " can't be above " + Integer.MAX_VALUE);
-        }
 
-        if (optionValue < 0) {
-            event.reply("The " + optionMapping.getName() + " is negative, which isn't supported")
-                .setEphemeral(true)
-                .queue();
-            throw new IllegalArgumentException(optionMapping.getName() + " can't be negative");
         }
-
-
         return optionValue;
     }
 }