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,20 +1,22 @@
|
||||
import httpx
|
||||
from nonebot import logger
|
||||
from nonebot.internal.params import ArgPlainText
|
||||
from nonebot.typing import T_State
|
||||
from nonebot import on_command
|
||||
from nonebot.adapters.onebot.v11 import MessageEvent, Bot, MessageSegment
|
||||
from nonebot.plugin import PluginMetadata
|
||||
from typing import Optional, Union
|
||||
"""绝地潜兵小助手 —— 入口(元数据 + 依赖 + 配置/Web 注册)。"""
|
||||
|
||||
from .equipment import get_random_equipment, get_equipment_by_combination
|
||||
from .hd2_api import get_briefing_data
|
||||
from .war_renderer import render_war_briefing
|
||||
from .utils import *
|
||||
from .equipment_store import init_db as _init_equipment_db
|
||||
from . import stratagem_admin as _stratagem_admin
|
||||
import os
|
||||
|
||||
import httpx # noqa: F401
|
||||
from nonebot import logger
|
||||
from nonebot.adapters.onebot.v11 import MessageEvent # noqa: F401
|
||||
from nonebot.internal.params import ArgPlainText # noqa: F401
|
||||
from nonebot.typing import T_State # noqa: F401
|
||||
from nonebot import on_command # noqa: F401
|
||||
from nonebot.plugin import PluginMetadata
|
||||
|
||||
from .services.equipment import get_random_equipment, get_equipment_by_combination # noqa: F401
|
||||
from .services.hd2_api import get_briefing_data # noqa: F401
|
||||
from .utils.war_renderer import render_war_briefing # noqa: F401
|
||||
from .utils import gen_ms_img, pic2b64 # noqa: F401
|
||||
from .services.equipment_store import init_db as _init_equipment_db
|
||||
from .web import stratagem_admin as _stratagem_admin
|
||||
from hexi.web_plugin_registry import register_web_plugin
|
||||
from nonebot.matcher import Matcher
|
||||
|
||||
__plugin_meta__ = PluginMetadata(
|
||||
name="绝地潜兵小助手",
|
||||
@@ -24,12 +26,12 @@ __plugin_meta__ = PluginMetadata(
|
||||
"随机战备：让机器人帮你随机一套战备\n"
|
||||
"战备管理后台：/hub/ 统一管理台内可视化编辑",
|
||||
type="application",
|
||||
homepage="https://github.com/sansenhoshi/nonebot_plugin_helldivers_tools"
|
||||
homepage="https://github.com/sansenhoshi/nonebot_plugin_helldivers_tools",
|
||||
)
|
||||
|
||||
basic_path = os.path.dirname(__file__)
|
||||
save_path = os.path.join(basic_path, "temp")
|
||||
img_path = os.path.join(basic_path, "img")
|
||||
img_path = os.path.join(basic_path, "res", "img")
|
||||
data_path = os.path.join(basic_path, "data")
|
||||
|
||||
|
||||
@@ -74,131 +76,4 @@ register_model_config(
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
async def _send_war_card(matcher: Matcher, ev: MessageEvent, top_per_race: Optional[int]) -> None:
|
||||
await matcher.send("正在获取前线战况，请民主的等待！")
|
||||
try:
|
||||
data = await get_briefing_data()
|
||||
png = await render_war_briefing(data, top_per_race)
|
||||
except Exception as e:
|
||||
logger.exception("获取战况失败")
|
||||
await matcher.finish(
|
||||
MessageSegment.reply(ev.message_id)
|
||||
+ f"战况获取失败：{type(e).__name__}：{e}"
|
||||
)
|
||||
return
|
||||
mes = (MessageSegment.reply(ev.message_id), gen_ms_img(png))
|
||||
await matcher.send(mes)
|
||||
|
||||
|
||||
war_situation = on_command("简报", aliases={"简报"})
|
||||
war_detail = on_command("详报", aliases={"详报"})
|
||||
|
||||
|
||||
@war_situation.handle()
|
||||
async def get_war_info(ev: MessageEvent):
|
||||
await _send_war_card(war_situation, ev, top_per_race=4)
|
||||
|
||||
|
||||
@war_detail.handle()
|
||||
async def get_war_detail(ev: MessageEvent):
|
||||
await _send_war_card(war_detail, ev, top_per_race=None)
|
||||
|
||||
|
||||
async def download_url(url: str) -> bytes | None:
|
||||
async with httpx.AsyncClient() as client:
|
||||
for i in range(3):
|
||||
try:
|
||||
resp = await client.get(url)
|
||||
if resp.status_code != 200:
|
||||
continue
|
||||
return resp.content
|
||||
except Exception as e:
|
||||
print(f"Error downloading {url}, retry {i}/3: {str(e)}")
|
||||
return None
|
||||
|
||||
|
||||
random_helldivers = on_command("随机战备", aliases={"随机战备"}, block=True)
|
||||
|
||||
# PROMPT = """ ***超级地球武装部***
|
||||
# 请发送你需要的随机规则
|
||||
#
|
||||
# 1：纯随机（不推荐）
|
||||
#
|
||||
# 套路随机(按一定规则随机)
|
||||
#
|
||||
# 2：2红/1蓝/1绿
|
||||
# 3：2绿/1红/1蓝
|
||||
# 4：2蓝/1绿/1红
|
||||
#
|
||||
# 5：3红/1蓝
|
||||
# 6：3绿/1蓝
|
||||
#
|
||||
# 7：2红/2蓝
|
||||
# 8：2蓝/2绿
|
||||
# 9：2绿/2红
|
||||
#
|
||||
# 10：4红
|
||||
# 11：4绿"""
|
||||
|
||||
board_path = f"{img_path}/board2.png"
|
||||
|
||||
PROMPT = MessageSegment.image(pic2b64(Image.open(board_path)))
|
||||
|
||||
error_count = 0
|
||||
|
||||
|
||||
# 用户选择
|
||||
@random_helldivers.got("pick_type", prompt=PROMPT)
|
||||
async def got_random_helldivers(event: MessageEvent, pick_type: str = ArgPlainText()):
|
||||
global error_count
|
||||
if error_count >= 2:
|
||||
await random_helldivers.finish("已回归平民生活——")
|
||||
logger.info("持续输错退出随机战备")
|
||||
error_count = 0
|
||||
return
|
||||
logger.info(f"用户选择的战备类型: {pick_type}")
|
||||
if not is_number(pick_type):
|
||||
error_count += 1
|
||||
await random_helldivers.reject(f"您输入的 {pick_type} 非数字，请重新输入1到11，或者输入0退出")
|
||||
elif int(pick_type) not in range(12):
|
||||
error_count += 1
|
||||
await random_helldivers.reject(f"您输入的 {pick_type} 不在范围内，请重新输入1到11，或者输入0退出")
|
||||
elif int(pick_type) == 0:
|
||||
await random_helldivers.finish("已回归平民生活——")
|
||||
logger.info("用户选择退出随机战备")
|
||||
error_count = 0
|
||||
return
|
||||
|
||||
mix_msg = (MessageSegment.reply(event.message_id),)
|
||||
|
||||
type_combinations = {
|
||||
2: {'red': 2, 'blue': 1, 'green': 1},
|
||||
3: {'green': 2, 'red': 1, 'blue': 1},
|
||||
4: {'blue': 2, 'green': 1, 'red': 1},
|
||||
5: {'red': 3, 'blue': 1},
|
||||
6: {'green': 3, 'blue': 1},
|
||||
7: {'red': 2, 'blue': 2},
|
||||
8: {'blue': 2, 'green': 2},
|
||||
9: {'green': 2, 'red': 2},
|
||||
10: {'red': 4},
|
||||
11: {'green': 4}
|
||||
}
|
||||
|
||||
if int(pick_type) == 1:
|
||||
logger.info("用户选择纯随机战备")
|
||||
result = await get_random_equipment(4) # 4 random equipments
|
||||
else:
|
||||
combination = type_combinations.get(int(pick_type))
|
||||
logger.info(f"用户选择的战备组合: {combination}")
|
||||
result = await get_equipment_by_combination(combination)
|
||||
|
||||
final_msg = MessageSegment.text("您的随机结果是：\n")
|
||||
image_tuple = gen_ms_img(result)
|
||||
mix_msg += (final_msg, image_tuple)
|
||||
|
||||
await random_helldivers.finish(mix_msg)
|
||||
|
||||
|
||||
def is_number(s):
|
||||
return bool(re.match(r'^[0-9]+$', s))
|
||||
from . import handlers as _handlers # noqa: E402,F401
|
||||
|
||||
Reference in New Issue
Block a user