Introduce CommandArgument and CommandArguments for slash commands

api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pixelservices.mobot</groupId>
         <artifactId>mobot</artifactId>
-        <version>0.4.5</version>
+        <version>0.4.6</version>
     </parent>
 
     <artifactId>mobot-api</artifactId>

api/src/main/java/com/pixelservices/mobot/api/commands/CommandArgument.java

@@ -0,0 +1,41 @@
+package com.pixelservices.mobot.api.commands;
+
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+
+public class CommandArgument {
+    private final OptionMapping option;
+
+    public CommandArgument(OptionMapping option) {
+        this.option = option;
+    }
+
+    public boolean isPresent() {
+        return option != null;
+    }
+
+    public String getAsString() {
+        return option != null ? option.getAsString() : null;
+    }
+
+    public Integer getAsInt() {
+        return option != null ? option.getAsInt() : null;
+    }
+
+    public Boolean getAsBoolean() {
+        return option != null ? option.getAsBoolean() : null;
+    }
+
+    public Double getAsDouble() {
+        return option != null ? option.getAsDouble() : null;
+    }
+
+    public Message.Attachment getAsAttachment() {
+        return option != null ? option.getAsAttachment() : null;
+    }
+
+    public OptionMapping getRaw() {
+        return option;
+    }
+}
+

api/src/main/java/com/pixelservices/mobot/api/commands/CommandArguments.java

@@ -0,0 +1,47 @@
+package com.pixelservices.mobot.api.commands;
+
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommandArguments {
+    private final Map<String, CommandArgument> args = new HashMap<>();
+
+    public void put(String name, OptionMapping mapping) {
+        args.put(name, new CommandArgument(mapping));
+    }
+
+    public CommandArgument get(String name) {
+        return args.getOrDefault(name, new CommandArgument(null));
+    }
+
+    public String getAsString(String name) {
+        return get(name).getAsString();
+    }
+
+    public Integer getAsInt(String name) {
+        return get(name).getAsInt();
+    }
+
+    public Double getAsDouble(String name) {
+        return get(name).getAsDouble();
+    }
+
+    public Boolean getAsBoolean(String name) {
+        return get(name).getAsBoolean();
+    }
+
+    public net.dv8tion.jda.api.entities.Message.Attachment getAsAttachment(String name) {
+        return get(name).getAsAttachment();
+    }
+
+    public boolean has(String name) {
+        return args.containsKey(name) && args.get(name).isPresent();
+    }
+
+    public Map<String, CommandArgument> asMap() {
+        return Map.copyOf(args);
+    }
+}
+

api/src/main/java/com/pixelservices/mobot/api/commands/SlashCommandArgument.java

@@ -3,11 +3,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Annotation to define an argument for a SlashCommand.

api/src/main/java/com/pixelservices/mobot/api/modules/MbModule.java

@@ -7,7 +7,6 @@
 import com.pixelservices.mobot.api.env.PrimitiveBotEnvironment;
 import com.pixelservices.mobot.api.modules.listener.ListenerBridge;
 import com.pixelservices.mobot.api.modules.listener.ModuleListener;
-import com.pixelservices.mobot.api.scheduler.ScheduledTask;
 import com.pixelservices.mobot.api.scheduler.TaskScheduler;
 import com.pixelservices.plugin.Plugin;
 

core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.pixelservices.mobot</groupId>
         <artifactId>mobot</artifactId>
-        <version>0.4.5</version>
+        <version>0.4.6</version>
     </parent>
 
     <artifactId>mobot-core</artifactId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.pixelservices.mobot</groupId>
             <artifactId>mobot-api</artifactId>
-            <version>0.4.5</version>
+            <version>0.4.6</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

core/src/main/java/com/pixelservices/mobot/MoBot.java

@@ -1,15 +1,14 @@
 package com.pixelservices.mobot;
 
+import com.pixelservices.config.ConfigFactory;
+import com.pixelservices.config.YamlConfig;
+import com.pixelservices.logger.Logger;
+import com.pixelservices.logger.LoggerFactory;
 import com.pixelservices.mobot.api.env.FinalizedBotEnvironment;
 import com.pixelservices.mobot.api.env.PrimitiveBotEnvironment;
-import com.pixelservices.mobot.api.scheduler.TaskScheduler;
 import com.pixelservices.mobot.commands.CommandManager;
-import com.pixelservices.config.ConfigFactory;
-import com.pixelservices.config.YamlConfig;
 import com.pixelservices.mobot.console.Console;
 import com.pixelservices.mobot.exceptions.BotStartupException;
-import com.pixelservices.logger.Logger;
-import com.pixelservices.logger.LoggerFactory;
 import com.pixelservices.mobot.modules.ModuleManager;
 import com.pixelservices.mobot.scheduler.BotTaskScheduler;
 import com.pixelservices.mobot.utils.UpdateChecker;

core/src/main/java/com/pixelservices/mobot/commands/CommandManager.java

@@ -1,12 +1,12 @@
 package com.pixelservices.mobot.commands;
 
+import com.pixelservices.logger.Logger;
+import com.pixelservices.logger.LoggerFactory;
 import com.pixelservices.mobot.api.commands.SlashCommand;
 import com.pixelservices.mobot.api.commands.SlashCommandArgument;
 import com.pixelservices.mobot.api.commands.SlashCommandChoice;
 import com.pixelservices.mobot.api.commands.SlashCommandHandler;
 import com.pixelservices.mobot.exceptions.CommandExecuteException;
-import com.pixelservices.logger.Logger;
-import com.pixelservices.logger.LoggerFactory;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;

core/src/main/java/com/pixelservices/mobot/commands/SlashCommandExecutor.java

