nonebot-plugin-cs2match 1.0.0__tar.gz → 1.0.2__tar.gz

{nonebot_plugin_cs2match-1.0.0 → nonebot_plugin_cs2match-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-cs2match
-Version: 1.0.0
+Version: 1.0.2
 Summary: 实时追踪 Counter-Strike 2 职业赛事，开赛自动提醒、关键赛况与大比分异动推送。
 Keywords: nonebot,bot,counter-strike,cs2
 Author: StarsetNight
@@ -12,11 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Requires-Dist: aiohttp>=3.13.5
 Requires-Dist: ayafileio>=1.4.6
-Requires-Dist: nonebot-adapter-onebot>=2.4.6
+Requires-Dist: nonebot-adapter-onebot>=2.4.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4
-Requires-Dist: nonebot2>=2.4.4
-Requires-Dist: pydantic>=2.13.4
-Requires-Dist: python-dotenv>=1.2.1
+Requires-Dist: nonebot2>=2.2.0
 Requires-Dist: typst>=0.15.0
 Requires-Python: >=3.10, <4.0
 Project-URL: Homepage, https://github.com/StarsetNight/nonebot-plugin-cs2match

{nonebot_plugin_cs2match-1.0.0 → nonebot_plugin_cs2match-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-cs2match"
-version = "1.0.0"
+version = "1.0.2"
 description = "实时追踪 Counter-Strike 2 职业赛事，开赛自动提醒、关键赛况与大比分异动推送。"
 license = "MIT"
 readme = "README.md"
@@ -18,11 +18,9 @@ requires-python = ">=3.10,<4.0"
 dependencies = [
     "aiohttp>=3.13.5",
     "ayafileio>=1.4.6",
-    "nonebot-adapter-onebot>=2.4.6",
+    "nonebot-adapter-onebot>=2.4.0",
     "nonebot-plugin-localstore>=0.7.4",
-    "nonebot2>=2.4.4",
-    "pydantic>=2.13.4",
-    "python-dotenv>=1.2.1",
+    "nonebot2>=2.2.0",
     "typst>=0.15.0",
 ]
 

{nonebot_plugin_cs2match-1.0.0 → nonebot_plugin_cs2match-1.0.2}/src/nonebot_plugin_cs2match/__init__.py

@@ -10,18 +10,18 @@ from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 
 from .config import Config
+# init的配置读取必须先于其他要使用init中配置的导入模块，否则会缺配置读不了
+driver = get_driver()
+global_config = driver.config
+config = get_plugin_config(Config)  # 取自config.py中的静态配置
 from .tools import PandaScoreClient, MonitorClient, MatchParser, typst_render
-from .typst_template import help_text
+from .template import help_plain_text, help_text
 from .rule import is_enabled
 from .dynamic_config import DynamicConfigSystem, PriorityMode
 
 require("nonebot_plugin_localstore")
 from nonebot_plugin_localstore import get_plugin_data_file
 
-driver = get_driver()
-global_config = driver.config
-config = get_plugin_config(Config)  # 取自config.py中的静态配置
-
 panda_client: PandaScoreClient | None = None
 dynamic_config: DynamicConfigSystem | None = None  # 取自插件内编写的DynamicConfigSystem
 monitor_client: MonitorClient | None = None
@@ -30,9 +30,12 @@ monitor_client: MonitorClient | None = None
 __plugin_meta__ = PluginMetadata(
     name="CS2赛事助手",
     description="实时追踪 Counter-Strike 2 职业赛事，开赛自动提醒、关键赛况与大比分异动推送",
-    usage=help_text,
+    usage=help_plain_text,
+    type="application",
+    homepage="https://github.com/StarsetNight/nonebot-plugin-cs2match",
     config=Config,
-    extra={}
+    supported_adapters={"~onebot.v11"},
+    extra={"author": "StarsetNight <starsetnight@outlook.com>"}
 )
 
 @driver.on_startup

{nonebot_plugin_cs2match-1.0.0 → nonebot_plugin_cs2match-1.0.2}/src/nonebot_plugin_cs2match/rule.py

@@ -3,9 +3,7 @@
 
 import nonebot
 
-from .config import Config
-
-config = nonebot.get_plugin_config(Config)
+from . import config
 
 
 async def is_enabled():

nonebot_plugin_cs2match-1.0.0/src/nonebot_plugin_cs2match/typst_template.py → nonebot_plugin_cs2match-1.0.2/src/nonebot_plugin_cs2match/template.py

@@ -1,6 +1,26 @@
 # Copyright (c) 2026 StarsetNight, XuanRikka
 # SPDX-License-Identifier: MIT
 
+# help_plain_text和help_text两边一定要同时改！
+
+help_plain_text = """NoneBot CS2赛事查询帮助
+
+/cs2help
+显示此帮助信息。
+
+/matches [past|running|upcoming]
+查询CS2比赛列表，支持查看已结束、进行中和即将开始的比赛。
+
+/match <id>
+查询指定比赛的详细比分信息。
+
+/monitor <id>
+开启比赛监听，自动推送比赛开始、比分变化和结束状态。
+使用 /monitor cancel 可取消当前监听。
+
+/cs2whitelist <on|off>
+开启或关闭比赛列表白名单过滤。"""
+
 help_text = """#set text(font: ("Consolas", "SimHei"))
 
 #set page(

{nonebot_plugin_cs2match-1.0.0 → nonebot_plugin_cs2match-1.0.2}/src/nonebot_plugin_cs2match/tools.py

@@ -17,17 +17,12 @@ from ayafileio import open
 import typst
 
 from nonebot.adapters.onebot.v11 import Message, MessageSegment, Bot
-from nonebot import require, get_driver, get_plugin_config, logger
+from nonebot import require, logger
 
 require("nonebot_plugin_localstore")
 from nonebot_plugin_localstore import get_plugin_cache_dir
 
-from . import typst_template
-from .config import Config
-
-driver = get_driver()
-global_config = driver.config
-config = get_plugin_config(Config)
+from . import template, config
 
 RENDER_CACHE_DIR = get_plugin_cache_dir() / "render_cache"
 RENDER_CACHE_DIR.mkdir(exist_ok=True)
@@ -183,7 +178,7 @@ class MonitorClient:
                         message = await typst_render(
                             MatchParser.prerender_match(
                                 current,
-                                typst_template.push_comment
+                                template.push_comment
                             ),
                             "monitor"
                         )
@@ -287,7 +282,7 @@ class MatchParser:
             reverse=True
         ))
 
-        content = typst_template.list_match
+        content = template.list_match
 
         for serie_name, serie_matches in sorted_series.items():
             content += f'#series_card("{serie_name}", [\n'
@@ -374,7 +369,7 @@ class MatchParser:
 
         games_text = "\n".join(games)
 
-        return f"""{typst_template.get_match}
+        return f"""{template.get_match}
         #let match = (
             name: "{match.get("name", "未知比赛")}",
             league: "{(match.get("league") or {}).get("name", "未知赛事")}",