From eb783d847bad919926db4f4540f4395d8663dc49 Mon Sep 17 00:00:00 2001 From: Vladless Date: Tue, 29 Oct 2024 23:19:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=98=D0=BC=D1=8F=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=BE=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handlers/notifications.py | 6 +++--- main.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/handlers/notifications.py b/handlers/notifications.py index 2fe7d909..4680361a 100644 --- a/handlers/notifications.py +++ b/handlers/notifications.py @@ -4,7 +4,7 @@ import asyncio from aiogram import Bot, Router from aiogram.fsm.state import State, StatesGroup import logging -from config import DATABASE_URL, ADMIN_USERNAME, ADMIN_PASSWORD +from config import DATABASE_URL, ADMIN_USERNAME, ADMIN_PASSWORD, SERVERS from database import get_balance, update_key_expiry, delete_key from client import extend_client_key, delete_client from auth import login_with_credentials @@ -66,7 +66,7 @@ async def notify_10h_keys(bot: Bot, conn: asyncpg.Connection, current_time: floa server_id = record['server_id'] expiry_date = datetime.utcfromtimestamp(expiry_time / 1000).strftime('%Y-%m-%d %H:%M:%S') - message = KEY_EXPIRY_10H.format(server_id=server_id, email=email, expiry_date=expiry_date) + message = KEY_EXPIRY_10H.format(server_id=SERVERS[server_id]['name'], email=email, expiry_date=expiry_date) if not await is_bot_blocked(bot, tg_id): try: @@ -105,7 +105,7 @@ async def notify_24h_keys(bot: Bot, conn: asyncpg.Connection, current_time: floa expiry_date = datetime.utcfromtimestamp(expiry_time / 1000).strftime('%Y-%m-%d %H:%M:%S') balance = await get_balance(tg_id) - message_24h = KEY_EXPIRY_24H.format(server_id=server_id, email=email, hours_left=hours_left, expiry_date=expiry_date, balance=balance) + message_24h = KEY_EXPIRY_24H.format(server_id=SERVERS[server_id]['name'], email=email, hours_left=hours_left, expiry_date=expiry_date, balance=balance) if not await is_bot_blocked(bot, tg_id): try: diff --git a/main.py b/main.py index 566f2db7..e49cb8ff 100644 --- a/main.py +++ b/main.py @@ -80,3 +80,5 @@ if __name__ == '__main__': asyncio.run(main()) except Exception as e: logging.error(f"Ошибка при запуске приложения: {e}") + +BOT_VERSION = '1.3.5' \ No newline at end of file