Updated CommandManagerImpl to better handle Command Results, now Command Results are properly supported...

Author: RealMangorage

src/main/java/org/mangorage/mangobotcore/jda/command/internal/CommandManagerImpl.java

@@ -4,6 +4,7 @@
 import org.mangorage.commonutils.misc.Arguments;
 import org.mangorage.commonutils.misc.TaskScheduler;
 import org.mangorage.mangobotcore.jda.command.api.CommandManager;
+import org.mangorage.mangobotcore.jda.command.api.CommandResult;
 import org.mangorage.mangobotcore.jda.command.api.ICommand;
 import org.mangorage.mangobotcore.jda.event.CommandEvent;
 
@@ -44,14 +45,16 @@ public void handle(Message message) {
             var success = false;
             for (ICommand command : commands.values()) {
                 if (command.commands().contains(cmd[0])) {
-                    command.execute(message, arguments);
+                    command.execute(message, arguments).accept(message);
                     success = true;
                     break;
                 }
             }
-            if (!success)
-                CommandEvent.BUS.post(new CommandEvent(message, cmd[0], arguments));
-
+            if (!success) {
+                var event = CommandEvent.BUS.fire(new CommandEvent(message, cmd[0], arguments));
+                if (event.isHandled())
+                    event.getResult().accept(message);
+            }
             if (silent) {
                 TaskScheduler.getExecutor().schedule(() -> {
                     message.delete().queue();

src/main/java/org/mangorage/mangobotcore/jda/event/CommandEvent.java

@@ -13,7 +13,7 @@ public final class CommandEvent extends MutableEvent {
     private final String cmd;
     private final Arguments arguments;
 
-    private boolean handled = false;
+    private CommandResult result = null;
 
     public CommandEvent(Message message, String cmd, Arguments arguments) {
         this.message = message;
@@ -33,11 +33,15 @@ public String getCommand() {
         return cmd;
     }
 
-    public void setHandled(CommandResult execute) {
-        this.handled = true;
+    public void setHandled(CommandResult result) {
+        this.result = result;
     }
 
     public boolean isHandled() {
-        return handled;
+        return result != null;
+    }
+
+    public CommandResult getResult() {
+        return result;
     }
 }