upload 1.0.4

Fix bug with users notFound.
This commit is contained in:
Teleport
2022-07-16 11:23:26 +03:00
parent 372e4c78fb
commit 9831189fa9
2 changed files with 20 additions and 4 deletions

View File

@@ -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:
"""

View File

@@ -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',