replace session with uninfo

nonebot_plugin_handle/__init__.py

@@ -5,12 +5,12 @@
 from nonebot import on_regex, require
 from nonebot.log import logger
 from nonebot.matcher import Matcher
-from nonebot.params import EventToMe, RegexDict
+from nonebot.params import Depends, EventToMe, RegexDict
 from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 from nonebot.utils import run_sync
 
 require("nonebot_plugin_alconna")
-require("nonebot_plugin_session")
+require("nonebot_plugin_uninfo")
 
 from nonebot_plugin_alconna import (
     AlcMatches,
@@ -24,7 +24,7 @@
     on_alconna,
     store_true,
 )
-from nonebot_plugin_session import SessionId, SessionIdType
+from nonebot_plugin_uninfo import Uninfo
 
 from .config import Config, handle_config
 from .data_source import GuessResult, Handle
@@ -49,18 +49,20 @@
     homepage="https://github.com/noneplugin/nonebot-plugin-handle",
     config=Config,
     supported_adapters=inherit_supported_adapters(
-        "nonebot_plugin_alconna", "nonebot_plugin_session"
+        "nonebot_plugin_alconna", "nonebot_plugin_uninfo"
     ),
-    extra={
-        "example": "猜成语",
-    },
 )
 
 
 games: dict[str, Handle] = {}
 timers: dict[str, TimerHandle] = {}
 
-UserId = Annotated[str, SessionId(SessionIdType.GROUP)]
+
+def get_user_id(uninfo: Uninfo) -> str:
+    return f"{uninfo.scope}_{uninfo.self_id}_{uninfo.scene_path}"
+
+
+UserId = Annotated[str, Depends(get_user_id)]
 
 
 def game_is_running(user_id: UserId) -> bool:

pyproject.toml

@@ -12,7 +12,7 @@ repository = "https://github.com/noneplugin/nonebot-plugin-handle"
 python = "^3.9"
 nonebot2 = "^2.3.0"
 nonebot-plugin-alconna = ">=0.46.3,<1.0.0"
-nonebot-plugin-session = "^0.3.0"
+nonebot-plugin-uninfo = ">=0.4.0,<1.0.0"
 Pillow = "^10.0.0"
 pypinyin = ">=0.40.0,<1.0.0"