From 8b5e7067694059d414be7d4b0b9573e46412b227 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Sun, 16 Feb 2025 08:03:38 +0700
Subject: [PATCH] refactor: bot.getServerString() to reduce mess

---
 build-number.txt                                          | 2 +-
 src/main/java/me/chayapak1/chomens_bot/Bot.java           | 4 ++++
 src/main/java/me/chayapak1/chomens_bot/Main.java          | 2 +-
 .../me/chayapak1/chomens_bot/commands/MailCommand.java    | 4 ++--
 .../chayapak1/chomens_bot/commands/NetMessageCommand.java | 8 ++++----
 .../java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java | 2 +-
 .../me/chayapak1/chomens_bot/plugins/ConsolePlugin.java   | 4 ++--
 .../me/chayapak1/chomens_bot/plugins/DiscordPlugin.java   | 2 +-
 .../me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java   | 2 +-
 .../java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java  | 4 ++--
 .../me/chayapak1/chomens_bot/plugins/LoggerPlugin.java    | 2 +-
 .../chomens_bot/plugins/PlayersDatabasePlugin.java        | 6 +++---
 .../me/chayapak1/chomens_bot/plugins/PlayersPlugin.java   | 2 +-
 .../me/chayapak1/chomens_bot/util/LoggerUtilities.java    | 2 +-
 14 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index 894a5ad6..f733f7b3 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1510
\ No newline at end of file
+1511
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java
index 42f8d163..e91e5c5d 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Bot.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java
@@ -311,6 +311,10 @@ public class Bot {
         session.connect(false);
     }
 
