Adapt API changes

Author: Jegarde

pyproject.toml

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

src/recnetpy/dataclasses/account.py

@@ -200,11 +200,11 @@ async def get_subscriber_count(self, force: bool = False) -> int:
         :return: This player's subscriber count.
         """
         if self.subscriber_count is None or force:
-            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
+            #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
 

src/recnetpy/managers/event_manager.py

@@ -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.events.make_request('post', body = {'Ids': ids})
+        data: 'Response[List[EventResponse]]' = await self.rec_net.events.bulk.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']:

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.images.bulk.make_request('post', body = {'Names': name})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.name.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.images.bulk.make_request('post', body = {'Names': names})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.name.make_request('post', body = {'Names': names})
         return self.create_from_data_list(data.data)
 
 
@@ -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.images.bulk.make_request('post', body = {'Ids': ids})
+        data: 'Response[List[ImageResponse]]' = await self.rec_net.images.bulk.id.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']:
@@ -96,8 +96,9 @@ async def from_account(self, id: int, take: int = 16, skip: int = 0, sort: int =
         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']:
-        """
+        ""
         Gets a list of images taken of a player.
         If no image or the respective account is found, an empty list will be returned.
 
@@ -107,14 +108,15 @@ async def player_feed(self, id: int, take: int = 16, skip: int = 0) -> List['Ima
         :param take: The number of results to return.
         :param skip: The number of results to skip.                 
         :return: A list of image objects.
-        """
+        ""
         params = {
             'take': take,
             'skip': skip
         }        
         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']:
         """
         Gets a list of images taken during an event.
@@ -155,22 +157,24 @@ async def in_room(self, id: int, take: int = 16, skip: int = 0, sort: int = 0) -
         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']:
-        """
+        ""
         Gets a list of the most popular images on RecNet.
 
         Authorization required.
 
         :param take: The number of results to return.
         :param skip: The number of results to skip.
         :return: A list of image objects.
-        """
+        ""
         params = {
             'take': take,
             'skip': skip
         }  
         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':
         """

src/recnetpy/rest/route_builder.py

@@ -22,7 +22,7 @@ def __init__(self, client: 'HTTPClient', base: str, use_auth: bool = False) -> N
         self.client = client
         self.use_auth = use_auth
 
-    async def make_request(self, method: str, params: Optional[Dict] = None, body: Optional[Dict] = None, headers: Optional[Dict] = None) -> 'Response':
+    async def make_request(self, method: str, params: Optional[Dict] = None, body: Optional[Dict] = None, headers: Optional[Dict] = {}, api_version: str = "v1") -> 'Response':
         """
         Joins the route components into a url, and constructs
         a request object that is processed by the http client.
@@ -35,6 +35,8 @@ async def make_request(self, method: str, params: Optional[Dict] = None, body: O
         if self.use_auth:
             if headers is None: headers = {}
             headers['Ocp-Apim-Subscription-Key'] = self.client.api_key
+        headers["Api-Version"] = api_version
+        #headers["Content-Type"] = "application/x-www-form-urlencoded"
         url = self.base + "/".join(self.route)
         request = Request(self.client.session, method, url, params, body, headers)
         return await self.client.push(request)

src/recnetpy/rest/route_manager.py

@@ -20,7 +20,7 @@ def apim(self) -> RouteBuilder:
 
         @return: A apim route builder.
         """
-        return RouteBuilder(self.client, "https://apim.rec.net/public/apis/api/", use_auth=True)
+        return RouteBuilder(self.client, "https://apim.rec.net/public/", use_auth=True)
 
     @property
     def api(self) -> RouteBuilder:
@@ -40,7 +40,7 @@ def events(self) -> RouteBuilder:
 
         @return: An events route builder.
         """
-        return RouteBuilder(self.client, "https://apim.rec.net/public/playerevents/ ", use_auth=True)
+        return RouteBuilder(self.client, "https://apim.rec.net/public/playerevents/", use_auth=True)
 
     @property
     def images(self) -> RouteBuilder:
@@ -60,7 +60,7 @@ def rooms(self) -> RouteBuilder:
 
         @return: A rooms route builder.
         """
-        return RouteBuilder(self.client, "https://apim.rec.net/public/rooms/")
+        return RouteBuilder(self.client, "https://apim.rec.net/public/rooms/", use_auth=True)
 
     @property
     def accounts(self) -> RouteBuilder: