From f7f3813ec8d23ab8e57d770644aeb41f9f861853 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:41:37 +0700
Subject: [PATCH] refactor: getAction in context

---
 build-number.txt                                              | 2 +-
 .../java/me/chayapak1/chomens_bot/command/CommandContext.java | 4 ++++
 .../java/me/chayapak1/chomens_bot/commands/CloopCommand.java  | 2 +-
 .../java/me/chayapak1/chomens_bot/commands/EvalCommand.java   | 2 +-
 .../me/chayapak1/chomens_bot/commands/IPFilterCommand.java    | 2 +-
 .../java/me/chayapak1/chomens_bot/commands/MailCommand.java   | 2 +-
 .../java/me/chayapak1/chomens_bot/commands/MusicCommand.java  | 2 +-
 .../me/chayapak1/chomens_bot/commands/WhitelistCommand.java   | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index 20888455..ca12c174 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1403
\ No newline at end of file
+1404
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
index d14bab52..64b48ce9 100644
--- a/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
+++ b/src/main/java/me/chayapak1/chomens_bot/command/CommandContext.java
@@ -87,6 +87,10 @@ public class CommandContext {
         return returnLowerCase ? string.toLowerCase() : string;
     }
 
+    public String getAction () throws CommandException {
+        return getString(false, true, true, "action");
+    }
+
     public Integer getInteger (boolean required) throws CommandException {
         final String string = getString(false, required, "integer");
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java
index a0b8628e..ccf18e8e 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/CloopCommand.java
@@ -30,7 +30,7 @@ public class CloopCommand extends Command {
     public Component execute(CommandContext context) throws CommandException {
         final Bot bot = context.bot;
 
-        final String action = context.getString(false, true, true);
+        final String action = context.getAction();
 
         switch (action) {
             case "add" -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java
index 81cd2f51..4bc0d60b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java
@@ -30,7 +30,7 @@ public class EvalCommand extends Command {
 
         if (!bot.eval.connected) throw new CommandException(Component.text("Eval server is not online"));
 
-        final String action = context.getString(false, true);
+        final String action = context.getAction();
 
         switch (action) {
             case "run" -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
index 952696c4..fb507a01 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/IPFilterCommand.java
@@ -37,7 +37,7 @@ public class IPFilterCommand extends Command {
     public Component execute(CommandContext context) throws CommandException {
         final Bot bot = context.bot;
 
-        final String action = context.getString(false, true, true);
+        final String action = context.getAction();
 
         switch (action) {
             case "add" -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
index 4b7d9174..e6556d3d 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
@@ -45,7 +45,7 @@ public class MailCommand extends Command {
 
         // kinda messy ngl
 
-        final String action = context.getString(false, true, true);
+        final String action = context.getAction();
 
         switch (action) {
             case "send" -> DatabasePlugin.executorService.submit(() -> {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java
index 3b190b0a..4ad07e47 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java
@@ -64,7 +64,7 @@ public class MusicCommand extends Command {
     public Component execute(CommandContext context) throws CommandException {
         if (context.bot.music.locked && !(context instanceof ConsoleCommandContext)) throw new CommandException(Component.text("Managing music is currently locked"));
 
-        final String action = context.getString(false, true, true);
+        final String action = context.getAction();
 
         root = MusicPlayerPlugin.SONG_DIR;
         return switch (action) {
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java
index 55b50b5a..147eadf5 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/WhitelistCommand.java
@@ -29,7 +29,7 @@ public class WhitelistCommand extends Command {
     public Component execute(CommandContext context) throws CommandException {
         final Bot bot = context.bot;
 
-        final String action = context.getString(false, true, true);
+        final String action = context.getAction();
 
         switch (action) {
             case "enable" -> {