Adapt to API changes (untested)

Author: Jegarde

src/recnetpy/dataclasses/account.py

@@ -187,7 +187,7 @@ async def get_level(self, force: bool = False) -> 'Progression':
         :return: This player's level.
         """
         if self.level is None or force:
-            data: 'Response[List[ProgressionResponse]]' = await self.rec_net.api.players.v2.progression.bulk.make_request('post', body = {'id': [self.id]})
+            data: 'Response[List[ProgressionResponse]]' = await self.rec_net.apim.players.progression.bulk.make_request('post', body = {'id': [self.id]})
             self.level = Progression(data.data[0])
         return self.level
 
@@ -200,8 +200,12 @@ async def get_subscriber_count(self, force: bool = False) -> int:
         :return: This player's subscriber count.
         """
         if self.subscriber_count is None or force:
-            data: 'Response[int]' = await self.rec_net.clubs.subscription.subscribercount(self.id).make_request('get')
-            self.subscriber_count = data.data
+            try:
+                data: 'Response[int]' = await self.rec_net.clubs.subscription.subscribercount(self.id).make_request('get')
+                self.subscriber_count = data.data
+            except :
+                self.subscriber_count = -1
+
         return self.subscriber_count
 
     async def get_is_influencer(self, force: bool = False) -> bool:
@@ -213,6 +217,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.apim.influencerpartnerprogram.isinfluencer.make_request('get', params = {'accountId': self.id})
             self.is_influencer = data.data
         return self.is_influencer 

src/recnetpy/dataclasses/event.py

@@ -149,7 +149,7 @@ async def get_responses(self, force: bool = False) -> List['EventInteraction']:
         :return: A list of event interaction objects.
         """
         if self.responses is None or force:
-            data: Response[List['EventResponseResponse']] = await self.rec_net.api.playerevents.v1(self.id).responses.make_request('get')
+            data: Response[List['EventResponseResponse']] = await self.rec_net.events(self.id).responses.make_request('get')
             self.responses = EventInteraction.create_from_list(data.data)
         return self.responses
 
@@ -170,6 +170,6 @@ async def resolve_responders(self, force: bool = False) -> List['EventInteractio
                 player = self.client.accounts.create_dataclass(response.player_id)
                 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()})
+            data: 'Response[List[AccountResponse]]' = await self.rec_net.accounts.bulk.make_request('post', body = {"id": players.keys()})
             for data_response in data.data: players.get(data_response['accountId']).patch_data(data_response)
         return self.responses

src/recnetpy/dataclasses/image.py

@@ -163,7 +163,7 @@ async def get_cheers(self, force: bool = False) -> List[int]:
         """        
         if self.cheer_count == 0: return []
         if self.cheer_player_ids is None or force:
-            data: 'Response[List[int]]' = await self.rec_net.api.images.v1(self.id).cheers.make_request('get')
+            data: 'Response[List[int]]' = await self.rec_net.images(self.id).cheers.make_request('get')
             self.cheer_player_ids = data.data           
         return self.cheer_player_ids
 
@@ -177,7 +177,7 @@ async def get_comments(self, force: bool = False) -> List['Comment']:
         """
         if self.comment_count == 0: return []
         if self.comments is None or force:
-            data: 'Response[List[CommentResponse]]' = await self.rec_net.api.images.v1(self.id).comments.make_request('get')
+            data: 'Response[List[CommentResponse]]' = await self.rec_net.images(self.id).comments.make_request('get')
             self.comments = Comment.create_from_list(data.data)
         return self.comments
 
@@ -212,6 +212,6 @@ async def resolve_commenters(self, force: bool = False) -> List['Comment']:
                 player = self.client.accounts.create_dataclass(comment.player_id)
                 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})
+            data: 'Response[List[AccountResponse]]' = await self.rec_net.accounts.bulk.make_request('post', body = {id: players.keys})
             for data_response in data.data: players.get(data_response['accountId']).patch_data(data_response)
         return self.comments

src/recnetpy/dataclasses/room.py

@@ -133,44 +133,44 @@ def patch_data(self, data: 'RoomResponse') -> None:
         self.data = data
         self.id = data["RoomId"]
         self.is_dorm = data["IsDorm"]
-        self.max_player_calculation_mode = MAX_PLAYER_CALCULATION_MODE.get(data["MaxPlayerCalculationMode"], "Unknown")
-        self.max_players = data["MaxPlayers"]
-        self.cloning_allowed = data["CloningAllowed"]
-        self.disable_mic_auto_mute = data["DisableMicAutoMute"]
-        self.disable_room_comments = data["DisableRoomComments"]
-        self.encrypted_voice_chat = data["EncryptVoiceChat"]
-        self.voice_moderated = data["ToxmodEnabled"]
-        self.load_screen_locked = data["LoadScreenLocked"]
+        #self.max_player_calculation_mode = MAX_PLAYER_CALCULATION_MODE.get(data["MaxPlayerCalculationMode"], "Unknown")
+        #self.max_players = data["MaxPlayers"]
+        #self.cloning_allowed = data["CloningAllowed"]
+        #self.disable_mic_auto_mute = data["DisableMicAutoMute"]
+        #self.disable_room_comments = data["DisableRoomComments"]
+        #self.encrypted_voice_chat = data["EncryptVoiceChat"]
+        #self.voice_moderated = data["ToxmodEnabled"]
+        #self.load_screen_locked = data["LoadScreenLocked"]
         self.name = data["Name"]
         self.description = data["Description"]
         self.image_name = data["ImageName"]
         self.warnings = bitmask_decode(data["WarningMask"], WARNING_MASK_LIST)
         self.custom_warning = data["CustomWarning"]
         self.creator_account_id = data["CreatorAccountId"]
-        self.state = ROOM_MODERATION_STATE.get(data["State"], "Unknown")
-        self.accessibility = ACCESSIBILITY_DICT.get(data["Accessibility"], "Unknown")
-        self.supports_level_voting = data["SupportsLevelVoting"]
+        #self.state = ROOM_MODERATION_STATE.get(data["State"], "Unknown")
+        #self.accessibility = ACCESSIBILITY_DICT.get(data["Accessibility"], "Unknown")
+        #self.supports_level_voting = data["SupportsLevelVoting"]
         self.is_rro = data["IsRRO"]
-        self.supports_screens = data["SupportsScreens"]
-        self.supports_walk_vr = data["SupportsWalkVR"]
-        self.supports_teleport_vr = data["SupportsTeleportVR"]
-        self.supports_vr_low = data["SupportsVRLow"]
-        self.supports_quest_two = data["SupportsQuest2"]
-        self.supports_mobile = data["SupportsMobile"]
-        self.supports_juniors = data["SupportsJuniors"]
-        self.min_level = data["MinLevel"]
-        self.created_at = date_to_unix(data["CreatedAt"])
+        #self.supports_screens = data["SupportsScreens"]
+        #self.supports_walk_vr = data["SupportsWalkVR"]
+        #self.supports_teleport_vr = data["SupportsTeleportVR"]
+        #self.supports_vr_low = data["SupportsVRLow"]
+        #self.supports_quest_two = data["SupportsQuest2"]
+        #self.supports_mobile = data["SupportsMobile"]
+        #self.supports_juniors = data["SupportsJuniors"]
+        #self.min_level = data["MinLevel"]
+        #self.created_at = date_to_unix(data["CreatedAt"])
         self.cheer_count = data["Stats"]["CheerCount"]
         self.favorite_count = data["Stats"]["FavoriteCount"]
         self.visitor_count = data["Stats"]["VisitorCount"]
         self.visit_count = data["Stats"]["VisitCount"]
-        self.subrooms = SubRoom.create_from_list(data.get("SubRooms"))
-        self.roles = Role.create_from_list(data.get("Roles"))
-        self.tags = Tag.create_from_list(data.get("Tags"))
-        self.promo_images = data.get("PromoImages")
-        self.promo_external_content = PromoExternalContent.create_from_list(data.get("PromoExternalContent"))
-        self.scores = Score.create_from_list(data.get("Scores"))
-        self.load_screens = LoadScreen.create_from_list(data.get("LoadScreens")) 
+        #self.subrooms = SubRoom.create_from_list(data.get("SubRooms"))
+        #self.roles = Role.create_from_list(data.get("Roles"))
+        #self.tags = Tag.create_from_list(data.get("Tags"))
+        #self.promo_images = data.get("PromoImages")
+        #self.promo_external_content = PromoExternalContent.create_from_list(data.get("PromoExternalContent"))
+        #self.scores = Score.create_from_list(data.get("Scores"))
+        #self.load_screens = LoadScreen.create_from_list(data.get("LoadScreens")) 
 
     async def get_images(self, take: int = 16, skip: int = 0, sort: int = 0, force: bool = False) -> List['Image']:
         """
@@ -221,6 +221,10 @@ async def resolve_role_owners(self) -> Optional[List['Role']]:
 
         :return: A list of role objects, or None if roles is None 
         """
+
+        # Until roles are back
+        return []
+
         if self.roles is None: return None
         roles = self.roles
         accounts: Dict[int, Account] = {}

src/recnetpy/managers/event_manager.py

@@ -22,7 +22,7 @@ async def fetch(self, id: int) -> Optional['Event']:
         :param id: The id of the event.
         :return: An event object representing the data or nothing if not found. 
         """
-        data: 'Response[EventResponse]' = await self.rec_net.apim.playerevents.v1(id).make_request('get')
+        data: 'Response[EventResponse]' = await self.rec_net.events(id).make_request('get')
         if data.success: return self.create_dataclass(id, data.data)
         return None
 
