Updated the Command Interface

Additionally, TODO comments were added to the `CommandHandler.java` class.
beanbeanjuice · Oct 29, 2023 · 0264beb · 0264beb
1 parent 4633f47
commit 0264beb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/com/beanbeanjuice/utility/command/CommandHandler.java b/src/main/java/com/beanbeanjuice/utility/command/CommandHandler.java
@@ -186,6 +186,7 @@ public CommandHandler(@NotNull JDA jda) {
                     List<SubcommandData> subCommands = new ArrayList<>();
 
                     for (ISubCommand subCommand : command.getSubCommands()) {
+                        // TODO: Check if subcommand is a modal.
                         SubcommandData subCommandData = new SubcommandData(subCommand.getName(), subCommand.getDescription());
                         subCommandData.addOptions(subCommand.getOptions());
                         subCommands.add(subCommandData);
@@ -195,7 +196,7 @@ public CommandHandler(@NotNull JDA jda) {
                 }
 
                 case MODAL -> {
-                    // Do nothing.
+                    // Do nothing. TODO: Remove this?
                 }
             }
 

diff --git a/src/main/java/com/beanbeanjuice/utility/command/ICommand.java b/src/main/java/com/beanbeanjuice/utility/command/ICommand.java
@@ -23,9 +23,7 @@ public interface ICommand {
      */
     void handle(@NotNull SlashCommandInteractionEvent event);
 
-    default void handleModal(@NotNull ModalInteractionEvent event) {
-        return;
-    };
+    default void handleModal(@NotNull ModalInteractionEvent event) { }
 
     /**
      * @return The description for the {@link ICommand}.
@@ -72,11 +70,10 @@ default ArrayList<ISubCommand> getSubCommands() {
      * @param event The {@link SlashCommandInteractionEvent event} that triggered the {@link ICommand}.
      */
     default void runSubCommand(@NotNull String subCommandName, @NotNull SlashCommandInteractionEvent event) {
-        for (ISubCommand subCommand : getSubCommands()) {
-            if (subCommand.getName().equals(subCommandName)) {
+        getSubCommands().forEach((subCommand) -> {
+            if (subCommand.getName().equals(subCommandName))
                 subCommand.handle(event);
-            }
-        }
+        });
     }
 
     /**