Improve robustness

Author: Keniis0712

StealthIM/apis/group.py

@@ -63,8 +63,10 @@ async def get_groups(
     response_data = await request(api_address, "GET", headers=header)
     logger.debug(f"Response data: {response_data}")
 
+    success = response_data["result"]["code"] == 800
+
     return GetGroupsResult(
-        groups=response_data["groups"],
+        groups=response_data["groups"] if success else None,
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
@@ -86,15 +88,15 @@ async def get_group_info(
     response_data = await request(api_address, "GET", headers=header)
     logger.debug(f"Response data: {response_data}")
 
-    members = [
-        GroupMember(
-            name=member["name"],
-            type=GroupMemberType(member.get("type", 0)),
-        ) for member in response_data["members"]
-    ] if response_data["result"]["code"] == 800 else None
+    success = response_data["result"]["code"] == 800
 
     return GroupInfoResult(
-        members=members,
+        members=[
+            GroupMember(
+                name=member["name"],
+                type=GroupMemberType(member.get("type", 0)),
+            ) for member in response_data["members"]
+        ] if success else None,
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
@@ -116,9 +118,11 @@ async def get_group_public_info(
     response_data = await request(api_address, "GET", headers=header)
     logger.debug(f"Response data: {response_data}")
 
+    success = response_data["result"]["code"] == 800
+
     return GroupPublicInfoResult(
-        create_at=response_data["create_at"],
-        name=response_data["name"],
+        create_at=response_data["create_at"] if success else None,
+        name=response_data["name"] if success else None,
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
@@ -143,8 +147,10 @@ async def create_group(
     response_data = await request(api_address, "POST", headers=header, body=body)
     logger.debug(f"Response data: {response_data}")
 
+    success = response_data["result"]["code"] == 800
+
     return CreateGroupResult(
-        groupid=response_data["groupid"],
+        groupid=response_data["groupid"] if success else None,
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]

StealthIM/apis/user.py

@@ -107,25 +107,25 @@ async def login(
     response_data = await request(api_address, "POST", body=data)
     logger.debug(f"Response data: {response_data}")
 
-    info = UserInfo(
-        result=Result(
-            code=800,
-            msg=""
-        ),
-        create_time=response_data["user_info"]["create_time"],
-        email=response_data["user_info"]["email"],
-        nickname=response_data["user_info"]["nickname"],
-        phone_number=response_data["user_info"]["phone_number"],
-        username=response_data["user_info"]["username"]
-    ) if "user_info" in response_data else None
+    success = response_data["result"]["code"] == 800
 
     return LoginResult(
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
         ),
-        session=response_data.get("session"),
-        user_info=info
+        session=response_data["session"] if success else None,
+        user_info=UserInfo(
+            result=Result(
+                code=800,
+                msg=""
+            ),
+            create_time=response_data["user_info"]["create_time"],
+            email=response_data["user_info"]["email"],
+            nickname=response_data["user_info"]["nickname"],
+            phone_number=response_data["user_info"]["phone_number"],
+            username=response_data["user_info"]["username"]
+        ) if success else None
     )
 
 
@@ -151,16 +151,18 @@ async def get_self_info(
     response_data = await request(api_address, "GET", headers=header)
     logger.debug(f"Response data: {response_data}")
 
+    success = response_data["result"]["code"] == 800
+
     return UserInfo(
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
         ),
-        create_time=response_data["user_info"]["create_time"],
-        email=response_data["user_info"]["email"],
-        nickname=response_data["user_info"]["nickname"],
-        phone_number=response_data["user_info"]["phone_number"],
-        username=response_data["user_info"]["username"]
+        create_time=response_data["user_info"]["create_time"] if success else None,
+        email=response_data["user_info"]["email"] if success else None,
+        nickname=response_data["user_info"]["nickname"] if success else None,
+        phone_number=response_data["user_info"]["phone_number"] if success else None,
+        username=response_data["user_info"]["username"] if success else None
     )
 
 
@@ -188,16 +190,14 @@ async def get_user_info(
     response_data = await request(api_address, "GET", headers=header)
     logger.debug(f"Response data: {response_data}")
 
-    nickname = None
-    if response_data["result"]["code"] == 800:
-        nickname = response_data["user_info"]["nickname"]
+    success = response_data["result"]["code"] == 800
 
     return UserPublicInfo(
         result=Result(
             code=response_data["result"]["code"],
             msg=response_data["result"]["msg"]
         ),
-        nickname=nickname
+        nickname=response_data["user_info"]["nickname"] if success else None
     )