From 1b82653f82a53541bfb7eebf5854a2c65afce612 Mon Sep 17 00:00:00 2001 From: gsd Date: Sun, 25 Feb 2024 19:46:16 +0300 Subject: [PATCH] release --- .gitignore | 1 + Dockerfile | 2 +- backend_integration.py | 16 ++++++++-------- paybot.facti13.py | 28 ++++++++++++++++++++-------- 4 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ba0430d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e069f4c..a9aa0d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3.10 -RUN python -m pip install git+https://git.pblr-nyk.pro/gsd/Donation-Alerts-API-Python aiohttp websocket-client +RUN python -m pip install git+https://git.pblr-nyk.pro/gsd/Donation-Alerts-API-Python git+https://github.com/miguelgrinberg/python-socketio aiohttp websocket-client websockets ENV PYTHONUNBUFFERED 1 WORKDIR /app COPY ./ ./ diff --git a/backend_integration.py b/backend_integration.py index 4062108..dc52e48 100644 --- a/backend_integration.py +++ b/backend_integration.py @@ -7,17 +7,17 @@ class BackendClient: up = False warn = False - def __init__(self): - if not os.getenv("BACKEND_URL", ""): + def __init__(self, backend_url = "", secret_key = ""): + if not os.getenv("BACKEND_URL", backend_url): error("BACKEND_URL not setted in env") sys.exit(10) - if not os.getenv("SECRET_KEY", ""): + if not os.getenv("SECRET_KEY", secret_key): error("SECRET_KEY not setted in env") sys.exit(11) - self.secret_key = os.getenv("SECRET_KEY") - self.pulse_url = f"{os.getenv('BACKEND_URL')}/api/pulse" - self.vip_url = f"{os.getenv('BACKEND_URL')}/api/external/vip" - self.detect = f"{os.getenv('BACKEND_URL')}/api/profile/steam" + self.secret_key = os.getenv("SECRET_KEY", secret_key) + self.pulse_url = f"{os.getenv('BACKEND_URL', backend_url)}/api/pulse" + self.vip_url = f"{os.getenv('BACKEND_URL', backend_url)}/api/external/vip" + self.detect = f"{os.getenv('BACKEND_URL', backend_url)}/api/profile/steam" async def getSteam(self, any): async with aiohttp.ClientSession(cookies={ @@ -47,7 +47,7 @@ class BackendClient: async def vip(self, steamid, amount: int, extra: str, unique: str = ""): async with aiohttp.ClientSession(cookies={ "secretkey":self.secret_key}) as session: - async with session.post(self.vip_url + f"?steam={steamid}&amount={int(amount)}&service=qiwi&extra={extra}&unique={unique}", ssl=False) as response: + async with session.post(self.vip_url + f"?steam={steamid}&amount={int(amount)}&service=donationalerts&extra={extra}&unique={unique}", ssl=False) as response: try: result = int(await response.text()) if result == 0: diff --git a/paybot.facti13.py b/paybot.facti13.py index 9adaa22..a8e2c80 100644 --- a/paybot.facti13.py +++ b/paybot.facti13.py @@ -17,13 +17,15 @@ class CustomAlerts(Alert): } def __init__(self, token, backend): + self.backend = backend super().__init__(token) def run(self): + info("Start pooling") @self.event() async def handler(event): print(event) - self.calculate(event) + await self.calculate(event) async def calculate(self, event: Event): if event.currency != "RUB": @@ -34,14 +36,24 @@ class CustomAlerts(Alert): await self.update_prices_from_server() money = int(event.amount) - steam2 = self.backend.detect(event.message).steam2 uid = event.id - seconds = self.price_checker(money) if seconds == 0: warning(f"[{uid}] so smol donate {money} RUB") - - info(f"Add vip {steam2}, amount {money}") + + try: + if event._is_test_alert: + event.message = "https://steamcommunity.com/id/gabe/" + steam2 = (await self.backend.getSteam(event.message))['steam2'] + except Exception as e: + error(f"Cannot get steam64 to steam2: {e}") + return + + info(f"Add vip {steam2}, amount {money}, seconds: {seconds}") + if event._is_test_alert: + warning(f"Is test alert! rub={int(money * 0.9)}; da_{uid}") + return + await self.backend.vip(steam2, seconds, f"rub={int(money * 0.9)};", unique=f"da_{uid}") async def update_prices_from_server(self, exit_if_error = True): @@ -50,11 +62,11 @@ class CustomAlerts(Alert): self.update_prices(prices) def update_prices(self, prices): + self.prices = {} for price in prices: if price["money_price"] == 0: continue - self.prices = {} - self.prices.update({float(price["money_price"]) + float(price["money_price"] * price["da_percent"] / 10):self.convert_map[price['period']]}) + self.prices.update({float(price["money_price"]) + float(price["money_price"] * price["da_percent"] / 100):self.convert_map[price['period']]}) if not self.prices: error("cannot get prices from server") sys.exit(228) @@ -74,7 +86,7 @@ if __name__ == "__main__": error("DA_TOKEN in not setted!") sys.exit(2) - print("Build date: "+os.getenv("BUILDDATE", "not setted")) + print("Build date: " + os.getenv("BUILDDATE", "not setted")) def run(): client = CustomAlerts(os.getenv("DA_TOKEN"), BackendClient()) client.run()