update dependencies

noneplugin · Feb 25, 2024 · f48f182 · f48f182
1 parent f152b0d
commit f48f182
Show file tree

Hide file tree

Showing 3 changed files with 424 additions and 322 deletions.
diff --git a/nonebot_plugin_session_saa/__init__.py b/nonebot_plugin_session_saa/__init__.py
@@ -28,9 +28,11 @@
     TargetKaiheilaPrivate,
     TargetOB12Unknow,
     TargetQQGroup,
+    TargetQQGroupOpenId,
     TargetQQGuildChannel,
     TargetQQGuildDirect,
     TargetQQPrivate,
+    TargetQQPrivateOpenId,
     TargetTelegramCommon,
     TargetTelegramForum,
 )
@@ -41,9 +43,19 @@
 def get_saa_target(session: Session) -> Optional[PlatformTarget]:
     if session.platform == SupportedPlatform.qq:
         if session.level == SessionLevel.LEVEL1 and session.id1:
-            return TargetQQPrivate(user_id=int(session.id1))
+            if session.id1.isdigit():
+                return TargetQQPrivate(user_id=int(session.id1))
+            else:
+                return TargetQQPrivateOpenId(
+                    bot_id=session.bot_id, user_openid=session.id1
+                )
         elif session.level == SessionLevel.LEVEL2 and session.id2:
-            return TargetQQGroup(group_id=int(session.id2))
+            if session.id2.isdigit():
+                return TargetQQGroup(group_id=int(session.id2))
+            else:
+                return TargetQQGroupOpenId(
+                    bot_id=session.bot_id, group_openid=session.id2
+                )
 
     elif session.platform == SupportedPlatform.qqguild:
         if session.level == SessionLevel.LEVEL1: