Rewritten get_presence() and added Error Handler

Author: Rarmash

README.md

@@ -27,7 +27,7 @@ print(account_info.Gamertag)
 
 # Get user presence
 presence = xpa.get_presence(xuid="xuid")
-print(presence.state)
+print(presence.devices)
 ```
 
 Full documentation can be found [here](https://github.com/Rarmash/Xbox-Python-API/tree/master/docs).

docs/XPA.md

@@ -77,10 +77,7 @@ The `XPA` class provides methods for accessing Xbox Live API endpoints to retrie
   - `xuid` (str): XUID of the specified user.
 - **Returns:** An instance of `XUID_PRESENCE` with the following attributes:
   - `state` (str): User's state.
-  - `last_seen_device_type` (str): User's last seen device type.
-  - `last_seen_title_id` (str): User's last seen title ID.
-  - `last_seen_title_name` (str): User's last seen title name.
-  - `last_seen_timestamp` (str): User's last seen timestamp.
+  - `devices` (list): List of devices the user is present on with titles information.
 
 ### `get_user_achievements(xuid: str) -> list`
 - **Description:** Get user achievements using their XUID.

setup.py

@@ -9,7 +9,7 @@ def read(f_name):
 
 setup(
     name="xbox-python-api",
-    version="0.1.3",
+    version="0.2",
     url="https://github.com/Rarmash/Xbox-Python-API",
     author="Rarmash",
     description="Xbox API library",

xpa/ErrorHandler.py

@@ -0,0 +1,34 @@
+class XboxApiError(Exception):
+    status_code = None
+
+    def __init__(self, message):
+        self.message = message
+        super().__init__(message)
+
+
+class XboxApiBadRequestError(XboxApiError):
+    status_code = 400
+
+
+class XboxApiAuthError(XboxApiError):
+    status_code = 401
+
+
+class XboxApiForbiddenError(XboxApiError):
+    status_code = 403
+
+
+class XboxApiNotFoundError(XboxApiError):
+    status_code = 404
+
+
+class XboxApiRateLimitError(XboxApiError):
+    status_code = 429
+
+
+class XboxApiRequestError(XboxApiError):
+    status_code = 500
+
+
+class XboxApiServerError(XboxApiError):
+    status_code = 503

xpa/XPA.py

@@ -7,12 +7,14 @@
 from .classes.FRIEND_INFO_GAMERTAG import FRIEND_INFO_GAMERTAG
 from .classes.PLAYER_SUMMARY import PLAYER_SUMMARY
 from .classes.XUID_PRESENCE import XUID_PRESENCE
+from .ErrorHandler import *
 
 
 class XPA:
     """
     Xbox API class
     """
+
     def __init__(self, api_key):
         """
         Initialize the XPA class
@@ -37,7 +39,27 @@ def _make_request(self, endpoint):
             requests.models.Response: response from the request.
         """
         headers = {'x-authorization': self.api_key}
-        return requests.get(endpoint, headers=headers)
+        try:
+            response = requests.get(endpoint, headers=headers)
+            response.raise_for_status()
+        except requests.exceptions.HTTPError as http_err:
+            if response.status_code == 400:
+                raise XboxApiBadRequestError("Bad request") from http_err
+            elif response.status_code == 401:
+                raise XboxApiAuthError("Unauthorized") from http_err
+            elif response.status_code == 403:
+                raise XboxApiForbiddenError("Forbidden") from http_err
+            elif response.status_code == 404:
+                raise XboxApiNotFoundError("Not found") from http_err
+            elif response.status_code == 429:
+                raise XboxApiRateLimitError("Rate limit exceeded") from http_err
+            elif response.status_code == 500:
+                raise XboxApiBadRequestError("Internal server error") from http_err
+            elif response.status_code == 503:
+                raise XboxApiServerError("Service unavailable") from http_err
+        except Exception as err:
+            raise XboxApiError("An error occurred") from err
+        return response
 
     def _find_setting_by_id(self, settings, setting_id):
         """
@@ -145,7 +167,10 @@ def get_account_info_gamertag(self, gamertag: str) -> ACCOUNT_INFO_GAMERTAG:
         """
         endpoint = self.url.search_gamertag_url(gamertag)
         response = self._make_request(endpoint).json()
-        user_data = response['people'][0]
+        try:
+            user_data = response['people'][0]
+        except IndexError:
+            raise XboxApiNotFoundError("User not found")
         account_info = ACCOUNT_INFO_GAMERTAG(
             xuid=user_data["xuid"],
             displayName=user_data["displayName"],
@@ -211,10 +236,7 @@ def get_presence(self, xuid: str) -> XUID_PRESENCE:
         user_data = response[0]
         presence = XUID_PRESENCE(
             state=user_data["state"],
-            last_seen_device_type=user_data["lastSeen"]["deviceType"],
-            last_seen_title_id=user_data["lastSeen"]["titleId"],
-            last_seen_title_name=user_data["lastSeen"]["titleName"],
-            last_seen_timestamp=user_data["lastSeen"]["timestamp"]
+            devices=user_data["devices"]
         )
         return presence
 

xpa/classes/XUID_PRESENCE.py

@@ -1,7 +1,4 @@
 class XUID_PRESENCE:
-    def __init__(self, state, last_seen_device_type, last_seen_title_id, last_seen_title_name, last_seen_timestamp):
+    def __init__(self, state, devices):
         self.state = state
-        self.last_seen_device_type = last_seen_device_type
-        self.last_seen_title_id = last_seen_title_id
-        self.last_seen_title_name = last_seen_title_name
-        self.last_seen_timestamp = last_seen_timestamp
+        self.devices = devices