refactor: moved tests commands into a new tests package

Greazi-Times · Apr 24, 2024 · b0699cd · b0699cd
1 parent 99d06ee
commit b0699cd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/com/greazi/discordbotfoundation/SimpleBot.java b/src/main/java/com/greazi/discordbotfoundation/SimpleBot.java
@@ -1,10 +1,10 @@
 package com.greazi.discordbotfoundation;
 
 import com.greazi.discordbotfoundation.command.PingCommand;
-import com.greazi.discordbotfoundation.command.ReplyCommand;
+import com.greazi.discordbotfoundation.tests.ReplyCommand;
 import com.greazi.discordbotfoundation.command.SimpleCommand;
 import com.greazi.discordbotfoundation.command.SlashCommandHandler;
-import com.greazi.discordbotfoundation.command.tests.MainCommand;
+import com.greazi.discordbotfoundation.tests.MainCommand;
 import com.greazi.discordbotfoundation.constants.Constants;
 import com.greazi.discordbotfoundation.debug.BotException;
 import com.greazi.discordbotfoundation.mysql.SqlManager;
@@ -173,7 +173,11 @@ public SimpleBot() {
         onBotLoad();
 
         registerCommands(
-                new PingCommand(),
+                new PingCommand()
+        );
+
+        // Register tests commands
+        registerCommands(
                 new ReplyCommand(),
                 new MainCommand()
         );

diff --git a/src/main/java/com/greazi/discordbotfoundation/command/SlashCommandHandler.java b/src/main/java/com/greazi/discordbotfoundation/command/SlashCommandHandler.java
@@ -41,7 +41,7 @@ public void onSlashCommandInteraction(@NotNull final SlashCommandInteractionEven
             simpleCommand.execute(event, simpleCommand);
         } else {
             final Optional<SimpleCommand> sub = simpleCommand
-                    .getSubcommands()
+                    .getSubcommandsList()
                     .stream()
                     .filter(subcommand -> subcommand.getCommand().equals(event.getSubcommandName()))
                     .findFirst();

diff --git a/...foundation/command/tests/MainCommand.java → ...scordbotfoundation/tests/MainCommand.java b/...foundation/command/tests/MainCommand.java → ...scordbotfoundation/tests/MainCommand.java
@@ -1,4 +1,4 @@
-package com.greazi.discordbotfoundation.command.tests;
+package com.greazi.discordbotfoundation.tests;
 
 import com.greazi.discordbotfoundation.command.SimpleCommand;
 

diff --git a/...rdbotfoundation/command/ReplyCommand.java → ...cordbotfoundation/tests/ReplyCommand.java b/...rdbotfoundation/command/ReplyCommand.java → ...cordbotfoundation/tests/ReplyCommand.java
@@ -1,5 +1,6 @@
-package com.greazi.discordbotfoundation.command;
+package com.greazi.discordbotfoundation.tests;
 
+import com.greazi.discordbotfoundation.command.SimpleCommand;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
@@ -16,6 +17,10 @@ public ReplyCommand() {
     }
 
     public void onCommand(String message, User user) {
-
+        if (user == null) {
+            reply(message);
+        } else {
+            reply(user.getAsMention() + ", " + message);
+        }
     }
 }
diff --git a/...oundation/command/tests/Test1Command.java → ...cordbotfoundation/tests/Test1Command.java b/...oundation/command/tests/Test1Command.java → ...cordbotfoundation/tests/Test1Command.java
@@ -1,4 +1,4 @@
-package com.greazi.discordbotfoundation.command.tests;
+package com.greazi.discordbotfoundation.tests;
 
 import com.greazi.discordbotfoundation.command.SimpleCommand;
 import net.dv8tion.jda.api.entities.Message;

diff --git a/...oundation/command/tests/Test2Command.java → ...cordbotfoundation/tests/Test2Command.java b/...oundation/command/tests/Test2Command.java → ...cordbotfoundation/tests/Test2Command.java
@@ -1,4 +1,4 @@
-package com.greazi.discordbotfoundation.command.tests;
+package com.greazi.discordbotfoundation.tests;
 
 import com.greazi.discordbotfoundation.command.SimpleCommand;