refactor: restructure plugins per MTSS standard, consolidate assets to res/
Per docs/plugin-audit-report.md (plugins normalized to Trigger(handlers) → Service(services) → Model(repository/models) + utils): - Split monolithic __init__.py into handlers/services/utils across dailywife, deer_pipe, dice, galgame_card, helldivers_tools, huoziyinshua, learning_chat, makeaquote, mc_server_status, ncm_saying, picfinder_take, picstatus, random_jm_code, regif, steam_info, video_analysis, group_tools - Move static assets under res/: deer_pipe font/img, makeaquote font, helldivers img/templates, huoziyinshua HuoZiYinShua - Add config.py + register_config_items to ncm_saying, random_jm_code, group_tools; learning_chat unified config bridge - Remove deprecated: voice_trans plugin, bf_bot/test.py, dead code in dailywife/deer_pipe, empty dirs, debug scripts under helldivers temp - Disable brash_general_supercredits_tools (stub comment only) - bot.py: optional stdout/stderr redirect to log file for Web log viewer, force ANSI colorize on non-TTY sinks - Move runtime data (jm_code.json) out of plugin dir into hexi/data - Docs: plugin-audit-report.md; README reflects removed plugins Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Claude
@@ -1,26 +1,8 @@
|
||||
import ast
|
||||
from asyncio import gather
|
||||
from base64 import b64decode
|
||||
from io import BytesIO
|
||||
from re import findall
|
||||
from typing import Union
|
||||
import json
|
||||
from mcstatus import BedrockServer, JavaServer
|
||||
from nonebot import on_command, on_regex
|
||||
from nonebot.adapters.onebot.v11 import (
|
||||
Bot,
|
||||
GroupMessageEvent,
|
||||
Message,
|
||||
MessageEvent,
|
||||
)
|
||||
from nonebot.adapters.onebot.v11 import (
|
||||
MessageSegment as MS,
|
||||
)
|
||||
from nonebot.log import logger
|
||||
from nonebot.params import RegexGroup
|
||||
"""MC 服务器信息查询插件 —— 入口(元数据 + 配置注册)。"""
|
||||
|
||||
from nonebot.plugin import PluginMetadata
|
||||
|
||||
from .config import Config, pc, save_file, var
|
||||
from .config import Config, pc, save_file # noqa: E402,F401
|
||||
|
||||
# 统一配置标准：把管理 QQ / 机器人 QQ / 数据文件名暴露给 Web 管理台
|
||||
from hexi.config_standard import register_model_config # noqa: E402
|
||||
@@ -48,7 +30,7 @@ __plugin_meta__ = PluginMetadata(
|
||||
homepage="https://github.com/nikissXI/nonebot_plugins/tree/main/nonebot_plugin_setu_customization",
|
||||
supported_adapters={"~onebot.v11"},
|
||||
config=Config,
|
||||
usage=f"""插件命令如下：
|
||||
usage="""插件命令如下：
|
||||
信息 # 字面意思，需要加命令前缀，默认/
|
||||
信息数据 # 查看已启用群以及服务器信息，需要加命令前缀，默认/
|
||||
添加服务器 # 字面意思
|
||||
@@ -56,189 +38,4 @@ __plugin_meta__ = PluginMetadata(
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
async def group_check(event: GroupMessageEvent, bot: Bot) -> bool:
|
||||
return event.group_id in var.group_list and bot == var.handle_bot
|
||||
|
||||
|
||||
async def admin_check(event: MessageEvent, bot: Bot) -> bool:
|
||||
return bot == var.handle_bot and event.user_id in pc.mc_status_admin_qqnum
|
||||
|
||||
|
||||
xinxi = on_command("信息", rule=group_check)
|
||||
list_all = on_command("信息数据", rule=admin_check)
|
||||
add_server = on_regex(
|
||||
r"^添加服务器\s*((\d+)\s+(\S+)\s+(\S+)\s+(\S+))?", rule=admin_check
|
||||
)
|
||||
del_server = on_regex(r"^删除服务器\s*((\d+)\s+(\S+))?", rule=admin_check)
|
||||
test_server = on_regex(r"^测试服务器\s*((\S+)\s+(\S+))?", rule=admin_check)
|
||||
|
||||
|
||||
@xinxi.handle()
|
||||
async def _(event: GroupMessageEvent):
|
||||
group = event.group_id
|
||||
task_list = []
|
||||
for server_name in var.group_list[group]:
|
||||
server_host = var.group_list[group][server_name][0]
|
||||
server_type = var.group_list[group][server_name][1]
|
||||
task_list.append(
|
||||
check_mc_status(
|
||||
server_name,
|
||||
server_host,
|
||||
server_type,
|
||||
)
|
||||
)
|
||||
result = await gather(*task_list)
|
||||
count = 0
|
||||
msg = ""
|
||||
print(result)
|
||||
for r in result:
|
||||
count += 1
|
||||
if count > 1:
|
||||
msg += "\n=== 分割线 ===\n"
|
||||
msg += r
|
||||
await xinxi.finish(msg)
|
||||
|
||||
|
||||
@add_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await add_server.finish(
|
||||
f"添加服务器 [群号] [名称] [服务器地址] [类型]\n类型写js或bds，js是Java服务器，bds是基岩服务器\n服务器地址如果知道端口号把端口加上，否则查询速度会慢一点\n添加例子：\nexp1: 添加服务器 114514 哈皮咳嗽 mc.hypixel.net js\nexp2: 添加服务器 114514 某基岩服 mc.bds.net bds\nexp3: 添加服务器 114514 某Java服 mc.java.net:25577 js"
|
||||
)
|
||||
else:
|
||||
group = int(mp[1])
|
||||
new_server_name = mp[2]
|
||||
server_host = mp[3]
|
||||
server_type = mp[4].lower()
|
||||
|
||||
if server_type not in ["js", "bds"]:
|
||||
await add_server.finish("类型请填js或bds")
|
||||
|
||||
if group not in var.group_list:
|
||||
var.group_list[group] = {new_server_name: [server_host, server_type]}
|
||||
else:
|
||||
for server_name in var.group_list[group]:
|
||||
if new_server_name == server_name:
|
||||
await add_server.finish("有同名服务器啦！")
|
||||
var.group_list[group][new_server_name] = [server_host, server_type]
|
||||
save_file()
|
||||
await add_server.finish("添加成功")
|
||||
|
||||
|
||||
@del_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await del_server.finish(f"删除服务器 [群号] [名称]")
|
||||
else:
|
||||
group = int(mp[1])
|
||||
name = mp[2]
|
||||
|
||||
if group not in var.group_list:
|
||||
await del_server.finish("这个群没有添加服务器")
|
||||
else:
|
||||
if name in var.group_list[group]:
|
||||
var.group_list[group].pop(name)
|
||||
if not var.group_list[group]:
|
||||
var.group_list.pop(group)
|
||||
save_file()
|
||||
await del_server.finish("删除成功")
|
||||
else:
|
||||
await del_server.finish("没找到该名称的服务器")
|
||||
|
||||
|
||||
@list_all.handle()
|
||||
async def _():
|
||||
msg = ""
|
||||
for group_id in var.group_list:
|
||||
msg += f"群{group_id}服务器列表\n"
|
||||
for server_name in var.group_list[group_id]:
|
||||
server_host, server_type = var.group_list[group_id][server_name]
|
||||
msg += f"{server_name} {server_host} {server_type}\n"
|
||||
msg += "\n"
|
||||
if not msg:
|
||||
msg = "无数据"
|
||||
await list_all.finish(f"mc_status数据\n{msg}")
|
||||
|
||||
|
||||
@test_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await test_server.finish(
|
||||
f"测试服务器 [服务器地址] [类型]\n类型写js或bds，js是Java服务器，bds是基岩服务器"
|
||||
)
|
||||
else:
|
||||
server_host = mp[1]
|
||||
server_type = mp[2].lower()
|
||||
|
||||
if server_type not in ["js", "bds"]:
|
||||
await add_server.finish("类型请填js或bds")
|
||||
|
||||
msg = await check_mc_status("测试", server_host, server_type)
|
||||
await list_all.finish(msg)
|
||||
|
||||
|
||||
async def check_mc_status(
|
||||
name: str, host: str, server_type: str
|
||||
) -> Union[str, Message]:
|
||||
try:
|
||||
if server_type == "js":
|
||||
js = await JavaServer.async_lookup(host, timeout=2)
|
||||
status = js.status()
|
||||
# if status.description.strip():
|
||||
# print(f"des: {status.description}")
|
||||
version_list = findall(r"\d+\.\d+(?:\.[\dxX]+)?", status.version.name)
|
||||
if len(version_list) != 1:
|
||||
version = f"{version_list[0]}-{version_list[-1]}"
|
||||
else:
|
||||
version = version_list[0]
|
||||
|
||||
online = f"{status.players.online}/{status.players.max}"
|
||||
if status.players.online and status.players.sample:
|
||||
anonymous_player = 0
|
||||
_player_list = []
|
||||
for p in status.players.sample:
|
||||
if p.id == "00000000-0000-0000-0000-000000000000":
|
||||
anonymous_player += 1
|
||||
else:
|
||||
_player_list.append(p.name)
|
||||
|
||||
if anonymous_player:
|
||||
_player_list.append(f"[{anonymous_player}个匿名玩家]")
|
||||
|
||||
if _player_list:
|
||||
player_list = "\n".join(_player_list)
|
||||
|
||||
else:
|
||||
player_list = "没返回玩家列表"
|
||||
|
||||
else:
|
||||
player_list = "没人在线"
|
||||
|
||||
latency = round(status.latency)
|
||||
# base64图标
|
||||
if status.favicon:
|
||||
aa, bb = status.favicon.split("base64,")
|
||||
icon = MS.image(BytesIO(b64decode(bb))) + "\n"
|
||||
else:
|
||||
icon = ""
|
||||
msg = (
|
||||
icon
|
||||
+ f"名称：{name}\n版本：{version}\n在线：{online}\n延迟：{latency}ms\n在线列表：\n{player_list}"
|
||||
)
|
||||
|
||||
else:
|
||||
if host.find(":") != -1:
|
||||
host, port = host.split(":")
|
||||
else:
|
||||
host, port = host, 19132
|
||||
bds = BedrockServer(host=host, port=int(port))
|
||||
status = await bds.async_status()
|
||||
online = f"{status.players_online}/{status.players_max}"
|
||||
latency = round(status.latency)
|
||||
version = status.version.version
|
||||
msg = f"名称：{name} 【{version}】\n在线：{online} 延迟：{latency}ms"
|
||||
except Exception as e:
|
||||
msg = f"名称：{name} 查询失败！\n错误：{repr(e)}"
|
||||
|
||||
return msg
|
||||
from .handlers import add_server, del_server, list_all, test_server, xinxi # noqa: E402,F401
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
"""MC 服务器状态 —— Trigger 层。"""
|
||||
|
||||
from .server import add_server, del_server, list_all, test_server, xinxi # noqa: F401
|
||||
@@ -0,0 +1,137 @@
|
||||
"""MC 服务器状态 —— 触发器(Trigger)层。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from asyncio import gather
|
||||
|
||||
from nonebot import on_command, on_regex
|
||||
from nonebot.adapters.onebot.v11 import (
|
||||
Bot,
|
||||
GroupMessageEvent,
|
||||
MessageEvent,
|
||||
)
|
||||
from nonebot.log import logger
|
||||
from nonebot.params import RegexGroup
|
||||
from nonebot.plugin import PluginMetadata
|
||||
|
||||
from ..config import pc, save_file, var
|
||||
from ..services.mc import check_mc_status
|
||||
|
||||
__plugin_meta__ = PluginMetadata(
|
||||
name="MC服务器信息查询插件",
|
||||
description="如名",
|
||||
type="application",
|
||||
homepage="https://github.com/nikissXI/nonebot_plugins/tree/main/nonebot_plugin_setu_customization",
|
||||
supported_adapters={"~onebot.v11"},
|
||||
usage="""插件命令如下：
|
||||
信息 # 字面意思，需要加命令前缀，默认/
|
||||
信息数据 # 查看已启用群以及服务器信息，需要加命令前缀，默认/
|
||||
添加服务器 # 字面意思
|
||||
删除服务器 # 字面意思
|
||||
""",
|
||||
)
|
||||
|
||||
|
||||
async def group_check(event: GroupMessageEvent, bot: Bot) -> bool:
|
||||
return event.group_id in var.group_list and bot == var.handle_bot
|
||||
|
||||
|
||||
async def admin_check(event: MessageEvent, bot: Bot) -> bool:
|
||||
return bot == var.handle_bot and event.user_id in pc.mc_status_admin_qqnum
|
||||
|
||||
|
||||
xinxi = on_command("信息", rule=group_check)
|
||||
list_all = on_command("信息数据", rule=admin_check)
|
||||
add_server = on_regex(
|
||||
r"^添加服务器\s*((\d+)\s+(\S+)\s+(\S+)\s+(\S+))?", rule=admin_check
|
||||
)
|
||||
del_server = on_regex(r"^删除服务器\s*((\d+)\s+(\S+))?", rule=admin_check)
|
||||
test_server = on_regex(r"^测试服务器\s*((\S+)\s+(\S+))?", rule=admin_check)
|
||||
|
||||
|
||||
@xinxi.handle()
|
||||
async def _(event: GroupMessageEvent):
|
||||
group = event.group_id
|
||||
task_list = []
|
||||
for server_name in var.group_list[group]:
|
||||
server_host = var.group_list[group][server_name][0]
|
||||
server_type = var.group_list[group][server_name][1]
|
||||
task_list.append(check_mc_status(server_name, server_host, server_type))
|
||||
result = await gather(*task_list)
|
||||
count = 0
|
||||
msg = ""
|
||||
logger.info(f"MC 服务器状态结果: {result}")
|
||||
for r in result:
|
||||
count += 1
|
||||
if count > 1:
|
||||
msg += "\n=== 分割线 ===\n"
|
||||
msg += r
|
||||
await xinxi.finish(msg)
|
||||
|
||||
|
||||
@add_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await add_server.finish("添加服务器 [群号] [名称] [服务器地址] [类型]\n类型写js或bds，js是Java服务器，bds是基岩服务器\n服务器地址如果知道端口号把端口加上，否则查询速度会慢一点\n添加例子：\nexp1: 添加服务器 114514 哈皮咳嗽 mc.hypixel.net js\nexp2: 添加服务器 114514 某基岩服 mc.bds.net bds\nexp3: 添加服务器 114514 某Java服 mc.java.net:25577 js")
|
||||
return
|
||||
group = int(mp[1])
|
||||
new_server_name = mp[2]
|
||||
server_host = mp[3]
|
||||
server_type = mp[4].lower()
|
||||
if server_type not in ["js", "bds"]:
|
||||
await add_server.finish("类型请填js或bds")
|
||||
if group not in var.group_list:
|
||||
var.group_list[group] = {new_server_name: [server_host, server_type]}
|
||||
else:
|
||||
for server_name in var.group_list[group]:
|
||||
if new_server_name == server_name:
|
||||
await add_server.finish("有同名服务器啦！")
|
||||
var.group_list[group][new_server_name] = [server_host, server_type]
|
||||
save_file()
|
||||
await add_server.finish("添加成功")
|
||||
|
||||
|
||||
@del_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await del_server.finish(f"删除服务器 [群号] [名称]")
|
||||
return
|
||||
group = int(mp[1])
|
||||
name = mp[2]
|
||||
if group not in var.group_list:
|
||||
await del_server.finish("这个群没有添加服务器")
|
||||
if name in var.group_list[group]:
|
||||
var.group_list[group].pop(name)
|
||||
if not var.group_list[group]:
|
||||
var.group_list.pop(group)
|
||||
save_file()
|
||||
await del_server.finish("删除成功")
|
||||
else:
|
||||
await del_server.finish("没找到该名称的服务器")
|
||||
|
||||
|
||||
@list_all.handle()
|
||||
async def _():
|
||||
msg = ""
|
||||
for group_id in var.group_list:
|
||||
msg += f"群{group_id}服务器列表\n"
|
||||
for server_name in var.group_list[group_id]:
|
||||
server_host, server_type = var.group_list[group_id][server_name]
|
||||
msg += f"{server_name} {server_host} {server_type}\n"
|
||||
msg += "\n"
|
||||
if not msg:
|
||||
msg = "无数据"
|
||||
await list_all.finish(f"mc_status数据\n{msg}")
|
||||
|
||||
|
||||
@test_server.handle()
|
||||
async def _(mp=RegexGroup()):
|
||||
if not mp[0]:
|
||||
await test_server.finish("测试服务器 [服务器地址] [类型]\n类型写js或bds，js是Java服务器，bds是基岩服务器")
|
||||
return
|
||||
server_host = mp[1]
|
||||
server_type = mp[2].lower()
|
||||
if server_type not in ["js", "bds"]:
|
||||
await add_server.finish("类型请填js或bds")
|
||||
msg = await check_mc_status("测试", server_host, server_type)
|
||||
await list_all.finish(msg)
|
||||
@@ -0,0 +1,3 @@
|
||||
"""MC 服务器状态 —— Service 层。"""
|
||||
|
||||
from .mc import check_mc_status # noqa: F401
|
||||
@@ -0,0 +1,63 @@
|
||||
"""MC 服务器状态 —— 业务逻辑(Service 层)。"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from base64 import b64decode
|
||||
from io import BytesIO
|
||||
from re import findall
|
||||
from typing import Union
|
||||
|
||||
from mcstatus import BedrockServer, JavaServer
|
||||
from nonebot.adapters.onebot.v11 import Message, MessageSegment as MS
|
||||
|
||||
|
||||
async def check_mc_status(
|
||||
name: str, host: str, server_type: str
|
||||
) -> Union[str, Message]:
|
||||
try:
|
||||
if server_type == "js":
|
||||
js = await JavaServer.async_lookup(host, timeout=2)
|
||||
status = js.status()
|
||||
version_list = findall(r"\d+\.\d+(?:\.[\dxX]+)?", status.version.name)
|
||||
if len(version_list) != 1:
|
||||
version = f"{version_list[0]}-{version_list[-1]}"
|
||||
else:
|
||||
version = version_list[0]
|
||||
online = f"{status.players.online}/{status.players.max}"
|
||||
if status.players.online and status.players.sample:
|
||||
anonymous_player = 0
|
||||
_player_list = []
|
||||
for p in status.players.sample:
|
||||
if p.id == "00000000-0000-0000-0000-000000000000":
|
||||
anonymous_player += 1
|
||||
else:
|
||||
_player_list.append(p.name)
|
||||
if anonymous_player:
|
||||
_player_list.append(f"[{anonymous_player}个匿名玩家]")
|
||||
player_list = "\n".join(_player_list) if _player_list else "没返回玩家列表"
|
||||
else:
|
||||
player_list = "没人在线"
|
||||
latency = round(status.latency)
|
||||
if status.favicon:
|
||||
aa, bb = status.favicon.split("base64,")
|
||||
icon = MS.image(BytesIO(b64decode(bb))) + "\n"
|
||||
else:
|
||||
icon = ""
|
||||
msg = (
|
||||
icon
|
||||
+ f"名称：{name}\n版本：{version}\n在线：{online}\n延迟：{latency}ms\n在线列表：\n{player_list}"
|
||||
)
|
||||
else:
|
||||
if host.find(":") != -1:
|
||||
host, port = host.split(":")
|
||||
else:
|
||||
host, port = host, 19132
|
||||
bds = BedrockServer(host=host, port=int(port))
|
||||
status = await bds.async_status()
|
||||
online = f"{status.players_online}/{status.players_max}"
|
||||
latency = round(status.latency)
|
||||
version = status.version.version
|
||||
msg = f"名称：{name} 【{version}】\n在线：{online} 延迟：{latency}ms"
|
||||
except Exception as e:
|
||||
msg = f"名称：{name} 查询失败！\n错误：{repr(e)}"
|
||||
return msg
|
||||
Reference in New Issue
Block a user