GH-425 Fix @OptionalArg annotation for the jda platform. (#425)

Rollczi · Sep 8, 2024 · 7d2d3fd · 7d2d3fd
1 parent 0990398
commit 7d2d3fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/litecommands-core/src/dev/rollczi/litecommands/argument/SimpleArgument.java b/litecommands-core/src/dev/rollczi/litecommands/argument/SimpleArgument.java
@@ -70,4 +70,9 @@ public Optional<ParseResult<T>> defaultValue() {
         return Optional.empty();
     }
 
+    @Override
+    public boolean hasDefaultValue() {
+        return nullable;
+    }
+
 }
diff --git a/litecommands-jda/src/dev/rollczi/litecommands/jda/JDACommandTranslator.java b/litecommands-jda/src/dev/rollczi/litecommands/jda/JDACommandTranslator.java
@@ -170,7 +170,7 @@ private <SENDER> CommandExecutor<SENDER> translateExecutor(CommandRoute<SENDER>
         for (Argument<?> argument : executor.getArguments()) {
             String argumentName = argument.getName();
             String description = this.getDescription(argument);
-            boolean isRequired = !wrapperRegistry.getWrappedExpectedFactory(argument.getWrapperFormat()).canCreateEmpty();
+            boolean isRequired = isRequired(argument);
 
             Class<?> parsedType = argument.getWrapperFormat().getParsedType();
             if (jdaSupportedTypes.containsKey(parsedType)) {
@@ -195,6 +195,14 @@ private <SENDER> CommandExecutor<SENDER> translateExecutor(CommandRoute<SENDER>
         return executor;
     }
 
+    private boolean isRequired(Argument<?> argument) {
+        if (argument.hasDefaultValue()) {
+            return false;
+        }
+
+        return !wrapperRegistry.getWrappedExpectedFactory(argument.getWrapperFormat()).canCreateEmpty();
+    }
+
     private interface TranslateExecutorConsumer {
         void translate(OptionType optionType, JDATypeMapper<?> mapper, String argName, String description, boolean isRequired, boolean autocomplete);
     }