diff --git a/boticordpy/client.py b/boticordpy/client.py index c621cb9..6816833 100644 --- a/boticordpy/client.py +++ b/boticordpy/client.py @@ -87,7 +87,7 @@ class BoticordClient: """ response = await self.http.get_server_info(server_id) return boticord_types.ResourceServer.from_dict(response) - + async def get_user_info( self, user_id: typing.Union[str, int] ) -> boticord_types.UserProfile: diff --git a/boticordpy/types.py b/boticordpy/types.py index 918f088..917317d 100644 --- a/boticordpy/types.py +++ b/boticordpy/types.py @@ -545,7 +545,7 @@ class PartialUser(APIObjectBase): self: cls = super().__new__(cls) self.username = data["username"] - self.discriminator = data["discriminator"] + self.discriminator = data.get("discriminator") self.avatar = data.get("avatar") self.id = data["id"] self.socials = UserLinks.from_dict(data.get("socials", {})) diff --git a/tests/test_convertation.py b/tests/test_convertation.py index a9d38b2..2a5e55a 100644 --- a/tests/test_convertation.py +++ b/tests/test_convertation.py @@ -13,14 +13,17 @@ resource_bot_dict = { resource_server_dict = { "id": "722424773233213460", "name": "BotiCord.top", - "tags": [ - 134, - 132 - ], + "tags": [134, 132], "status": 1, "createdDate": "2023-05-23T15:16:45.387Z", "premium": {}, } +user_profile_dict = { + "id": "585766846268047370", + "username": "Marakarka", + "bots": [resource_bot_dict], + "shortDescription": None, +} def test_resource_up_convertation(): @@ -53,9 +56,19 @@ def test_resource_bot_convertation(): assert int(model_from_dict.created_date.timestamp()) == 1684794563 assert model_from_dict.status.name == "PUBLIC" + def test_resource_server_convertation(): model_from_dict = types.ResourceServer.from_dict(resource_server_dict) assert int(model_from_dict.created_date.timestamp()) == 1684855005 assert model_from_dict.name == "BotiCord.top" assert model_from_dict.tags[1].name == "GAMES" + + +def test_user_profile_convertation(): + model_from_dict = types.UserProfile.from_dict(user_profile_dict) + + assert model_from_dict.id == "585766846268047370" + assert model_from_dict.username == "Marakarka" + assert model_from_dict.short_description == None + assert model_from_dict.bots[0].id == "947141336451153931"