@@ -38,7 +38,7 @@ async def fetch_many(self, ids: List[int]) -> List['Event']:
         :param ids: A list of ids.
         :return: A list of event objects. 
         """
-        data: 'Response[List[EventResponse]]' = await self.rec_net.apim.playerevents.v1.bulk.make_request('post', body = {'Ids': ids})
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.make_request('post', body = {'Ids': ids})
         return self.create_from_data_list(data.data)
 
     async def search(self, query: str, take: int = 16, skip: int = 0, sort: int = 0) -> List['Event']:
@@ -61,7 +61,7 @@ async def search(self, query: str, take: int = 16, skip: int = 0, sort: int = 0)
             'skip': skip,
             'sort': sort
         }
-        data: 'Response[List[EventResponse]]' = await self.rec_net.apim.playerevents.v1.search.make_request('get', params=params)
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.search.make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def from_account(self, id: int, take: int = 16, skip: int = 0) -> List['Event']:
@@ -80,7 +80,7 @@ async def from_account(self, id: int, take: int = 16, skip: int = 0) -> List['Ev
             'take': take,
             'skip': skip,
         }
-        data: 'Response[List[EventResponse]]' = await self.rec_net.apim.playerevents.v1.creator(id).make_request('get', params=params)
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.creator(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def in_room(self, id: int, take: int = 16, skip: int = 0) -> List['Event']:
@@ -99,7 +99,7 @@ async def in_room(self, id: int, take: int = 16, skip: int = 0) -> List['Event']
             'take': take,
             'skip': skip,
         }
-        data: 'Response[List[EventResponse]]' = await self.rec_net.apim.playerevents.v1.room(id).make_request('get', params=params)
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.room(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def get_events(self, take: int = 16, skip: int = 0, sort: int = 0) -> List['Event']:
@@ -118,7 +118,7 @@ async def get_events(self, take: int = 16, skip: int = 0, sort: int = 0) -> List
             'skip': skip,
             'sort': sort
         }
-        data: 'Response[List[EventResponse]]' = await self.rec_net.apim.playerevents.v1.make_request('get', params=params)
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     def create_dataclass(self, id: int, data: Optional['EventResponse'] = None) -> 'Event':

src/recnetpy/managers/image_manager.py

@@ -24,7 +24,7 @@ async def get(self, name: str) -> Optional['Image']:
         :param name: The name of the image.
         :return: An image object representing the data or nothing if not found. 
         """
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v4.bulk.make_request('post', body = {'Names': name})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.make_request('post', body = {'Names': name})
         if data.data: return self.create_dataclass(id, data.data[0])
         return None
 
@@ -42,7 +42,7 @@ async def get_many(self, names: List[str]) -> List['Image']:
         :param name: The name of the image.
         :return: A list of image objects. 
         """
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v4.bulk.make_request('post', body = {'Names': names})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.make_request('post', body = {'Names': names})
         return self.create_from_data_list(data.data)
 
 
@@ -56,7 +56,7 @@ async def fetch(self, id: int) -> Optional['Image']:
         :param id: The id of the image.
         :return: An image object representing the data or nothing if not found. 
         """
-        data: 'Response[ImageResponse]' = await self.rec_net.apim.images.v6(id).make_request('get')
+        data: 'Response[ImageResponse]' = await self.rec_net.images(id).make_request('get')
         if data.success: return self.create_dataclass(id, data.data)
         return None
 
@@ -72,7 +72,7 @@ async def fetch_many(self, ids: List[int]) -> List['Image']:
         :param ids: A list of ids.
         :return: A list of image objects. 
         """
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v3.bulk.make_request('post', body = {'Ids': ids})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.make_request('post', body = {'Ids': ids})
         return self.create_from_data_list(data.data)
 
     async def from_account(self, id: int, take: int = 16, skip: int = 0, sort: int = 0) -> List['Image']:
@@ -93,7 +93,7 @@ async def from_account(self, id: int, take: int = 16, skip: int = 0, sort: int =
             'skip': skip,
             'sort': sort
         }
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v4.player(id).make_request('get', params=params)
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.player(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def player_feed(self, id: int, take: int = 16, skip: int = 0) -> List['Image']:
@@ -112,7 +112,7 @@ async def player_feed(self, id: int, take: int = 16, skip: int = 0) -> List['Ima
             'take': take,
             'skip': skip
         }        
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v3.feed.player(id).make_request('get', params=params)
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.feed.player(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def during_event(self, id: int, take: int = 16, skip: int = 0) -> List['Image']:
@@ -131,7 +131,7 @@ async def during_event(self, id: int, take: int = 16, skip: int = 0) -> List['Im
             'take': take,
             'skip': skip
         }  
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v1.playerevent(id).make_request('get', params=params)
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.playerevent(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def in_room(self, id: int, take: int = 16, skip: int = 0, sort: int = 0) -> List['Image']:
@@ -152,7 +152,7 @@ async def in_room(self, id: int, take: int = 16, skip: int = 0, sort: int = 0) -
             'skip': skip,
             'sort': sort
         }        
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v4.room(id).make_request('get', params=params)
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.room(id).make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     async def front_page(self, take: int = 16, skip: int = 0) -> List['Image']:
@@ -169,7 +169,7 @@ async def front_page(self, take: int = 16, skip: int = 0) -> List['Image']:
             'take': take,
             'skip': skip
         }  
-        data: 'Response[List[ImageResponse]]' = await self.rec_net.apim.images.v3.feed('global').make_request('get', params=params)
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.feed('global').make_request('get', params=params)
         return self.create_from_data_list(data.data)
 
     def create_dataclass(self, id: int, data: Optional['ImageResponse'] = None) -> 'Image':