♻️ 迁移至 nonebot_plugin_uninfo (#542)

* ➕ 添加依赖 nonebot-plugin-uninfo

* ♻️ 使用 nonebot_plugin_uninfo 替代 nonebot_plugin_session nonebot_plugin_session_orm nonebot_plugin_userinfo

* 🗃️ 迁移数据库数据至 nonebot_plugin_uninfo

* ➖ 删除依赖 nonebot-plugin-session nonebot-plugin-session-orm nonebot-plugin-userinfo

* ➕ 添加依赖 nonebot-session-to-uninfo

nonebot_plugin_tetris_stats/games/tetrio/bind.py

@@ -1,15 +1,17 @@
 from hashlib import md5
+from secrets import choice
 
 from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 from yarl import URL
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -44,7 +46,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.bind')
-async def _(nb_user: User, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+async def _(nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -77,8 +79,15 @@ async def _(nb_user: User, account: Player, event_session: EventSession, bot_inf
                             name=user.name.upper(),
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
-                            name=bot_info.user_name,
+                            avatar=await get_avatar(
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
                         prompt='io查我',
                         lang=get_lang(),

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -2,8 +2,8 @@ from arclet.alconna import Arg
 from nonebot_plugin_alconna import Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import async_scoped_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
 from sqlalchemy import select
 
@@ -34,7 +34,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.config')
-async def _(user: User, session: async_scoped_session, event_session: EventSession, template: Template):
+async def _(user: User, session: async_scoped_session, event_session: Uninfo, template: Template):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -1,7 +1,7 @@
 from nonebot_plugin_alconna import Args, Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 
 from ...db import trigger
 from ...utils.host import HostPage, get_self_netloc
@@ -32,7 +32,7 @@ command.add(
 
 @alc.assign('TETRIO.list')
 async def _(
-    event_session: EventSession,
+    event_session: Uninfo,
     max_tr: float | None = None,
     min_tr: float | None = None,
     limit: int | None = None,

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import Args, At, Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User as NBUser
 from nonebot_plugin_user import get_user
 from sqlalchemy import select
@@ -90,7 +90,7 @@ async def _(  # noqa: PLR0913
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
     template: Template | None = None,
 ):
     async with trigger(
@@ -103,7 +103,7 @@ async def _(  # noqa: PLR0913
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -120,7 +120,7 @@ async def _(  # noqa: PLR0913
 
 
 @alc.assign('TETRIO.query')
-async def _(user: NBUser, account: Player, event_session: EventSession, template: Template | None = None):
+async def _(user: NBUser, account: Player, event_session: Uninfo, template: Template | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -3,8 +3,8 @@ from datetime import timedelta
 from arclet.alconna import Arg
 from nonebot_plugin_alconna import Option, Subcommand, UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from sqlalchemy import func, select
 from sqlalchemy.orm import selectinload
 
@@ -33,7 +33,7 @@ command.add(
 
 
 @alc.assign('TETRIO.rank.all')
-async def _(event_session: EventSession, template: Template | None = None):
+async def _(event_session: Uninfo, template: Template | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -5,8 +5,8 @@ from arclet.alconna import Arg
 from nonebot import get_driver
 from nonebot_plugin_alconna import Option, UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from sqlalchemy import func, select
 from sqlalchemy.orm import selectinload
 
@@ -31,7 +31,7 @@ command.add(Option('--detail', Arg('rank', ValidRank), alias=['-D']))
 
 
 @alc.assign('TETRIO.rank')
-async def _(rank: ValidRank, event_session: EventSession):
+async def _(rank: ValidRank, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At, Option
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
@@ -43,7 +43,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -55,7 +55,7 @@ async def _(
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -68,7 +68,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.blitz')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At, Option
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import Uninfo
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
@@ -43,7 +43,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -55,7 +55,7 @@ async def _(
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -68,7 +68,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.sprint')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/unbind.py

@@ -1,15 +1,17 @@
 from hashlib import md5
+from secrets import choice
 
 from nonebot_plugin_alconna import Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import QryItrface, Uninfo
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 from yarl import URL
 
+from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -31,7 +33,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.unbind')
-async def _(nb_user: User, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+async def _(nb_user: User, event_session: Uninfo, interface: QryItrface):
     async with (
         trigger(
             session_persist_id=await get_session_persist_id(event_session),
@@ -65,8 +67,15 @@ async def _(nb_user: User, event_session: EventSession, bot_info: UserInfo = Bot
                         name=user.name.upper(),
                     ),
                     bot=People(
-                        avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
-                        name=bot_info.user_name,
+                        avatar=await get_avatar(
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
                     prompt='io绑定{游戏ID}',
                     lang=get_lang(),