mirror of
https://github.com/yawaflua/Py-SPW.git
synced 2025-12-10 12:29:30 +02:00
upload 1.0.4
Fix bug with users notFound.
This commit is contained in:
22
pyspw/api.py
22
pyspw/api.py
@@ -18,7 +18,7 @@ class sp_api_base:
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def __get(self, path: str = None) -> rq.Response:
|
def __get(self, path: str = None, ignore_status_code: bool = False) -> rq.Response:
|
||||||
headers = {
|
headers = {
|
||||||
'Authorization': self.authorization,
|
'Authorization': self.authorization,
|
||||||
'User-Agent': 'Py-SPW'
|
'User-Agent': 'Py-SPW'
|
||||||
@@ -29,6 +29,9 @@ class sp_api_base:
|
|||||||
except rq.exceptions.ConnectionError as error:
|
except rq.exceptions.ConnectionError as error:
|
||||||
raise err.SpwApiError(error)
|
raise err.SpwApiError(error)
|
||||||
|
|
||||||
|
if ignore_status_code:
|
||||||
|
return response
|
||||||
|
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -36,7 +39,8 @@ class sp_api_base:
|
|||||||
raise err.SpwApiError(f'HTTP: {response.status_code}, Server Error.')
|
raise err.SpwApiError(f'HTTP: {response.status_code}, Server Error.')
|
||||||
|
|
||||||
else:
|
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:
|
def __post(self, path: str = None, body: dict = None) -> rq.Response:
|
||||||
headers = {
|
headers = {
|
||||||
@@ -64,7 +68,19 @@ class sp_api_base:
|
|||||||
:param discord_id: ID пользователя дискорда.
|
:param discord_id: ID пользователя дискорда.
|
||||||
:return: Str если пользователь найден, None если пользователь не найден. В str содержиться никнейм пользователя
|
: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:
|
def check_access(self, discord_id: str) -> bool:
|
||||||
"""
|
"""
|
||||||
|
|||||||
2
setup.py
2
setup.py
@@ -10,7 +10,7 @@ requires = ['requests==2.28.1']
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='Py-SPW',
|
name='Py-SPW',
|
||||||
version='1.0.3',
|
version='1.0.4',
|
||||||
packages=['pyspw'],
|
packages=['pyspw'],
|
||||||
url='https://github.com/teleport2/Py-SPW',
|
url='https://github.com/teleport2/Py-SPW',
|
||||||
license='MIT License',
|
license='MIT License',
|
||||||
|
|||||||
Reference in New Issue
Block a user