From 9831189fa99f11ce30cc5d2dba31d90d8043e6b6 Mon Sep 17 00:00:00 2001
From: Teleport <stepan@m.khoz.ru>
Date: Sat, 16 Jul 2022 11:23:26 +0300
Subject: [PATCH] upload 1.0.4

Fix bug with users notFound.
---
 pyspw/api.py | 22 +++++++++++++++++++---
 setup.py     |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pyspw/api.py b/pyspw/api.py
index 0fe50e1..efd725f 100644
--- a/pyspw/api.py
+++ b/pyspw/api.py
@@ -18,7 +18,7 @@ class sp_api_base:
     def __str__(self):
         pass
 
-    def __get(self, path: str = None) -> rq.Response:
+    def __get(self, path: str = None, ignore_status_code: bool = False) -> rq.Response:
         headers = {
             'Authorization': self.authorization,
             'User-Agent': 'Py-SPW'
@@ -29,6 +29,9 @@ class sp_api_base:
         except rq.exceptions.ConnectionError as error:
             raise err.SpwApiError(error)
 
+        if ignore_status_code:
+            return response
+
         if response.status_code == 200:
             return response
 
@@ -36,7 +39,8 @@ class sp_api_base:
             raise err.SpwApiError(f'HTTP: {response.status_code}, Server Error.')
 
         else:
-            raise err.SpwApiError(f'HTTP: {response.status_code} {response.json()["error"]}. Message: {response.json()["message"]}')
+            raise err.SpwApiError(
+                f'HTTP: {response.status_code} {response.json()["error"]}. Message: {response.json()["message"]}')
 
     def __post(self, path: str = None, body: dict = None) -> rq.Response:
         headers = {
@@ -64,7 +68,19 @@ class sp_api_base:
             :param discord_id: ID пользователя дискорда.
             :return: Str если пользователь найден, None если пользователь не найден. В str содержиться никнейм пользователя
         """
-        return self.__get(f'/users/{discord_id}').json()['username']
+        response = self.__get(f'/users/{discord_id}', True)
+
+        if response.status_code == 200:
+            return response.json()['username']
+
+        elif response.status_code == 404:
+            return None
+
+        elif response.status_code >= 500:
+            raise err.SpwApiError(f'HTTP: {response.status_code}, Server Error.')
+
+        else:
+            raise err.SpwApiError(f'HTTP: {response.status_code} {response.json()["error"]}. Message: {response.json()["message"]}')
 
     def check_access(self, discord_id: str) -> bool:
         """
diff --git a/setup.py b/setup.py
index 2509424..d33d46d 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ requires = ['requests==2.28.1']
 
 setup(
     name='Py-SPW',
-    version='1.0.3',
+    version='1.0.4',
     packages=['pyspw'],
     url='https://github.com/teleport2/Py-SPW',
     license='MIT License',