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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-cs2match
-Version: 1.0.1
+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.1 → nonebot_plugin_cs2match-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-cs2match"
-version = "1.0.1"
+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.1 → nonebot_plugin_cs2match-1.0.2}/src/nonebot_plugin_cs2match/__init__.py

@@ -10,6 +10,10 @@ 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 .template import help_plain_text, help_text
 from .rule import is_enabled
@@ -18,10 +22,6 @@ 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

{nonebot_plugin_cs2match-1.0.1 → 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.1 → 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 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)
@@ -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'