gb/bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: do not send query request to mc server by default

Browse source
This commit is contained in:
草师傅 2025-08-08 09:45:28 +08:00
parent 7106d0a18a
commit 5e20fc2297
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/mc.py
View file

@ -9,6 +9,7 @@ async def handle_mc_status_command(message: Message):
args = message.text.replace('/mc', '').strip().split(' ') args = message.text.replace('/mc', '').strip().split(' ')
server_type = args[0] if args else 'java' server_type = args[0] if args else 'java'
server_address = args[1] if len(args) >= 2 else None server_address = args[1] if len(args) >= 2 else None
query_enabled = True if len(args) >= 3 and args[2] == 'query' else False
if not args: if not args:
await message.reply("Usage: /mc <java/bedrock> <server_address>\n" await message.reply("Usage: /mc <java/bedrock> <server_address>\n"
"Example: /mc java play.example.com") "Example: /mc java play.example.com")
@ -32,12 +33,14 @@ async def handle_mc_status_command(message: Message):
server = JavaServer.lookup(server_address) server = JavaServer.lookup(server_address)
status = server.status() status = server.status()
query = None query = None
s_message = f"这个 Java 服务器"
# 尝试查询服务器信息 # 尝试查询服务器信息
try: if query_enabled:
query = server.query() try:
except Exception as e: query = server.query()
logging.warning('查询 Minecraft 服务器遇到了错误',e) except Exception as e:
s_message = f"*我未能成功发送 query 请求，显示的结果可能有出入。*\n这个 Java 服务器" s_message = f"_我未能成功发送 query 请求，可能是因为服务器未开放对应端口。_\n这个 Java 服务器"
logging.warning('查询 Minecraft 服务器遇到了错误',e)
if query: if query:
s_message = f"这个 Java 服务器使用了 {query.software.brand}({query.software.version})，" s_message = f"这个 Java 服务器使用了 {query.software.brand}({query.software.version})，"
s_message += f"有{status.players.online}(/{status.players.max}) 人在线\n" s_message += f"有{status.players.online}(/{status.players.max}) 人在线\n"