Fix accounts and events

Author: Jegarde

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "recnetpy"
-version = "0.2.59"
+version = "0.2.6"
 authors = [
     { name="RecNetBot Development"}
 ]

src/recnetpy/dataclasses/account.py

@@ -69,16 +69,16 @@ def patch_data(self, data: 'AccountResponse') -> None:
         :param data: Data from the api.
         """
         self.data = data
-        self.id = data['AccountId']
-        self.username = data['Username']
-        self.display_name = data['DisplayName']
-        self.profile_image = data['ProfileImage']
-        self.banner_image = data.get("BannerImage", None)
+        self.id = data['accountId']
+        self.username = data['username']
+        self.display_name = data['displayName']
+        self.profile_image = data['profileImage']
+        self.banner_image = data.get("bannerImage", None)
         #self.is_junior = bool(data['isJunior'])
-        self.platforms = bitmask_decode(data['Platforms'], PLATFORM_LIST)
-        self.personal_pronouns = bitmask_decode(data['PersonalPronouns'], PERSONAL_PRONOUNS_LIST)
-        self.identity_flags = bitmask_decode(data['IdentityFlags'], IDENTITY_FLAGS_LIST)
-        self.created_at = date_to_unix(data['CreatedAt'], new=True)
+        self.platforms = bitmask_decode(data['platforms'], PLATFORM_LIST)
+        self.personal_pronouns = bitmask_decode(data['personalPronouns'], PERSONAL_PRONOUNS_LIST)
+        self.identity_flags = bitmask_decode(data['identityFlags'], IDENTITY_FLAGS_LIST)
+        self.created_at = date_to_unix(data['createdAt'], new=False)
 
     async def get_events(self, take: int = 16, skip: int = 0, force: bool = False) -> List['Event']:
         """
@@ -210,6 +210,6 @@ async def get_is_influencer(self, force: bool = False) -> bool:
         :return: This player's subscriber count.
         """
         if self.is_influencer is None or force:
-            data: 'Response[bool]' = await self.rec_net.api.influencerpartnerprogram.isinfluencer.make_request('get', params = {'AccountId': self.id})
+            data: 'Response[bool]' = await self.rec_net.api.influencerpartnerprogram.isinfluencer.make_request('get', params = {'accountId': self.id})
             self.is_influencer = data.data
         return self.is_influencer 

src/recnetpy/dataclasses/event.py

@@ -74,18 +74,18 @@ def patch_data(self, data: 'EventResponse') -> None:
         self.creator_player_id = data['CreatorPlayerId']
         self.image_name = data['ImageName']
         self.room_id = data['RoomId']
-        self.subroom_id = data['SubRoomId']
+        #self.subroom_id = data['SubRoomId']
         self.club = data['ClubId']
         self.name = data['Name']
         self.description = data['Description']
-        self.start_time = date_to_unix(data['StartTime'])
-        self.end_time = date_to_unix(data['EndTime'])
+        self.start_time = date_to_unix(data['StartTime'], new=True)
+        self.end_time = date_to_unix(data['EndTime'], new=True)
         self.attendee_count = data['AttendeeCount']
-        self.accessibility = ACCESSIBILITY_DICT.get(data['Accessibility'], "Unknown")
-        self.is_multi_instance = data['IsMultiInstance']
-        self.support_multi_instance_room_chat = data['SupportMultiInstanceRoomChat']
-        self.default_broadcast_permissions = BROADCAST_PERMISSION_DICT.get(data['DefaultBroadcastPermissions'], "Unknown")
-        self.can_request_broadcast_permissions = BROADCAST_PERMISSION_DICT.get(data['CanRequestBroadcastPermissions'], "Unkown")
+        #self.accessibility = ACCESSIBILITY_DICT.get(data['Accessibility'], "Unknown")
+        #self.is_multi_instance = data['IsMultiInstance']
+        #self.support_multi_instance_room_chat = data['SupportMultiInstanceRoomChat']
+        #self.default_broadcast_permissions = BROADCAST_PERMISSION_DICT.get(data['DefaultBroadcastPermissions'], "Unknown")
+        #self.can_request_broadcast_permissions = BROADCAST_PERMISSION_DICT.get(data['CanRequestBroadcastPermissions'], "Unkown")
 
     async def get_images(self, take: int = 16, skip: int = 0, force: bool = False) -> List['Image']:
         """