+    public String getServerString () {
+        return host + ":" + port;
+    }
+
     public void stop () {
         session.disconnect("Received stop signal");
         Main.bots.remove(this);
diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java
index d75609a4..abee9570 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Main.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Main.java
@@ -197,7 +197,7 @@ public class Main {
         for (Bot bot : copiedList) {
             try {
                 if (discordEnabled) {
-                    final String channelId = bot.discord.servers.get(bot.host + ":" + bot.port);
+                    final String channelId = bot.discord.servers.get(bot.getServerString());
 
                     final MessageCreateAction messageAction = bot.discord.sendMessageInstantly(stoppingMessage, channelId, false);
 
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 e6556d3d..3ded9089 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java
@@ -55,7 +55,7 @@ public class MailCommand extends Command {
                                     sender.profile.getName(),
                                     context.getString(false, true),
                                     Instant.now().toEpochMilli(),
-                                    bot.host + ":" + bot.port,
+                                    bot.getServerString(),
                                     context.getString(true, true)
                             )
                     );
@@ -86,7 +86,7 @@ public class MailCommand extends Command {
                                                 sender.profile.getName(),
                                                 context.getString(true, true),
                                                 Instant.now().toEpochMilli(),
-                                                bot.host + ":" + bot.port,
+                                                bot.getServerString(),
                                                 output
                                         )
                                 );
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java
index f6efd2d5..0b9aea78 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/NetMessageCommand.java
@@ -29,18 +29,18 @@ public class NetMessageCommand extends Command {
         final Bot bot = context.bot;
         final List<Bot> bots = bot.bots;
 
-        final String hostAndPort = bot.host + ":" + bot.port;
+        final String originServer = bot.getServerString();
 
         final Component component = Component.translatable(
                 "[%s]%s%s%s› %s",
                 Component
-                        .text(hostAndPort)
+                        .text(originServer)
                         .color(NamedTextColor.GRAY)
-                        .clickEvent(ClickEvent.copyToClipboard(hostAndPort))
+                        .clickEvent(ClickEvent.copyToClipboard(originServer))
                         .hoverEvent(
                                 HoverEvent.showText(
                                         Component.empty()
-                                                .append(Component.text(hostAndPort).color(NamedTextColor.GRAY))
+                                                .append(Component.text(originServer).color(NamedTextColor.GRAY))
                                                 .append(Component.newline())
                                                 .append(Component.text("Click here to copy the server host and port to your clipboard").color(NamedTextColor.GREEN))
                                 )
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
index 6c016839..d5347ad0 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java
@@ -16,7 +16,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
     public AuthPlugin (Bot bot) {
         this.bot = bot;
 
-        this.ownerIpForServer = bot.config.ownerAuthentication.ips.get(bot.host + ":" + bot.port);
+        this.ownerIpForServer = bot.config.ownerAuthentication.ips.get(bot.getServerString());
 
         if (!bot.config.ownerAuthentication.enabled || ownerIpForServer == null) return;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java
index 8ecea64b..1de58bfb 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ConsolePlugin.java
@@ -77,9 +77,9 @@ public class ConsolePlugin implements Completer {
         if (line == null) return;
 
         for (Bot bot : allBots) {
-            final String hostAndPort = bot.host + ":" + bot.port;
+            final String server = bot.getServerString();
 
-            if (!hostAndPort.equals(consoleServer) && !consoleServer.equals("all")) continue;
+            if (!server.equals(consoleServer) && !consoleServer.equals("all")) continue;
 
             if (line.startsWith(prefix)) {
                 final ConsoleCommandContext context = new ConsoleCommandContext(bot, prefix);
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
index 0cd96b27..373ad635 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/DiscordPlugin.java
@@ -77,7 +77,7 @@ public class DiscordPlugin {
         jda.getPresence().setPresence(Activity.playing(config.discord.statusMessage), false);
 
         for (Bot bot : Main.bots) {
-            final String channelId = servers.get(bot.host + ":" + bot.port);
+            final String channelId = servers.get(bot.getServerString());
 
             totalConnects.put(channelId, 0); // is this necessary?
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java
index b4e9f1a4..e2d0b50b 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/GrepLogPlugin.java
@@ -88,7 +88,7 @@ public class GrepLogPlugin {
 
             if (matches == 0) throw new CommandException(Component.text("No matches has been found"));
 
-            final String channelId = bot.discord.servers.get(bot.host + ":" + bot.port);
+            final String channelId = bot.discord.servers.get(bot.getServerString());
             final TextChannel logChannel = bot.discord.jda.getTextChannelById(channelId);
 
             if (logChannel == null) return;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
index ae2b35ac..1a114ae7 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IRCPlugin.java
@@ -209,7 +209,7 @@ public class IRCPlugin extends ListenerAdapter {
     }
 
     private void addMessageToQueue (Bot bot, String message) {
-        final String channel = servers.get(bot.host + ":" + bot.port);
+        final String channel = servers.get(bot.getServerString());
 
         addMessageToQueue(channel, message);
     }
@@ -227,7 +227,7 @@ public class IRCPlugin extends ListenerAdapter {
     }
 
     public void sendMessage (Bot bot, String message) {
-        final String hostAndPort = bot.host + ":" + bot.port;
+        final String hostAndPort = bot.getServerString();
 
         final String channel = servers.get(hostAndPort);
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
index b5fcb04e..9d2a7b11 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/LoggerPlugin.java
@@ -68,7 +68,7 @@ public class LoggerPlugin extends ChatPlugin.Listener {
 
                 final Component reason = event.getReason();
 
-                final String message = "Disconnected from " + bot.host + ":" + bot.port + ", reason: ";
+                final String message = "Disconnected from " + bot.getServerString() + ", reason: ";
 
                 final String string = ComponentUtilities.stringify(reason);
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
index 3bfa32be..f8296fd0 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
@@ -87,7 +87,7 @@ public class PlayersDatabasePlugin extends PlayersPlugin.Listener {
             } else {
                 statement = bot.database.connection.prepareStatement(FIND_ALTS_SINGLE_SERVER);
 
-                statement.setString(1, bot.host + ":" + bot.port);
+                statement.setString(1, bot.getServerString());
                 statement.setString(2, ip);
             }
 
@@ -141,7 +141,7 @@ public class PlayersDatabasePlugin extends PlayersPlugin.Listener {
                         updatePlayerStatement.setString(2, "$.ips");
 
                         final ObjectNode ipsObject = JsonNodeFactory.instance.objectNode();
-                        ipsObject.put(bot.host + ":" + bot.port, output);
+                        ipsObject.put(bot.getServerString(), output);
 
                         updatePlayerStatement.setString(3, objectMapper.writeValueAsString(ipsObject));
 
@@ -186,7 +186,7 @@ public class PlayersDatabasePlugin extends PlayersPlugin.Listener {
         final ObjectNode object = JsonNodeFactory.instance.objectNode();
 
         object.put("time", Instant.now().toEpochMilli());
-        object.put("server", bot.host + ":" + bot.port);
+        object.put("server", bot.getServerString());
 
         return object;
     }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
index 6b9ea3c7..6558048c 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java
@@ -77,7 +77,7 @@ public class PlayersPlugin extends Bot.Listener {
 
         if (ipsObject == null || ipsObject.isNull() || !ipsObject.isObject()) return null;
 
-        final JsonNode targetIP = ipsObject.get(bot.host + ":" + bot.port);
+        final JsonNode targetIP = ipsObject.get(bot.getServerString());
 
         if (targetIP == null || targetIP.isNull() || !targetIP.isTextual()) return null;
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java
index 4e4d4eab..e6b46aa7 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/LoggerUtilities.java
@@ -52,7 +52,7 @@ public class LoggerUtilities {
             final String formattedMessage = bot == null ? "" :
                     String.format(
                         "[%s] %s",
-                        bot.host + ":" + bot.port,
+                        bot.getServerString(),
                         message
                     );