From f48b2ea8b37e703529380682705bcbcf87074b9b Mon Sep 17 00:00:00 2001
From: RTAkland <me@rtast.cn>
Date: Wed, 23 Oct 2024 13:32:46 +0800
Subject: [PATCH] feat: support ping srv record mc server

---
 .../fancybot/commands/lookup/NslookupCommand.kt     |  2 +-
 .../fancybot/commands/misc/MinecraftCommand.kt      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt
index cbca2b7..e7c9ce6 100644
--- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt
+++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt
@@ -35,7 +35,7 @@ class NslookupCommand : BaseCommand() {
         }
         private val dirContext = InitialDirContext(env)
 
-        private fun srv(host: String): MutableList<String> {
+        fun srv(host: String): MutableList<String> {
             val srvDomain = "$MC_SRV_PREFIX.$host"
             val attrs = dirContext.getAttributes(srvDomain, arrayOf("SRV"))
             val srvRecords = mutableListOf<String>()
diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt
index 838746a..556c817 100644
--- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt
+++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt
@@ -9,6 +9,7 @@
 package cn.rtast.fancybot.commands.misc
 
 import cn.rtast.fancybot.annotations.CommandDescription
+import cn.rtast.fancybot.commands.lookup.NslookupCommand
 import cn.rtast.fancybot.commands.lookup.WikipediaCommand.Companion.extractPlainTextFromHtml
 import cn.rtast.fancybot.configManager
 import cn.rtast.fancybot.db.deleteAccessTokenById
@@ -56,11 +57,13 @@ import okhttp3.FormBody
 import java.awt.AlphaComposite
 import java.awt.Color
 import java.awt.image.BufferedImage
+import java.net.InetAddress
 import java.net.SocketException
 import java.net.URI
 import java.util.concurrent.Executors
 import javax.imageio.ImageIO
 import kotlin.random.Random
+import kotlin.text.split
 
 @CommandDescription("获取MC最新的版本!")
 class MCVersionCommand : BaseCommand() {
@@ -344,8 +347,14 @@ class MCPingCommand : BaseCommand() {
         when (platform) {
             "java", "je", "Java", "JAVA" -> {
                 val parts = args.first().split(":")
-                val port = if (parts.size == 1) 25565 else parts.last().toInt()
-                val host = parts.first()
+                var port = if (parts.size == 1) 25565 else parts.last().toInt()
+                var host = parts.first()
+                val srv = NslookupCommand.srv(host)
+                if (srv.isNotEmpty()) {
+                    val srv = srv.first().split(" ")
+                    port = srv[2].toInt()
+                    host = srv.last()
+                }
                 val response = JavaPing().ping(host, port, 10000)
                 if (response == null) {
                     message.reply("无法获取服务器的消息请检查输入是否正确 >>> $host:$port")