获取不到用户信息时用 id 作为初始用户名

src/plugins/user/depends.py

@@ -3,24 +3,21 @@
 
 from nonebot.matcher import Matcher
 from nonebot.params import Depends
-from nonebot_plugin_session import SessionLevel
+from nonebot_plugin_session import Session, SessionLevel, extract_session
 from nonebot_plugin_userinfo import EventUserInfo, UserInfo
 
-from src.utils.annotated import MyUserInfo, Session
-
 from . import utils
 from .models import User
 
 
 async def get_or_create_user(
     matcher: Matcher,
-    session: Session,
+    session: Session = Depends(extract_session),
     user_info: UserInfo | None = EventUserInfo(),
 ):
     """获取一个用户，如果不存在则创建"""
     if (
         session.platform == "unknown"
-        or user_info is None
         or session.level == SessionLevel.LEVEL0
         or not session.id1
     ):
@@ -31,16 +28,18 @@ async def get_or_create_user(
         user = await utils.get_user(session.id1, session.platform)
     except ValueError:
         user = await utils.create_user(
-            session.id1, session.platform, user_info.user_name
+            session.id1,
+            session.platform,
+            user_info and user_info.user_name or session.id1,
         )
 
     return user
 
 
 @dataclass
 class UserSession:
-    session: Session
-    info: MyUserInfo
+    session: Session = Depends(extract_session)
+    info: UserInfo | None = EventUserInfo()
     user: User = Depends(get_or_create_user)
 
     @property
@@ -56,7 +55,7 @@ def name(self) -> str:
     @property
     def created_at(self) -> datetime:
         """用户创建日期"""
-        return self.user.created_at
+        return self.user.created_at.astimezone()
 
     @property
     def pid(self) -> str:

src/utils/annotated.py

@@ -2,10 +2,6 @@
 
 from nonebot.params import Depends
 from nonebot_plugin_datastore import get_session
-from nonebot_plugin_session import Session as _Session
-from nonebot_plugin_session import extract_session
-from nonebot_plugin_userinfo import EventUserInfo
-from nonebot_plugin_userinfo import UserInfo as _MyUserInfo
 from sqlalchemy.ext.asyncio import AsyncSession as _AsyncSession
 
 from .depends import (
@@ -28,5 +24,3 @@
 OptionalPlainTextArgs = Annotated[str | None, Depends(get_plaintext_args)]
 Platform = Annotated[str, Depends(get_platform)]
 OptionalPlatform = Annotated[str | None, Depends(get_platform)]
-MyUserInfo = Annotated[_MyUserInfo, EventUserInfo()]
-Session = Annotated[_Session, Depends(extract_session)]