@@ -171,5 +171,5 @@ async def resolve_responders(self, force: bool = False) -> List['EventInteractio
                 response.player = player
                 players[response.player_id] = player
             data: 'Response[List[AccountResponse]]' = await self.rec_net.accounts.account.bulk.make_request('post', body = {"id": players.keys()})
-            for data_response in data.data: players.get(data_response['AccountId']).patch_data(data_response)
+            for data_response in data.data: players.get(data_response['accountId']).patch_data(data_response)
         return self.responses

src/recnetpy/dataclasses/image.py

@@ -213,5 +213,5 @@ async def resolve_commenters(self, force: bool = False) -> List['Comment']:
                 comment.player = player
                 players[comment.player_id] = player
             data: 'Response[List[AccountResponse]]' = await self.rec_net.accounts.account.bulk.make_request('post', body = {id: players.keys})
-            for data_response in data.data: players.get(data_response['AccountId']).patch_data(data_response)
+            for data_response in data.data: players.get(data_response['accountId']).patch_data(data_response)
         return self.comments

src/recnetpy/dataclasses/room.py

@@ -229,7 +229,7 @@ async def resolve_role_owners(self) -> Optional[List['Role']]:
             role.account = account
             accounts[role.account_id] = account
         data: 'Response[List[AccountResponse]]' = await self.rec_net.accounts.bulk.make_request('post', body = {"id": accounts.keys()})
-        for data_response in data.data: accounts.get(data_response['AccountId']).patch_data(data_response)
+        for data_response in data.data: accounts.get(data_response['accountId']).patch_data(data_response)
 
         # Search for deleted accounts
         deleted = []

src/recnetpy/managers/account_manager.py

@@ -23,7 +23,7 @@ async def get(self, name: str) -> Optional['Account']:
         :return: An account object representing the data or nothing if not found. 
         """
         data: 'Response[AccountResponse]' = await self.rec_net.accounts.make_request('get', params = {'username': str(name)})
-        if data.success and data.data: return self.create_dataclass(data.data['AccountId'], data.data)
+        if data.success and data.data: return self.create_dataclass(data.data['accountId'], data.data)
         return None
 
     async def fetch(self, id: int) -> Optional['Account']:
@@ -105,7 +105,7 @@ def create_from_data_list(self, data: List['AccountResponse']) -> List['Account'
         """
         account_list: List['Account'] = []
         for account_data in data:
-            account_obj = Account(self.client, account_data['AccountId'], account_data)
+            account_obj = Account(self.client, account_data['accountId'], account_data)
             account_list.append(account_obj)
         return account_list
 

src/recnetpy/misc/api_responses.py

@@ -67,19 +67,19 @@ class EventResponse(TypedDict):
     CreatorPlayerId: int
     ImageName: Optional[str]
     RoomId: int
-    SubRoomId: Optional[int]
+    #SubRoomId: Optional[int]
     ClubId: Optional[int]
     Name: str
     Description: str
     StartTime: str
     EndTime: str
     AttendeeCount: int
-    State: int
-    Accessibility: int # 0 = private, 1 = public, 2 = unlisted 
-    IsMultiInstance: bool
-    SupportMultiInstanceChat: bool
-    DefaultBroadcastPermissions: int 
-    CanRequestBroadcastPermissions: int
+    #State: int
+    #Accessibility: int # 0 = private, 1 = public, 2 = unlisted 
+    #IsMultiInstance: bool
+    #SupportMultiInstanceChat: bool
+    #DefaultBroadcastPermissions: int 
+    #CanRequestBroadcastPermissions: int
 
 class ImageResponse(TypedDict):
     """