@@ -1,5 +1,6 @@
 package com.pixelservices.mobot.commands;
 
+import com.pixelservices.mobot.api.commands.CommandArguments;
 import com.pixelservices.mobot.api.commands.SlashCommandArgument;
 import com.pixelservices.mobot.api.commands.SlashCommandHandler;
 import com.pixelservices.mobot.exceptions.CommandExecuteException;
@@ -45,15 +46,35 @@ void execute(SlashCommandInteractionEvent event) {
             if (parameters.length == 0 || parameters[0].getType() != SlashCommandInteractionEvent.class || parameters.length > 2) {
                 throw new CommandExecuteException("Incompatible method parameters. " + Arrays.toString(parameters));
             }
+
             if (parameters.length == 1) {
                 method.invoke(handler, event);
-            } else {
-                Map<String, Object> parsedArgs = new HashMap<>();
+                return;
+            }
+
+            Object argumentContainer;
+
+            Class<?> paramType = parameters[1].getType();
+            if (Map.class.isAssignableFrom(paramType)) {
+                // OLD WAY (DEPRECATED)
+                Map<String, Object> legacyArgs = new HashMap<>();
+                for (SlashCommandArgument arg : arguments) {
+                    legacyArgs.put(arg.name(), event.getOption(arg.name()));
+                }
+                argumentContainer = legacyArgs;
+            } else if (paramType == CommandArguments.class) {
+                CommandArguments parsedArgs = new CommandArguments();
                 for (SlashCommandArgument arg : arguments) {
                     parsedArgs.put(arg.name(), event.getOption(arg.name()));
                 }
-                method.invoke(handler, event, parsedArgs);
+                argumentContainer = parsedArgs;
+
+            } else {
+                throw new CommandExecuteException("Unsupported argument type: " + paramType.getName());
             }
+
+            method.invoke(handler, event, argumentContainer);
+
         } catch (Exception e) {
             throw new CommandExecuteException(e);
         }

core/src/main/java/com/pixelservices/mobot/console/Console.java

@@ -1,11 +1,11 @@
 package com.pixelservices.mobot.console;
 
+import com.pixelservices.logger.Logger;
+import com.pixelservices.logger.LoggerFactory;
 import com.pixelservices.mobot.MoBot;
 import com.pixelservices.mobot.console.impl.ModuleCommand;
 import com.pixelservices.mobot.console.impl.SetTokenCommand;
 import com.pixelservices.mobot.console.impl.VersionCommand;
-import com.pixelservices.logger.Logger;
-import com.pixelservices.logger.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/com/pixelservices/mobot/console/impl/ModuleCommand.java

@@ -1,17 +1,16 @@
 package com.pixelservices.mobot.console.impl;
 
+import com.pixelservices.logger.Logger;
 import com.pixelservices.mobot.api.modules.MbModule;
 import com.pixelservices.mobot.api.modules.ModuleState;
 import com.pixelservices.mobot.api.scheduler.ScheduledTask;
 import com.pixelservices.mobot.api.scheduler.TaskScheduler;
 import com.pixelservices.mobot.console.ConsoleCommand;
-import com.pixelservices.logger.Logger;
 import com.pixelservices.mobot.modules.ModuleManager;
 import com.pixelservices.plugin.PluginWrapper;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import java.util.Set;
 
 public class ModuleCommand implements ConsoleCommand {
 

core/src/main/java/com/pixelservices/mobot/console/impl/SetTokenCommand.java

@@ -1,9 +1,9 @@
 package com.pixelservices.mobot.console.impl;
 
 import com.pixelservices.config.ConfigFactory;
-import com.pixelservices.mobot.console.ConsoleCommand;
 import com.pixelservices.config.YamlConfig;
 import com.pixelservices.logger.Logger;
+import com.pixelservices.mobot.console.ConsoleCommand;
 
 public class SetTokenCommand implements ConsoleCommand {
 

core/src/main/java/com/pixelservices/mobot/console/impl/VersionCommand.java

@@ -1,7 +1,7 @@
 package com.pixelservices.mobot.console.impl;
 
-import com.pixelservices.mobot.console.ConsoleCommand;
 import com.pixelservices.logger.Logger;
+import com.pixelservices.mobot.console.ConsoleCommand;
 import com.pixelservices.mobot.utils.UpdateChecker;
 
 public class VersionCommand implements ConsoleCommand {

core/src/main/java/com/pixelservices/mobot/logger/CustomLogbackAppender.java

@@ -1,10 +1,10 @@
 package com.pixelservices.mobot.logger;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.classic.spi.ThrowableProxy;
 import ch.qos.logback.core.AppenderBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ch.qos.logback.classic.spi.ThrowableProxy;
 
 public class CustomLogbackAppender extends AppenderBase<ILoggingEvent> {
     private final Logger customLogger = LoggerFactory.getLogger("Internal");

core/src/main/java/com/pixelservices/mobot/modules/RegistryBridgeImpl.java

@@ -1,8 +1,8 @@
 package com.pixelservices.mobot.modules;
 
+import com.pixelservices.mobot.api.commands.SlashCommandHandler;
 import com.pixelservices.mobot.api.modules.RegistryBridge;
 import com.pixelservices.mobot.commands.CommandManager;
-import com.pixelservices.mobot.api.commands.SlashCommandHandler;
 
 /**
  * This class serves as a bridge for registering commands and command handlers.

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.pixelservices.mobot</groupId>
     <artifactId>mobot</artifactId>
-    <version>0.4.5</version>
+    <version>0.4.6</version>
     <packaging>pom</packaging>
 
     <distributionManagement>