feat(client): get_user_info can use uin as args

Author: wyapx

lagrange/client/client.py

@@ -52,6 +52,7 @@
     PBGetInfoFromUidReq,
     PBGetGrpLastSeq,
     GetGrpLastSeqRsp,
+    PBGetInfoFromUinReq,
 )
 from lagrange.pb.service.oidb import OidbRequest, OidbResponse
 from lagrange.pb.highway.comm import IndexNode
@@ -495,10 +496,31 @@ async def get_user_info(self, uid: str) -> UserInfo: ...
     @overload
     async def get_user_info(self, uid: list[str]) -> list[UserInfo]: ...
 
-    async def get_user_info(self, uid: Union[str, list[str]]) -> Union[UserInfo, list[UserInfo]]:
-        if isinstance(uid, str):
-            uid = [uid]
-        rsp = GetInfoFromUidRsp.decode((await self.send_oidb_svc(0xFE1, 8, PBGetInfoFromUidReq(uid=uid).encode())).data)
+    @overload
+    async def get_user_info(self, uin: int) -> UserInfo:
+        ...
+
+    @overload
+    async def get_user_info(self, uin: list[int]) -> list[UserInfo]:
+        ...
+
+    async def get_user_info(
+            self,
+            uid: Union[str, list[str]] = None,
+            uin: Union[int, list[int]] = None,
+    ) -> Union[UserInfo, list[UserInfo]]:
+        userid = uid or uin
+        assert userid, "empty uid or uin"
+        if not isinstance(userid, list):
+            userid = [userid]
+        if isinstance(userid[0], int):
+            req, sc = PBGetInfoFromUinReq(uin=userid).encode(), 2
+        elif isinstance(userid[0], str):
+            req, sc = PBGetInfoFromUidReq(uid=userid).encode(), 8
+        else:
+            raise TypeError(userid[0])
+
+        rsp = GetInfoFromUidRsp.decode((await self.send_oidb_svc(0xFE1, sc, req)).data)
         if not rsp.body:
             raise AssertionError("Empty response")
         elif len(rsp.body) == 1:

lagrange/pb/service/group.py

@@ -399,8 +399,7 @@ class GetGrpListResponse(ProtoStruct):
     grp_list: list[GrpInfo] = proto_field(2, default_factory=list)
 
 
-class PBGetInfoFromUidReq(ProtoStruct):
-    uid: list[str] = proto_field(1)
+class _GetInfoCfg(ProtoStruct):
     cfg: bytes = proto_field(
         3,
         default=bytes.fromhex(
@@ -409,6 +408,13 @@ class PBGetInfoFromUidReq(ProtoStruct):
         ),
     )
 
+class PBGetInfoFromUidReq(_GetInfoCfg):
+    uid: list[str] = proto_field(1)
+
+
+class PBGetInfoFromUinReq(_GetInfoCfg):
+    uin: list[int] = proto_field(1)
+
 
 class GetInfoRspF1(ProtoStruct):
     type: int = proto_field(1)