diff --git a/PyPI files/dist/donationalerts-api-1.0.3.tar.gz b/PyPI files/dist/donationalerts-api-1.0.3.tar.gz deleted file mode 100644 index 77c29ff..0000000 Binary files a/PyPI files/dist/donationalerts-api-1.0.3.tar.gz and /dev/null differ diff --git a/PyPI files/dist/donationalerts-api-1.0.4.tar.gz b/PyPI files/dist/donationalerts-api-1.0.4.tar.gz deleted file mode 100644 index 95e3f5d..0000000 Binary files a/PyPI files/dist/donationalerts-api-1.0.4.tar.gz and /dev/null differ diff --git a/PyPI files/dist/donationalerts-api-1.0.5.tar.gz b/PyPI files/dist/donationalerts-api-1.0.5.tar.gz deleted file mode 100644 index ffdd7de..0000000 Binary files a/PyPI files/dist/donationalerts-api-1.0.5.tar.gz and /dev/null differ diff --git a/PyPI files/dist/donationalerts-api-1.0.6.tar.gz b/PyPI files/dist/donationalerts-api-1.0.6.tar.gz deleted file mode 100644 index a0b7bc8..0000000 Binary files a/PyPI files/dist/donationalerts-api-1.0.6.tar.gz and /dev/null differ diff --git a/PyPI files/dist/donationalerts-api-1.0.7.tar.gz b/PyPI files/dist/donationalerts-api-1.0.7.tar.gz deleted file mode 100644 index ae26977..0000000 Binary files a/PyPI files/dist/donationalerts-api-1.0.7.tar.gz and /dev/null differ diff --git a/PyPI files/dist/donationalerts_api-1.0.3-py3-none-any.whl b/PyPI files/dist/donationalerts_api-1.0.3-py3-none-any.whl deleted file mode 100644 index 84f0e62..0000000 Binary files a/PyPI files/dist/donationalerts_api-1.0.3-py3-none-any.whl and /dev/null differ diff --git a/PyPI files/dist/donationalerts_api-1.0.4-py3-none-any.whl b/PyPI files/dist/donationalerts_api-1.0.4-py3-none-any.whl deleted file mode 100644 index ee17235..0000000 Binary files a/PyPI files/dist/donationalerts_api-1.0.4-py3-none-any.whl and /dev/null differ diff --git a/PyPI files/dist/donationalerts_api-1.0.5-py3-none-any.whl b/PyPI files/dist/donationalerts_api-1.0.5-py3-none-any.whl deleted file mode 100644 index 76e8e94..0000000 Binary files a/PyPI files/dist/donationalerts_api-1.0.5-py3-none-any.whl and /dev/null differ diff --git a/PyPI files/dist/donationalerts_api-1.0.6-py3-none-any.whl b/PyPI files/dist/donationalerts_api-1.0.6-py3-none-any.whl deleted file mode 100644 index d76f1a0..0000000 Binary files a/PyPI files/dist/donationalerts_api-1.0.6-py3-none-any.whl and /dev/null differ diff --git a/PyPI files/dist/donationalerts_api-1.0.7-py3-none-any.whl b/PyPI files/dist/donationalerts_api-1.0.7-py3-none-any.whl deleted file mode 100644 index 30148cb..0000000 Binary files a/PyPI files/dist/donationalerts_api-1.0.7-py3-none-any.whl and /dev/null differ diff --git a/PyPI files/pyproject.toml b/PyPI files/pyproject.toml deleted file mode 100644 index 60315c4..0000000 --- a/PyPI files/pyproject.toml +++ /dev/null @@ -1,15 +0,0 @@ -[tool.poetry] -name = "donationalerts-api" -version = "1.0.7" -description = "https://github.com/Fsoky/Donation-Alerts-API-Python" -readme = "README.md" -authors = ["Fsoky Community "] - -[tool.poetry.dependencies] -python = "^3.7" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" diff --git a/README.md b/README.md index 4bd03ff..992aa17 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ from donationalerts_api.asyncio_api import Alert alert = Alert("token") -@alert.event +@alert.event() async def handler(event): print(f"{event.username} пожертвовал {event.amount_formatted} {event.currency} | {event.message}") """ Вывод: @@ -122,4 +122,4 @@ async def handler(event): Как вы поняли, чтобы работать с асинхронном, нужно импортировать классы из пакета `asyncio_api`. -__Обзор новой версии от автора:__ *скоро...* +__Обзор новой версии от автора:__ *скоро...* \ No newline at end of file diff --git a/donationalerts_api/asyncio_api.py b/donationalerts_api/asyncio_api.py index 419004c..3b05617 100644 --- a/donationalerts_api/asyncio_api.py +++ b/donationalerts_api/asyncio_api.py @@ -1,4 +1,5 @@ import json +from datetime import datetime import asyncio import socketio @@ -84,14 +85,15 @@ class DonationAlertsApi: async with aiohttp.ClientSession() as session: async with session.get(f"{DEFAULT_API_LINK}alerts/donations", headers=headers) as response: + print(response) objs = await response.json() - donations = Donations(objects=objs["data"]) + donations = Donations(objects=objs) for obj in objs["data"]: donation_object = DonationsData( obj["amount"], obj["amount_in_user_currency"], - obj["created_at"], + datetime.strptime(obj["created_at"], "%Y-%m-%d %H:%M:%S"), obj["currency"], obj["id"], obj["is_shown"], @@ -230,7 +232,7 @@ class Centrifugo: return CentrifugoResponse( obj["amount"], obj["amount_in_user_currency"], - obj["created_at"], + datetime.strptime(obj["created_at"], "%Y-%m-%d %H:%M:%S"), obj["currency"], obj["id"], obj["is_shown"], @@ -281,7 +283,7 @@ class Alert: data["currency"], data["message"], data["header"], - data["date_created"], + datetime.strptime(data["date_created"], "%Y-%m-%d %H:%M:%S"), data["emotes"], data["ap_id"], data["_is_test_alert"], diff --git a/donationalerts_api/donationalerts_api.py b/donationalerts_api/donationalerts_api.py index 8f22361..16cae22 100644 --- a/donationalerts_api/donationalerts_api.py +++ b/donationalerts_api/donationalerts_api.py @@ -1,5 +1,6 @@ import json import requests +from datetime import datetime from websocket import create_connection import socketio @@ -84,13 +85,13 @@ class DonationAlertsApi: } objs = requests.get(f"{DEFAULT_API_LINK}alerts/donations", headers=headers).json() - donations = Donations(objects=objs["data"]) + donations = Donations(objects=objs) for obj in objs["data"]: donation_object = DonationsData( obj["amount"], obj["amount_in_user_currency"], - obj["created_at"], + datetime.strptime(obj["created_at"], "%Y-%m-%d %H:%M:%S"), obj["currency"], obj["id"], obj["is_shown"], @@ -221,7 +222,7 @@ class Centrifugo: return CentrifugoResponse( obj["amount"], obj["amount_in_user_currency"], - obj["created_at"], + datetime.strptime(obj["created_at"], "%Y-%m-%d %H:%M:%S"), obj["currency"], obj["id"], obj["is_shown"], @@ -271,7 +272,7 @@ class Alert: data["currency"], data["message"], data["header"], - data["date_created"], + datetime.strptime(data["date_created"], "%Y-%m-%d %H:%M:%S"), data["emotes"], data["ap_id"], data["_is_test_alert"], diff --git a/donationalerts_api/utils.py b/donationalerts_api/utils.py index 4b9963f..f113512 100644 --- a/donationalerts_api/utils.py +++ b/donationalerts_api/utils.py @@ -1,4 +1,5 @@ from dataclasses import dataclass +from typing import Any @dataclass @@ -17,7 +18,7 @@ class Event: currency: str message: str header: str - date_created: str + date_created: Any emotes: str ap_id: str _is_test_alert: bool @@ -38,7 +39,7 @@ class DonationsData: amount: int amount_in_user_currency: float - created_at: str + created_at: Any currency: str id: int is_shown: int @@ -79,7 +80,7 @@ class CentrifugoResponse: amount: int amount_in_user_currency: float - created_at: str + created_at: Any currency: str id: int is_shown: int