diff --git a/bot.py b/bot.py index 456d3fbb..5fc35812 100644 --- a/bot.py +++ b/bot.py @@ -19,7 +19,7 @@ bot = Bot(token=API_TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTM storage = MemoryStorage() dp = Dispatcher(bot=bot, storage=storage) -version = "4.1-preRelease" +version = "4.2-beta" register_middleware(dp) diff --git a/handlers/keys/__init__.py b/handlers/keys/__init__.py index 6a5ecfac..831e0979 100644 --- a/handlers/keys/__init__.py +++ b/handlers/keys/__init__.py @@ -4,6 +4,10 @@ from aiogram import Router from .key_management import router as management_router from .keys import router as keys_router +from .key_view import router as view_router +from .key_renew import router as renew_router +from .key_freeze import router as freeze_router +from .key_connect import router as connect_router router = Router(name="keys_main_router") @@ -11,4 +15,8 @@ router = Router(name="keys_main_router") router.include_routers( keys_router, management_router, + view_router, + renew_router, + freeze_router, + connect_router ) diff --git a/handlers/keys/key_connect.py b/handlers/keys/key_connect.py new file mode 100644 index 00000000..d6816342 --- /dev/null +++ b/handlers/keys/key_connect.py @@ -0,0 +1,237 @@ +import os +from io import BytesIO +from typing import Any + +import asyncpg +import qrcode + +from aiogram import F, Router, types + +from aiogram.types import CallbackQuery, InlineKeyboardButton +from aiogram.utils.keyboard import InlineKeyboardBuilder + +from config import ( + CONNECT_ANDROID, + CONNECT_IOS, + DATABASE_URL, + DOWNLOAD_ANDROID, + DOWNLOAD_IOS, + INSTRUCTIONS_BUTTON +) + +from handlers.buttons import ( + ANDROID, + BACK, + DOWNLOAD_ANDROID_BUTTON, + DOWNLOAD_IOS_BUTTON, + IMPORT_ANDROID, + IMPORT_IOS, + IPHONE, + MAIN_MENU, + MANUAL_INSTRUCTIONS, + PC, + TV, +) +from handlers.texts import ( + ANDROID_DESCRIPTION_TEMPLATE, + CHOOSE_DEVICE_TEXT, + IOS_DESCRIPTION_TEMPLATE, + SUBSCRIPTION_DESCRIPTION, +) +from handlers.utils import edit_or_send_message +from logger import logger + + +router = Router() + + +@router.callback_query(F.data.startswith("connect_device|")) +async def handle_connect_device(callback_query: CallbackQuery): + try: + key_name = callback_query.data.split("|")[1] + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=IPHONE, callback_data=f"connect_ios|{key_name}")) + builder.row(InlineKeyboardButton(text=ANDROID, callback_data=f"connect_android|{key_name}")) + builder.row(InlineKeyboardButton(text=PC, callback_data=f"connect_pc|{key_name}")) + builder.row(InlineKeyboardButton(text=TV, callback_data=f"connect_tv|{key_name}")) + # builder.row(InlineKeyboardButton(text=ROUTER, callback_data=f"connect_router|{key_name}")) + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) + + await edit_or_send_message( + target_message=callback_query.message, + text=CHOOSE_DEVICE_TEXT, + reply_markup=builder.as_markup(), + media_path=None, + ) + except Exception as e: + await callback_query.message.answer("❌ Ошибка при показе меню подключения.") + logger.error(f"Ошибка в handle_connect_device: {e}") + + +@router.callback_query(F.data.startswith("connect_phone|")) +async def process_callback_connect_phone(callback_query: CallbackQuery): + email = callback_query.data.split("|")[1] + + conn = None + try: + conn = await asyncpg.connect(DATABASE_URL) + key_data = await conn.fetchrow( + """ + SELECT key FROM keys WHERE email = $1 + """, + email, + ) + if not key_data: + await callback_query.message.answer("❌ Ошибка: ключ не найден.") + return + + key_link = key_data["key"] + + except Exception as e: + logger.error(f"Ошибка при получении ключа для {email}: {e}") + await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") + return + finally: + if conn: + await conn.close() + + description = SUBSCRIPTION_DESCRIPTION.format(key_link=key_link) + + builder = InlineKeyboardBuilder() + builder.row( + InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS), + InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID), + ) + builder.row( + InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key_link}"), + InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key_link}"), + ) + if INSTRUCTIONS_BUTTON: + builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) + + await edit_or_send_message( + target_message=callback_query.message, text=description, reply_markup=builder.as_markup(), media_path=None + ) + + +@router.callback_query(F.data.startswith("connect_ios|")) +async def process_callback_connect_ios(callback_query: CallbackQuery): + email = callback_query.data.split("|")[1] + + conn = None + try: + conn = await asyncpg.connect(DATABASE_URL) + key_data = await conn.fetchrow("SELECT key FROM keys WHERE email = $1", email) + if not key_data: + await callback_query.message.answer("❌ Ошибка: ключ не найден.") + return + + key_link = key_data["key"] + + except Exception as e: + logger.error(f"Ошибка при получении ключа для {email} (iOS): {e}") + await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") + return + finally: + if conn: + await conn.close() + + description = IOS_DESCRIPTION_TEMPLATE.format(key_link=key_link) + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS)) + builder.row(InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key_link}")) + if INSTRUCTIONS_BUTTON: + builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + await edit_or_send_message( + target_message=callback_query.message, + text=description, + reply_markup=builder.as_markup(), + media_path=None, + ) + + +@router.callback_query(F.data.startswith("connect_android|")) +async def process_callback_connect_android(callback_query: CallbackQuery): + email = callback_query.data.split("|")[1] + + conn = None + try: + conn = await asyncpg.connect(DATABASE_URL) + key_data = await conn.fetchrow("SELECT key FROM keys WHERE email = $1", email) + if not key_data: + await callback_query.message.answer("❌ Ошибка: ключ не найден.") + return + + key_link = key_data["key"] + + except Exception as e: + logger.error(f"Ошибка при получении ключа для {email} (Android): {e}") + await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") + return + finally: + if conn: + await conn.close() + + description = ANDROID_DESCRIPTION_TEMPLATE.format(key_link=key_link) + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID)) + builder.row(InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key_link}")) + if INSTRUCTIONS_BUTTON: + builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + await edit_or_send_message( + target_message=callback_query.message, + text=description, + reply_markup=builder.as_markup(), + media_path=None, + ) + + +@router.callback_query(F.data.startswith("show_qr|")) +async def show_qr_code(callback_query: types.CallbackQuery, session: Any): + try: + key_name = callback_query.data.split("|")[1] + + record = await session.fetchrow("SELECT key, email FROM keys WHERE email = $1", key_name) + if not record: + await callback_query.message.answer("❌ Подписка не найдена.") + return + + qr = qrcode.QRCode(version=1, box_size=10, border=4) + qr.add_data(record["key"]) + qr.make(fit=True) + + img = qr.make_image(fill_color="black", back_color="white") + buffer = BytesIO() + img.save(buffer, format="PNG") + buffer.seek(0) + + qr_path = f"/tmp/qrcode_{record['email']}.png" + with open(qr_path, "wb") as f: + f.write(buffer.read()) + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{record['email']}")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + await edit_or_send_message( + target_message=callback_query.message, + text="🔲 Ваш QR-код для подключения", + reply_markup=builder.as_markup(), + media_path=qr_path, + ) + + os.remove(qr_path) + + except Exception as e: + logger.error(f"Ошибка при генерации QR: {e}", exc_info=True) + await callback_query.message.answer("❌ Произошла ошибка при создании QR-кода.") \ No newline at end of file diff --git a/handlers/keys/key_freeze.py b/handlers/keys/key_freeze.py new file mode 100644 index 00000000..76c8fa5e --- /dev/null +++ b/handlers/keys/key_freeze.py @@ -0,0 +1,219 @@ +import time + +from typing import Any + +from aiogram import F, Router + +from aiogram.types import CallbackQuery, InlineKeyboardButton +from aiogram.utils.keyboard import InlineKeyboardBuilder + +from config import ( + TOTAL_GB, +) +from database import ( + get_key_details, +) +from handlers.buttons import ( + APPLY, + BACK, + CANCEL, +) +from handlers.keys.key_utils import ( + renew_key_in_cluster, + toggle_client_on_cluster, +) +from handlers.texts import ( + FREEZE_SUBSCRIPTION_CONFIRM_MSG, + SUBSCRIPTION_FROZEN_MSG, + SUBSCRIPTION_UNFROZEN_MSG, + UNFREEZE_SUBSCRIPTION_CONFIRM_MSG, +) +from handlers.utils import edit_or_send_message, handle_error + + +router = Router() + + +@router.callback_query(F.data.startswith("unfreeze_subscription|")) +async def process_callback_unfreeze_subscription(callback_query: CallbackQuery, session: Any): + key_name = callback_query.data.split("|")[1] + confirm_text = UNFREEZE_SUBSCRIPTION_CONFIRM_MSG + + builder = InlineKeyboardBuilder() + builder.row( + InlineKeyboardButton( + text=APPLY, + callback_data=f"unfreeze_subscription_confirm|{key_name}", + ), + InlineKeyboardButton( + text=CANCEL, + callback_data=f"view_key|{key_name}", + ), + ) + + await edit_or_send_message( + target_message=callback_query.message, + text=confirm_text, + reply_markup=builder.as_markup(), + ) + + +@router.callback_query(F.data.startswith("unfreeze_subscription_confirm|")) +async def process_callback_unfreeze_subscription_confirm(callback_query: CallbackQuery, session: Any): + """ + Размораживает (включает) подписку. + """ + tg_id = callback_query.message.chat.id + key_name = callback_query.data.split("|")[1] + + try: + record = await get_key_details(key_name, session) + if not record: + await callback_query.message.answer("Ключ не найден.") + return + + email = record["email"] + client_id = record["client_id"] + cluster_id = record["server_id"] + + result = await toggle_client_on_cluster(cluster_id, email, client_id, enable=True) + if result["status"] == "success": + now_ms = int(time.time() * 1000) + leftover = record["expiry_time"] + if leftover < 0: + leftover = 0 + + new_expiry_time = now_ms + leftover + await session.execute( + """ + UPDATE keys + SET expiry_time = $1, + is_frozen = FALSE + WHERE tg_id = $2 + AND client_id = $3 + """, + new_expiry_time, + record["tg_id"], + client_id, + ) + + await renew_key_in_cluster( + cluster_id=cluster_id, + email=email, + client_id=client_id, + new_expiry_time=new_expiry_time, + total_gb=TOTAL_GB, + ) + text_ok = SUBSCRIPTION_UNFROZEN_MSG + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) + await edit_or_send_message( + target_message=callback_query.message, + text=text_ok, + reply_markup=builder.as_markup(), + ) + else: + text_error = ( + f"Произошла ошибка при включении подписки.\nДетали: {result.get('error') or result.get('results')}" + ) + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) + await edit_or_send_message( + target_message=callback_query.message, + text=text_error, + reply_markup=builder.as_markup(), + ) + + except Exception as e: + await handle_error(tg_id, callback_query, f"Ошибка при включении подписки: {e}") + + +@router.callback_query(F.data.startswith("freeze_subscription|")) +async def process_callback_freeze_subscription(callback_query: CallbackQuery, session: Any): + """ + Показывает пользователю диалог подтверждения заморозки (отключения) подписки. + """ + key_name = callback_query.data.split("|")[1] + + confirm_text = FREEZE_SUBSCRIPTION_CONFIRM_MSG + + builder = InlineKeyboardBuilder() + builder.row( + InlineKeyboardButton( + text=APPLY, + callback_data=f"freeze_subscription_confirm|{key_name}", + ), + InlineKeyboardButton( + text=CANCEL, + callback_data=f"view_key|{key_name}", + ), + ) + + await edit_or_send_message( + target_message=callback_query.message, + text=confirm_text, + reply_markup=builder.as_markup(), + ) + + +@router.callback_query(F.data.startswith("freeze_subscription_confirm|")) +async def process_callback_freeze_subscription_confirm(callback_query: CallbackQuery, session: Any): + """ + Замораживает (отключает) подписку. + """ + tg_id = callback_query.message.chat.id + key_name = callback_query.data.split("|")[1] + + try: + record = await get_key_details(key_name, session) + if not record: + await callback_query.message.answer("Ключ не найден.") + return + + email = record["email"] + client_id = record["client_id"] + cluster_id = record["server_id"] + + result = await toggle_client_on_cluster(cluster_id, email, client_id, enable=False) + + if result["status"] == "success": + now_ms = int(time.time() * 1000) + time_left = record["expiry_time"] - now_ms + if time_left < 0: + time_left = 0 + + await session.execute( + """ + UPDATE keys + SET expiry_time = $1, + is_frozen = TRUE + WHERE tg_id = $2 + AND client_id = $3 + """, + time_left, + record["tg_id"], + client_id, + ) + + text_ok = SUBSCRIPTION_FROZEN_MSG + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) + await edit_or_send_message( + target_message=callback_query.message, + text=text_ok, + reply_markup=builder.as_markup(), + ) + else: + text_error = ( + f"Произошла ошибка при заморозке подписки.\nДетали: {result.get('error') or result.get('results')}" + ) + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) + await edit_or_send_message( + target_message=callback_query.message, + text=text_error, + reply_markup=builder.as_markup(), + ) + + except Exception as e: + await handle_error(tg_id, callback_query, f"Ошибка при заморозке подписки: {e}") \ No newline at end of file diff --git a/handlers/keys/key_renew.py b/handlers/keys/key_renew.py new file mode 100644 index 00000000..ad895e39 --- /dev/null +++ b/handlers/keys/key_renew.py @@ -0,0 +1,250 @@ +from datetime import datetime, timedelta +from typing import Any + +import asyncpg + +from aiogram import F, Router + +from aiogram.types import CallbackQuery, InlineKeyboardButton +from aiogram.utils.keyboard import InlineKeyboardBuilder + +from bot import bot +from config import ( + DATABASE_URL, + RENEWAL_PLANS, + TOTAL_GB, + USE_COUNTRY_SELECTION, + USE_NEW_PAYMENT_FLOW, +) +from database import ( + check_server_name_by_cluster, + create_temporary_data, + get_balance, + get_key_by_server, + get_key_details, + update_balance, + update_key_expiry, +) +from handlers.buttons import ( + BACK, + MAIN_MENU, + PAYMENT, +) +from handlers.keys.key_utils import ( + renew_key_in_cluster, +) +from handlers.payments.robokassa_pay import handle_custom_amount_input +from handlers.payments.yookassa_pay import process_custom_amount_input +from handlers.texts import ( + DISCOUNTS, + INSUFFICIENT_FUNDS_RENEWAL_MSG, + KEY_NOT_FOUND_MSG, + PLAN_SELECTION_MSG, + SUCCESS_RENEWAL_MSG, +) +from handlers.utils import edit_or_send_message +from logger import logger + + +router = Router() + + +@router.callback_query(F.data.startswith("renew_key|")) +async def process_callback_renew_key(callback_query: CallbackQuery, session: Any): + tg_id = callback_query.message.chat.id + key_name = callback_query.data.split("|")[1] + try: + record = await get_key_details(key_name, session) + if record: + client_id = record["client_id"] + expiry_time = record["expiry_time"] + + builder = InlineKeyboardBuilder() + + for plan_id, plan_details in RENEWAL_PLANS.items(): + months = plan_details["months"] + price = plan_details["price"] + + discount = DISCOUNTS.get(plan_id, 0) if isinstance(DISCOUNTS, dict) else 0 + + button_text = f"📅 {months} месяц{'а' if months > 1 else ''} ({price} руб.)" + if discount > 0: + button_text += f" {discount}% скидка" + + builder.row( + InlineKeyboardButton( + text=button_text, + callback_data=f"renew_plan|{months}|{client_id}", + ) + ) + + builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) + + balance = await get_balance(tg_id) + + response_message = PLAN_SELECTION_MSG.format( + balance=balance, + expiry_date=datetime.utcfromtimestamp(expiry_time / 1000).strftime("%Y-%m-%d %H:%M:%S"), + ) + + await edit_or_send_message( + target_message=callback_query.message, + text=response_message, + reply_markup=builder.as_markup(), + media_path=None, + ) + else: + await callback_query.message.answer("Ключ не найден.") + except Exception as e: + logger.error(f"Ошибка в process_callback_renew_key: {e}") + await callback_query.message.answer("❌ Произошла ошибка при обработке. Попробуйте позже.") + + +@router.callback_query(F.data.startswith("renew_plan|")) +async def process_callback_renew_plan(callback_query: CallbackQuery, session: Any): + tg_id = callback_query.message.chat.id + plan, client_id = callback_query.data.split("|")[1], callback_query.data.split("|")[2] + days_to_extend = 30 * int(plan) + + gb_multiplier = {"1": 1, "3": 3, "6": 6, "12": 12} + total_gb = TOTAL_GB * gb_multiplier.get(plan, 1) if TOTAL_GB > 0 else 0 + + try: + record = await get_key_by_server(tg_id, client_id, session) + + if record: + email = record["email"] + expiry_time = record["expiry_time"] + current_time = datetime.utcnow().timestamp() * 1000 + + if expiry_time <= current_time: + new_expiry_time = int(current_time + timedelta(days=days_to_extend).total_seconds() * 1000) + else: + new_expiry_time = int(expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000) + + cost = RENEWAL_PLANS[plan]["price"] + balance = await get_balance(tg_id) + + if balance < cost: + required_amount = cost - balance + + logger.info( + f"[RENEW] Пользователю {tg_id} не хватает {required_amount}₽. Запуск доплаты через {USE_NEW_PAYMENT_FLOW}" + ) + + await create_temporary_data( + session, + tg_id, + "waiting_for_renewal_payment", + { + "plan": plan, + "client_id": client_id, + "cost": cost, + "required_amount": required_amount, + "new_expiry_time": new_expiry_time, + "total_gb": total_gb, + "email": email, + }, + ) + + if USE_NEW_PAYMENT_FLOW == "YOOKASSA": + logger.info(f"[RENEW] Запуск оплаты через Юкассу для пользователя {tg_id}") + await process_custom_amount_input(callback_query, session) + elif USE_NEW_PAYMENT_FLOW == "ROBOKASSA": + logger.info(f"[RENEW] Запуск оплаты через Робокассу для пользователя {tg_id}") + await handle_custom_amount_input(callback_query, session) + else: + logger.info(f"[RENEW] Отправка сообщения о доплате пользователю {tg_id}") + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=PAYMENT, callback_data="pay")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + await edit_or_send_message( + target_message=callback_query.message, + text=INSUFFICIENT_FUNDS_RENEWAL_MSG.format(required_amount=required_amount), + reply_markup=builder.as_markup(), + media_path=None, + ) + return + + logger.info(f"[RENEW] Средств достаточно. Продление ключа для пользователя {tg_id}") + await complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan) + + else: + await callback_query.message.answer(KEY_NOT_FOUND_MSG) + logger.error(f"[RENEW] Ключ с client_id={client_id} не найден.") + except Exception as e: + logger.error(f"[RENEW] Ошибка при продлении ключа для пользователя {tg_id}: {e}") + + +async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan): + logger.info( + f"[RENEW] Начинаю процесс продления ключа с параметрами: " + f"tg_id={tg_id}, client_id={client_id}, email={email}, " + f"new_expiry_time={new_expiry_time}, total_gb={total_gb}, cost={cost}, " + f"callback_query={'есть' if callback_query else 'отсутствует'}, plan={plan}" + ) + + response_message = SUCCESS_RENEWAL_MSG.format(months=plan) + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + if callback_query: + try: + await edit_or_send_message( + target_message=callback_query.message, + text=response_message, + reply_markup=builder.as_markup(), + media_path=None, + ) + except Exception as e: + logger.error(f"Ошибка редактирования сообщения в complete_key_renewal: {e}") + await callback_query.message.answer(response_message, reply_markup=builder.as_markup()) + else: + await bot.send_message(tg_id, response_message, reply_markup=builder.as_markup()) + + conn = await asyncpg.connect(DATABASE_URL) + + logger.info(f"[RENEW] Получение данных о ключе для email: {email}") + key_info = await get_key_details(email, conn) + if not key_info: + logger.error(f"[RENEW] Ключ с client_id {client_id} для пользователя {tg_id} не найден.") + await conn.close() + return + + server_id = key_info["server_id"] + + if USE_COUNTRY_SELECTION: + logger.info(f"[RENEW] USE_COUNTRY_SELECTION включён. Проверяю информацию о сервере {server_id}") + cluster_info = await check_server_name_by_cluster(server_id, conn) + if not cluster_info: + logger.error(f"[RENEW] Сервер {server_id} не найден в таблице servers.") + await conn.close() + return + cluster_id = cluster_info["cluster_name"] + logger.info(f"[RENEW] Информация о сервере получена: {cluster_info}. Использую cluster_id: {cluster_id}") + else: + cluster_id = server_id + logger.info(f"[RENEW] USE_COUNTRY_SELECTION выключен. Использую server_id в качестве cluster_id: {cluster_id}") + + logger.info(f"[RENEW] Запуск продления ключа для пользователя {tg_id} на {plan} мес. в кластере {cluster_id}.") + + async def renew_key_on_cluster(): + logger.info( + f"[RENEW] Запуск renew_key_on_cluster с параметрами: " + f"cluster_id={cluster_id}, email={email}, client_id={client_id}, " + f"new_expiry_time={new_expiry_time}, total_gb={total_gb}" + ) + await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb) + logger.info("[RENEW] Продление ключа на сервере завершено. Обновляю срок действия в базе данных.") + await update_key_expiry(client_id, new_expiry_time, conn) + logger.info("[RENEW] Срок действия ключа обновлён. Обновляю баланс пользователя.") + await update_balance(tg_id, -cost, conn) + logger.info(f"[RENEW] Ключ {client_id} успешно продлён на {plan} мес. для пользователя {tg_id}.") + + logger.info("[RENEW] Инициализация процесса продления ключа в кластере.") + await renew_key_on_cluster() + + logger.info("[RENEW] Процесс продления ключа завершён. Закрываю соединение с базой данных.") + await conn.close() diff --git a/handlers/keys/key_view.py b/handlers/keys/key_view.py new file mode 100644 index 00000000..18e4accd --- /dev/null +++ b/handlers/keys/key_view.py @@ -0,0 +1,307 @@ +from aiogram import F, Router +from aiogram.types import CallbackQuery, Message, InlineKeyboardButton +from aiogram.utils.keyboard import InlineKeyboardBuilder +import pytz +import html +import os +import re +from datetime import datetime +from aiogram.fsm.state import State, StatesGroup +from typing import Any + +from aiogram.fsm.context import FSMContext + +from config import ( + CONNECT_PHONE_BUTTON, + ENABLE_DELETE_KEY_BUTTON, + ENABLE_UPDATE_SUBSCRIPTION_BUTTON, + PUBLIC_LINK, + QRCODE, + TOGGLE_CLIENT, + USE_COUNTRY_SELECTION, +) +from database import ( + get_key_details, + get_keys, +) +from handlers.buttons import ( + ADD_SUB, + ALIAS, + BACK, + CHANGE_LOCATION, + CONNECT_DEVICE, + CONNECT_PHONE, + DELETE, + FREEZE, + MAIN_MENU, + PC_BUTTON, + QR, + RENEW, + RENEW_FULL, + TV_BUTTON, + UNFREEZE, +) +from handlers.texts import ( + FROZEN_SUBSCRIPTION_MSG, + NO_SUBSCRIPTIONS_MSG, + key_message, +) +from handlers.utils import edit_or_send_message, handle_error +from logger import logger + + +router = Router() + +class RenameKeyState(StatesGroup): + waiting_for_new_alias = State() + + +@router.callback_query(F.data == "view_keys") +@router.message(F.text == "/subs") +async def process_callback_or_message_view_keys(callback_query_or_message: Message | CallbackQuery, session: Any): + if isinstance(callback_query_or_message, CallbackQuery): + target_message = callback_query_or_message.message + else: + target_message = callback_query_or_message + + try: + records = await get_keys(target_message.chat.id, session) + inline_keyboard, response_message = build_keys_response(records) + image_path = os.path.join("img", "pic_keys.jpg") + + await edit_or_send_message( + target_message=target_message, text=response_message, reply_markup=inline_keyboard, media_path=image_path + ) + except Exception as e: + error_message = f"Ошибка при получении ключей: {e}" + await target_message.answer(text=error_message) + + +def build_keys_response(records): + """ + Формирует сообщение и клавиатуру для устройств с указанием срока действия подписки. + """ + builder = InlineKeyboardBuilder() + moscow_tz = pytz.timezone("Europe/Moscow") + + if records: + response_message = "🔑 Список ваших подписок:\n\n
" + for record in records: + alias = record.get("alias") + email = record["email"] + client_id = record["client_id"] + expiry_time = record.get("expiry_time") + + key_display = html.escape(alias.strip() if alias else email) + + if expiry_time: + expiry_date_full = datetime.fromtimestamp(expiry_time / 1000, tz=moscow_tz) + formatted_date_full = expiry_date_full.strftime("до %d.%m.%y, %H:%M") + else: + formatted_date_full = "без срока действия" + + key_button = InlineKeyboardButton(text=f"🔑 {key_display}", callback_data=f"view_key|{email}") + rename_button = InlineKeyboardButton(text=ALIAS, callback_data=f"rename_key|{client_id}") + builder.row(key_button, rename_button) + + response_message += f"• {key_display} ({formatted_date_full})\n" + + response_message += "
\n\nНажмите на ✏️, чтобы переименовать подписку." + else: + response_message = NO_SUBSCRIPTIONS_MSG + + builder.row(InlineKeyboardButton(text=ADD_SUB, callback_data="create_key")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + inline_keyboard = builder.as_markup() + return inline_keyboard, response_message + + +@router.callback_query(F.data.startswith("rename_key|")) +async def handle_rename_key(callback: CallbackQuery, state: FSMContext): + client_id = callback.data.split("|")[1] + await state.set_state(RenameKeyState.waiting_for_new_alias) + await state.update_data(client_id=client_id, target_message=callback.message) + + builder = InlineKeyboardBuilder() + builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) + + await edit_or_send_message( + target_message=callback.message, + text="✏️ Введите новое имя подписки (до 10 символов):", + reply_markup=builder.as_markup() + ) + + +@router.message(F.text, RenameKeyState.waiting_for_new_alias) +async def handle_new_alias_input(message: Message, state: FSMContext, session: Any): + alias = message.text.strip() + + if len(alias) > 10: + await message.answer("❌ Имя слишком длинное. Введите до 10 символов.\nПовторите ввод.") + return + + if not alias or not re.match(r"^[a-zA-Zа-яА-ЯёЁ0-9@._-]+$", alias): + await message.answer("❌ Введены недопустимые символы или имя пустое. Используйте только буквы, цифры и @._-\nПовторите ввод.") + return + + data = await state.get_data() + client_id = data.get("client_id") + + try: + await session.execute( + "UPDATE keys SET alias = $1 WHERE tg_id = $2 AND client_id = $3", + alias, + message.chat.id, + client_id, + ) + except Exception as e: + await message.answer("❌ Не удалось переименовать подписку.") + logger.error(f"Ошибка при обновлении alias: {e}") + finally: + await state.clear() + + await process_callback_or_message_view_keys(message, session) + + +@router.callback_query(F.data.startswith("view_key|")) +async def process_callback_view_key(callback_query: CallbackQuery, session: Any): + tg_id = callback_query.message.chat.id + key_name = callback_query.data.split("|")[1] + try: + record = await get_key_details(key_name, session) + if record: + is_frozen = record["is_frozen"] + + if is_frozen: + response_message = FROZEN_SUBSCRIPTION_MSG + + builder = InlineKeyboardBuilder() + builder.row( + InlineKeyboardButton( + text=UNFREEZE, + callback_data=f"unfreeze_subscription|{key_name}", + ) + ) + builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + keyboard = builder.as_markup() + image_path = os.path.join("img", "pic_view.jpg") + + if not os.path.isfile(image_path): + await callback_query.message.answer("Файл изображения не найден.") + return + + await edit_or_send_message( + target_message=callback_query.message, + text=response_message, + reply_markup=keyboard, + media_path=image_path, + ) + + else: + key = record["key"] + expiry_time = record["expiry_time"] + server_name = record["server_id"] + country = server_name + expiry_date = datetime.utcfromtimestamp(expiry_time / 1000) + current_date = datetime.utcnow() + time_left = expiry_date - current_date + + if time_left.total_seconds() <= 0: + days_left_message = "🕒 Статус подписки:\n🔴 Истекла\nОсталось часов: 0\nОсталось минут: 0" + else: + total_seconds = int(time_left.total_seconds()) + days = total_seconds // 86400 + hours = (total_seconds % 86400) // 3600 + minutes = (total_seconds % 3600) // 60 + days_left_message = f"Осталось: {days} дней, {hours} часов, {minutes} минут" + + formatted_expiry_date = expiry_date.strftime("%d %B %Y года") + response_message = key_message( + key, + formatted_expiry_date, + days_left_message, + server_name, + country if USE_COUNTRY_SELECTION else None, + ) + + builder = InlineKeyboardBuilder() + + if not key.startswith(PUBLIC_LINK) or ENABLE_UPDATE_SUBSCRIPTION_BUTTON: + builder.row( + InlineKeyboardButton( + text="🔄 Обновить подписку", + callback_data=f"update_subscription|{key_name}", + ) + ) + + if CONNECT_PHONE_BUTTON: + builder.row( + InlineKeyboardButton( + text=CONNECT_PHONE, + callback_data=f"connect_phone|{key_name}", + ) + ) + builder.row( + InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{key_name}"), + InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{key_name}"), + ) + else: + builder.row( + InlineKeyboardButton( + text=CONNECT_DEVICE, + callback_data=f"connect_device|{key_name}", + ) + ) + if QRCODE: + builder.row( + InlineKeyboardButton( + text=QR, + callback_data=f"show_qr|{key_name}", + ) + ) + if ENABLE_DELETE_KEY_BUTTON: + builder.row( + InlineKeyboardButton(text=RENEW, callback_data=f"renew_key|{key_name}"), + InlineKeyboardButton(text=DELETE, callback_data=f"delete_key|{key_name}"), + ) + else: + builder.row(InlineKeyboardButton(text=RENEW_FULL, callback_data=f"renew_key|{key_name}")) + + if USE_COUNTRY_SELECTION: + builder.row(InlineKeyboardButton(text=CHANGE_LOCATION, callback_data=f"change_location|{key_name}")) + + if TOGGLE_CLIENT: + builder.row( + InlineKeyboardButton( + text=FREEZE, + callback_data=f"freeze_subscription|{key_name}", + ) + ) + + builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) + builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) + + keyboard = builder.as_markup() + image_path = os.path.join("img", "pic_view.jpg") + + if not os.path.isfile(image_path): + await callback_query.message.answer("Файл изображения не найден.") + return + + await edit_or_send_message( + target_message=callback_query.message, + text=response_message, + reply_markup=keyboard, + media_path=image_path, + ) + else: + await callback_query.message.answer(text="Информация о подписке не найдена.") + except Exception as e: + await handle_error( + tg_id, + callback_query, + f"Ошибка при получении информации о ключе: {e}", + ) \ No newline at end of file diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 06cdceec..dabbcfa7 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -1,754 +1,38 @@ import asyncio -import html -import locale -import os -import time -import re -from datetime import datetime, timedelta -from io import BytesIO from typing import Any -import asyncpg -import pytz -import qrcode - from aiogram import F, Router, types from aiogram.exceptions import TelegramBadRequest -from aiogram.fsm.context import FSMContext -from aiogram.fsm.state import State, StatesGroup -from aiogram.types import CallbackQuery, InlineKeyboardButton, Message -from aiogram.utils.keyboard import InlineKeyboardBuilder -from bot import bot -from config import ( - CONNECT_ANDROID, - CONNECT_IOS, - CONNECT_PHONE_BUTTON, - DATABASE_URL, - DOWNLOAD_ANDROID, - DOWNLOAD_IOS, - ENABLE_DELETE_KEY_BUTTON, - ENABLE_UPDATE_SUBSCRIPTION_BUTTON, - PUBLIC_LINK, - QRCODE, - RENEWAL_PLANS, - TOGGLE_CLIENT, - TOTAL_GB, - USE_COUNTRY_SELECTION, - USE_NEW_PAYMENT_FLOW, - INSTRUCTIONS_BUTTON -) +from aiogram.types import CallbackQuery + from database import ( - check_server_name_by_cluster, - create_temporary_data, delete_key, - get_balance, - get_key_by_server, get_key_details, - get_keys, get_servers, - update_balance, - update_key_expiry, ) from handlers.buttons import ( - ADD_SUB, - ALIAS, - ANDROID, APPLY, BACK, CANCEL, - CHANGE_LOCATION, - CONNECT_DEVICE, - CONNECT_PHONE, - DELETE, - DOWNLOAD_ANDROID_BUTTON, - DOWNLOAD_IOS_BUTTON, - FREEZE, - IMPORT_ANDROID, - IMPORT_IOS, - IPHONE, - MAIN_MENU, - MANUAL_INSTRUCTIONS, - PAYMENT, - PC, - PC_BUTTON, - QR, - RENEW, - RENEW_FULL, - TV, - TV_BUTTON, - UNFREEZE, ) +from handlers.keys.key_view import process_callback_view_key from handlers.keys.key_utils import ( delete_key_from_cluster, - renew_key_in_cluster, - toggle_client_on_cluster, update_subscription, ) -from handlers.payments.robokassa_pay import handle_custom_amount_input -from handlers.payments.yookassa_pay import process_custom_amount_input from handlers.texts import ( - ANDROID_DESCRIPTION_TEMPLATE, - CHOOSE_DEVICE_TEXT, DELETE_KEY_CONFIRM_MSG, - DISCOUNTS, - FREEZE_SUBSCRIPTION_CONFIRM_MSG, - FROZEN_SUBSCRIPTION_MSG, - INSUFFICIENT_FUNDS_RENEWAL_MSG, - IOS_DESCRIPTION_TEMPLATE, KEY_DELETED_MSG_SIMPLE, - KEY_NOT_FOUND_MSG, - NO_SUBSCRIPTIONS_MSG, - PLAN_SELECTION_MSG, - SUBSCRIPTION_DESCRIPTION, - SUBSCRIPTION_FROZEN_MSG, - SUBSCRIPTION_UNFROZEN_MSG, - SUCCESS_RENEWAL_MSG, - UNFREEZE_SUBSCRIPTION_CONFIRM_MSG, - key_message, ) from handlers.utils import edit_or_send_message, handle_error from logger import logger -locale.setlocale(locale.LC_TIME, "ru_RU.UTF-8") - router = Router() -class RenameKeyState(StatesGroup): - waiting_for_new_alias = State() - - -@router.callback_query(F.data == "view_keys") -@router.message(F.text == "/subs") -async def process_callback_or_message_view_keys(callback_query_or_message: Message | CallbackQuery, session: Any): - if isinstance(callback_query_or_message, CallbackQuery): - target_message = callback_query_or_message.message - else: - target_message = callback_query_or_message - - try: - records = await get_keys(target_message.chat.id, session) - inline_keyboard, response_message = build_keys_response(records) - image_path = os.path.join("img", "pic_keys.jpg") - - await edit_or_send_message( - target_message=target_message, text=response_message, reply_markup=inline_keyboard, media_path=image_path - ) - except Exception as e: - error_message = f"Ошибка при получении ключей: {e}" - await target_message.answer(text=error_message) - - -def build_keys_response(records): - """ - Формирует сообщение и клавиатуру для устройств с указанием срока действия подписки. - """ - builder = InlineKeyboardBuilder() - moscow_tz = pytz.timezone("Europe/Moscow") - - if records: - response_message = "🔑 Список ваших подписок:\n\n
" - for record in records: - alias = record.get("alias") - email = record["email"] - client_id = record["client_id"] - expiry_time = record.get("expiry_time") - - key_display = html.escape(alias.strip() if alias else email) - - if expiry_time: - expiry_date_full = datetime.fromtimestamp(expiry_time / 1000, tz=moscow_tz) - formatted_date_full = expiry_date_full.strftime("до %d.%m.%y, %H:%M") - else: - formatted_date_full = "без срока действия" - - key_button = InlineKeyboardButton(text=f"🔑 {key_display}", callback_data=f"view_key|{email}") - rename_button = InlineKeyboardButton(text=ALIAS, callback_data=f"rename_key|{client_id}") - builder.row(key_button, rename_button) - - response_message += f"• {key_display} ({formatted_date_full})\n" - - response_message += "
\n\nНажмите на ✏️, чтобы переименовать подписку." - else: - response_message = NO_SUBSCRIPTIONS_MSG - - builder.row(InlineKeyboardButton(text=ADD_SUB, callback_data="create_key")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - inline_keyboard = builder.as_markup() - return inline_keyboard, response_message - - -@router.callback_query(F.data.startswith("rename_key|")) -async def handle_rename_key(callback: CallbackQuery, state: FSMContext): - client_id = callback.data.split("|")[1] - await state.set_state(RenameKeyState.waiting_for_new_alias) - await state.update_data(client_id=client_id, target_message=callback.message) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) - - await edit_or_send_message( - target_message=callback.message, - text="✏️ Введите новое имя подписки (до 10 символов):", - reply_markup=builder.as_markup() - ) - - -@router.message(F.text, RenameKeyState.waiting_for_new_alias) -async def handle_new_alias_input(message: Message, state: FSMContext, session: Any): - alias = message.text.strip() - - if len(alias) > 10: - await message.answer("❌ Имя слишком длинное. Введите до 10 символов.\nПовторите ввод.") - return - - if not alias or not re.match(r"^[a-zA-Zа-яА-ЯёЁ0-9@._-]+$", alias): - await message.answer("❌ Введены недопустимые символы или имя пустое. Используйте только буквы, цифры и @._-\nПовторите ввод.") - return - - data = await state.get_data() - client_id = data.get("client_id") - - try: - await session.execute( - "UPDATE keys SET alias = $1 WHERE tg_id = $2 AND client_id = $3", - alias, - message.chat.id, - client_id, - ) - except Exception as e: - await message.answer("❌ Не удалось переименовать подписку.") - logger.error(f"Ошибка при обновлении alias: {e}") - finally: - await state.clear() - - await process_callback_or_message_view_keys(message, session) - - -@router.callback_query(F.data.startswith("view_key|")) -async def process_callback_view_key(callback_query: CallbackQuery, session: Any): - tg_id = callback_query.message.chat.id - key_name = callback_query.data.split("|")[1] - try: - record = await get_key_details(key_name, session) - if record: - is_frozen = record["is_frozen"] - - if is_frozen: - response_message = FROZEN_SUBSCRIPTION_MSG - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton( - text=UNFREEZE, - callback_data=f"unfreeze_subscription|{key_name}", - ) - ) - builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - keyboard = builder.as_markup() - image_path = os.path.join("img", "pic_view.jpg") - - if not os.path.isfile(image_path): - await callback_query.message.answer("Файл изображения не найден.") - return - - await edit_or_send_message( - target_message=callback_query.message, - text=response_message, - reply_markup=keyboard, - media_path=image_path, - ) - - else: - key = record["key"] - expiry_time = record["expiry_time"] - server_name = record["server_id"] - country = server_name - expiry_date = datetime.utcfromtimestamp(expiry_time / 1000) - current_date = datetime.utcnow() - time_left = expiry_date - current_date - - if time_left.total_seconds() <= 0: - days_left_message = "🕒 Статус подписки:\n🔴 Истекла\nОсталось часов: 0\nОсталось минут: 0" - else: - total_seconds = int(time_left.total_seconds()) - days = total_seconds // 86400 - hours = (total_seconds % 86400) // 3600 - minutes = (total_seconds % 3600) // 60 - days_left_message = f"Осталось: {days} дней, {hours} часов, {minutes} минут" - - formatted_expiry_date = expiry_date.strftime("%d %B %Y года") - response_message = key_message( - key, - formatted_expiry_date, - days_left_message, - server_name, - country if USE_COUNTRY_SELECTION else None, - ) - - builder = InlineKeyboardBuilder() - - if not key.startswith(PUBLIC_LINK) or ENABLE_UPDATE_SUBSCRIPTION_BUTTON: - builder.row( - InlineKeyboardButton( - text="🔄 Обновить подписку", - callback_data=f"update_subscription|{key_name}", - ) - ) - - if CONNECT_PHONE_BUTTON: - builder.row( - InlineKeyboardButton( - text=CONNECT_PHONE, - callback_data=f"connect_phone|{key_name}", - ) - ) - builder.row( - InlineKeyboardButton(text=PC_BUTTON, callback_data=f"connect_pc|{key_name}"), - InlineKeyboardButton(text=TV_BUTTON, callback_data=f"connect_tv|{key_name}"), - ) - else: - builder.row( - InlineKeyboardButton( - text=CONNECT_DEVICE, - callback_data=f"connect_device|{key_name}", - ) - ) - if QRCODE: - builder.row( - InlineKeyboardButton( - text=QR, - callback_data=f"show_qr|{key_name}", - ) - ) - if ENABLE_DELETE_KEY_BUTTON: - builder.row( - InlineKeyboardButton(text=RENEW, callback_data=f"renew_key|{key_name}"), - InlineKeyboardButton(text=DELETE, callback_data=f"delete_key|{key_name}"), - ) - else: - builder.row(InlineKeyboardButton(text=RENEW_FULL, callback_data=f"renew_key|{key_name}")) - - if USE_COUNTRY_SELECTION: - builder.row(InlineKeyboardButton(text=CHANGE_LOCATION, callback_data=f"change_location|{key_name}")) - - if TOGGLE_CLIENT: - builder.row( - InlineKeyboardButton( - text=FREEZE, - callback_data=f"freeze_subscription|{key_name}", - ) - ) - - builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - keyboard = builder.as_markup() - image_path = os.path.join("img", "pic_view.jpg") - - if not os.path.isfile(image_path): - await callback_query.message.answer("Файл изображения не найден.") - return - - await edit_or_send_message( - target_message=callback_query.message, - text=response_message, - reply_markup=keyboard, - media_path=image_path, - ) - else: - await callback_query.message.answer(text="Информация о подписке не найдена.") - except Exception as e: - await handle_error( - tg_id, - callback_query, - f"Ошибка при получении информации о ключе: {e}", - ) - - -@router.callback_query(F.data.startswith("show_qr|")) -async def show_qr_code(callback_query: types.CallbackQuery, session: Any): - try: - key_name = callback_query.data.split("|")[1] - - record = await session.fetchrow("SELECT key, email FROM keys WHERE email = $1", key_name) - if not record: - await callback_query.message.answer("❌ Подписка не найдена.") - return - - qr = qrcode.QRCode(version=1, box_size=10, border=4) - qr.add_data(record["key"]) - qr.make(fit=True) - - img = qr.make_image(fill_color="black", back_color="white") - buffer = BytesIO() - img.save(buffer, format="PNG") - buffer.seek(0) - - qr_path = f"/tmp/qrcode_{record['email']}.png" - with open(qr_path, "wb") as f: - f.write(buffer.read()) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{record['email']}")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - await edit_or_send_message( - target_message=callback_query.message, - text="🔲 Ваш QR-код для подключения", - reply_markup=builder.as_markup(), - media_path=qr_path, - ) - - os.remove(qr_path) - - except Exception as e: - logger.error(f"Ошибка при генерации QR: {e}", exc_info=True) - await callback_query.message.answer("❌ Произошла ошибка при создании QR-кода.") - - -@router.callback_query(F.data.startswith("connect_device|")) -async def handle_connect_device(callback_query: CallbackQuery): - try: - key_name = callback_query.data.split("|")[1] - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=IPHONE, callback_data=f"connect_ios|{key_name}")) - builder.row(InlineKeyboardButton(text=ANDROID, callback_data=f"connect_android|{key_name}")) - builder.row(InlineKeyboardButton(text=PC, callback_data=f"connect_pc|{key_name}")) - builder.row(InlineKeyboardButton(text=TV, callback_data=f"connect_tv|{key_name}")) - # builder.row(InlineKeyboardButton(text=ROUTER, callback_data=f"connect_router|{key_name}")) - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) - - await edit_or_send_message( - target_message=callback_query.message, - text=CHOOSE_DEVICE_TEXT, - reply_markup=builder.as_markup(), - media_path=None, - ) - except Exception as e: - await callback_query.message.answer("❌ Ошибка при показе меню подключения.") - logger.error(f"Ошибка в handle_connect_device: {e}") - - -@router.callback_query(F.data.startswith("unfreeze_subscription|")) -async def process_callback_unfreeze_subscription(callback_query: CallbackQuery, session: Any): - key_name = callback_query.data.split("|")[1] - confirm_text = UNFREEZE_SUBSCRIPTION_CONFIRM_MSG - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton( - text=APPLY, - callback_data=f"unfreeze_subscription_confirm|{key_name}", - ), - InlineKeyboardButton( - text=CANCEL, - callback_data=f"view_key|{key_name}", - ), - ) - - await edit_or_send_message( - target_message=callback_query.message, - text=confirm_text, - reply_markup=builder.as_markup(), - ) - - -@router.callback_query(F.data.startswith("unfreeze_subscription_confirm|")) -async def process_callback_unfreeze_subscription_confirm(callback_query: CallbackQuery, session: Any): - """ - Размораживает (включает) подписку. - """ - tg_id = callback_query.message.chat.id - key_name = callback_query.data.split("|")[1] - - try: - record = await get_key_details(key_name, session) - if not record: - await callback_query.message.answer("Ключ не найден.") - return - - email = record["email"] - client_id = record["client_id"] - cluster_id = record["server_id"] - - result = await toggle_client_on_cluster(cluster_id, email, client_id, enable=True) - if result["status"] == "success": - now_ms = int(time.time() * 1000) - leftover = record["expiry_time"] - if leftover < 0: - leftover = 0 - - new_expiry_time = now_ms + leftover - await session.execute( - """ - UPDATE keys - SET expiry_time = $1, - is_frozen = FALSE - WHERE tg_id = $2 - AND client_id = $3 - """, - new_expiry_time, - record["tg_id"], - client_id, - ) - - await renew_key_in_cluster( - cluster_id=cluster_id, - email=email, - client_id=client_id, - new_expiry_time=new_expiry_time, - total_gb=TOTAL_GB, - ) - text_ok = SUBSCRIPTION_UNFROZEN_MSG - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) - await edit_or_send_message( - target_message=callback_query.message, - text=text_ok, - reply_markup=builder.as_markup(), - ) - else: - text_error = ( - f"Произошла ошибка при включении подписки.\nДетали: {result.get('error') or result.get('results')}" - ) - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) - await edit_or_send_message( - target_message=callback_query.message, - text=text_error, - reply_markup=builder.as_markup(), - ) - - except Exception as e: - await handle_error(tg_id, callback_query, f"Ошибка при включении подписки: {e}") - - -@router.callback_query(F.data.startswith("freeze_subscription|")) -async def process_callback_freeze_subscription(callback_query: CallbackQuery, session: Any): - """ - Показывает пользователю диалог подтверждения заморозки (отключения) подписки. - """ - key_name = callback_query.data.split("|")[1] - - confirm_text = FREEZE_SUBSCRIPTION_CONFIRM_MSG - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton( - text=APPLY, - callback_data=f"freeze_subscription_confirm|{key_name}", - ), - InlineKeyboardButton( - text=CANCEL, - callback_data=f"view_key|{key_name}", - ), - ) - - await edit_or_send_message( - target_message=callback_query.message, - text=confirm_text, - reply_markup=builder.as_markup(), - ) - - -@router.callback_query(F.data.startswith("freeze_subscription_confirm|")) -async def process_callback_freeze_subscription_confirm(callback_query: CallbackQuery, session: Any): - """ - Замораживает (отключает) подписку. - """ - tg_id = callback_query.message.chat.id - key_name = callback_query.data.split("|")[1] - - try: - record = await get_key_details(key_name, session) - if not record: - await callback_query.message.answer("Ключ не найден.") - return - - email = record["email"] - client_id = record["client_id"] - cluster_id = record["server_id"] - - result = await toggle_client_on_cluster(cluster_id, email, client_id, enable=False) - - if result["status"] == "success": - now_ms = int(time.time() * 1000) - time_left = record["expiry_time"] - now_ms - if time_left < 0: - time_left = 0 - - await session.execute( - """ - UPDATE keys - SET expiry_time = $1, - is_frozen = TRUE - WHERE tg_id = $2 - AND client_id = $3 - """, - time_left, - record["tg_id"], - client_id, - ) - - text_ok = SUBSCRIPTION_FROZEN_MSG - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) - await edit_or_send_message( - target_message=callback_query.message, - text=text_ok, - reply_markup=builder.as_markup(), - ) - else: - text_error = ( - f"Произошла ошибка при заморозке подписки.\nДетали: {result.get('error') or result.get('results')}" - ) - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{key_name}")) - await edit_or_send_message( - target_message=callback_query.message, - text=text_error, - reply_markup=builder.as_markup(), - ) - - except Exception as e: - await handle_error(tg_id, callback_query, f"Ошибка при заморозке подписки: {e}") - - -@router.callback_query(F.data.startswith("connect_phone|")) -async def process_callback_connect_phone(callback_query: CallbackQuery): - email = callback_query.data.split("|")[1] - - conn = None - try: - conn = await asyncpg.connect(DATABASE_URL) - key_data = await conn.fetchrow( - """ - SELECT key FROM keys WHERE email = $1 - """, - email, - ) - if not key_data: - await callback_query.message.answer("❌ Ошибка: ключ не найден.") - return - - key_link = key_data["key"] - - except Exception as e: - logger.error(f"Ошибка при получении ключа для {email}: {e}") - await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") - return - finally: - if conn: - await conn.close() - - description = SUBSCRIPTION_DESCRIPTION.format(key_link=key_link) - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS), - InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID), - ) - builder.row( - InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key_link}"), - InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key_link}"), - ) - if INSTRUCTIONS_BUTTON: - builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) - - await edit_or_send_message( - target_message=callback_query.message, text=description, reply_markup=builder.as_markup(), media_path=None - ) - - -@router.callback_query(F.data.startswith("connect_ios|")) -async def process_callback_connect_ios(callback_query: CallbackQuery): - email = callback_query.data.split("|")[1] - - conn = None - try: - conn = await asyncpg.connect(DATABASE_URL) - key_data = await conn.fetchrow("SELECT key FROM keys WHERE email = $1", email) - if not key_data: - await callback_query.message.answer("❌ Ошибка: ключ не найден.") - return - - key_link = key_data["key"] - - except Exception as e: - logger.error(f"Ошибка при получении ключа для {email} (iOS): {e}") - await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") - return - finally: - if conn: - await conn.close() - - description = IOS_DESCRIPTION_TEMPLATE.format(key_link=key_link) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=DOWNLOAD_IOS_BUTTON, url=DOWNLOAD_IOS)) - builder.row(InlineKeyboardButton(text=IMPORT_IOS, url=f"{CONNECT_IOS}{key_link}")) - if INSTRUCTIONS_BUTTON: - builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - await edit_or_send_message( - target_message=callback_query.message, - text=description, - reply_markup=builder.as_markup(), - media_path=None, - ) - - -@router.callback_query(F.data.startswith("connect_android|")) -async def process_callback_connect_android(callback_query: CallbackQuery): - email = callback_query.data.split("|")[1] - - conn = None - try: - conn = await asyncpg.connect(DATABASE_URL) - key_data = await conn.fetchrow("SELECT key FROM keys WHERE email = $1", email) - if not key_data: - await callback_query.message.answer("❌ Ошибка: ключ не найден.") - return - - key_link = key_data["key"] - - except Exception as e: - logger.error(f"Ошибка при получении ключа для {email} (Android): {e}") - await callback_query.message.answer("❌ Произошла ошибка. Попробуйте позже.") - return - finally: - if conn: - await conn.close() - - description = ANDROID_DESCRIPTION_TEMPLATE.format(key_link=key_link) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=DOWNLOAD_ANDROID_BUTTON, url=DOWNLOAD_ANDROID)) - builder.row(InlineKeyboardButton(text=IMPORT_ANDROID, url=f"{CONNECT_ANDROID}{key_link}")) - if INSTRUCTIONS_BUTTON: - builder.row(InlineKeyboardButton(text=MANUAL_INSTRUCTIONS, callback_data="instructions")) - builder.row(InlineKeyboardButton(text=BACK, callback_data=f"view_key|{email}")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - await edit_or_send_message( - target_message=callback_query.message, - text=description, - reply_markup=builder.as_markup(), - media_path=None, - ) - - @router.callback_query(F.data.startswith("update_subscription|")) async def process_callback_update_subscription(callback_query: CallbackQuery, session: Any): tg_id = callback_query.message.chat.id @@ -815,7 +99,7 @@ async def process_callback_confirm_delete(callback_query: CallbackQuery, session servers = await get_servers(session) async def delete_key_from_servers(): - try: # lol + try: tasks = [] for cluster_id, _cluster in servers.items(): tasks.append(delete_key_from_cluster(cluster_id, email, client_id)) @@ -835,204 +119,3 @@ async def process_callback_confirm_delete(callback_query: CallbackQuery, session ) except Exception as e: logger.error(e) - - -@router.callback_query(F.data.startswith("renew_key|")) -async def process_callback_renew_key(callback_query: CallbackQuery, session: Any): - tg_id = callback_query.message.chat.id - key_name = callback_query.data.split("|")[1] - try: - record = await get_key_details(key_name, session) - if record: - client_id = record["client_id"] - expiry_time = record["expiry_time"] - - builder = InlineKeyboardBuilder() - - for plan_id, plan_details in RENEWAL_PLANS.items(): - months = plan_details["months"] - price = plan_details["price"] - - discount = DISCOUNTS.get(plan_id, 0) if isinstance(DISCOUNTS, dict) else 0 - - button_text = f"📅 {months} месяц{'а' if months > 1 else ''} ({price} руб.)" - if discount > 0: - button_text += f" {discount}% скидка" - - builder.row( - InlineKeyboardButton( - text=button_text, - callback_data=f"renew_plan|{months}|{client_id}", - ) - ) - - builder.row(InlineKeyboardButton(text=BACK, callback_data="view_keys")) - - balance = await get_balance(tg_id) - - response_message = PLAN_SELECTION_MSG.format( - balance=balance, - expiry_date=datetime.utcfromtimestamp(expiry_time / 1000).strftime("%Y-%m-%d %H:%M:%S"), - ) - - await edit_or_send_message( - target_message=callback_query.message, - text=response_message, - reply_markup=builder.as_markup(), - media_path=None, - ) - else: - await callback_query.message.answer("Ключ не найден.") - except Exception as e: - logger.error(f"Ошибка в process_callback_renew_key: {e}") - await callback_query.message.answer("❌ Произошла ошибка при обработке. Попробуйте позже.") - - -@router.callback_query(F.data.startswith("renew_plan|")) -async def process_callback_renew_plan(callback_query: CallbackQuery, session: Any): - tg_id = callback_query.message.chat.id - plan, client_id = callback_query.data.split("|")[1], callback_query.data.split("|")[2] - days_to_extend = 30 * int(plan) - - gb_multiplier = {"1": 1, "3": 3, "6": 6, "12": 12} - total_gb = TOTAL_GB * gb_multiplier.get(plan, 1) if TOTAL_GB > 0 else 0 - - try: - record = await get_key_by_server(tg_id, client_id, session) - - if record: - email = record["email"] - expiry_time = record["expiry_time"] - current_time = datetime.utcnow().timestamp() * 1000 - - if expiry_time <= current_time: - new_expiry_time = int(current_time + timedelta(days=days_to_extend).total_seconds() * 1000) - else: - new_expiry_time = int(expiry_time + timedelta(days=days_to_extend).total_seconds() * 1000) - - cost = RENEWAL_PLANS[plan]["price"] - balance = await get_balance(tg_id) - - if balance < cost: - required_amount = cost - balance - - logger.info( - f"[RENEW] Пользователю {tg_id} не хватает {required_amount}₽. Запуск доплаты через {USE_NEW_PAYMENT_FLOW}" - ) - - await create_temporary_data( - session, - tg_id, - "waiting_for_renewal_payment", - { - "plan": plan, - "client_id": client_id, - "cost": cost, - "required_amount": required_amount, - "new_expiry_time": new_expiry_time, - "total_gb": total_gb, - "email": email, - }, - ) - - if USE_NEW_PAYMENT_FLOW == "YOOKASSA": - logger.info(f"[RENEW] Запуск оплаты через Юкассу для пользователя {tg_id}") - await process_custom_amount_input(callback_query, session) - elif USE_NEW_PAYMENT_FLOW == "ROBOKASSA": - logger.info(f"[RENEW] Запуск оплаты через Робокассу для пользователя {tg_id}") - await handle_custom_amount_input(callback_query, session) - else: - logger.info(f"[RENEW] Отправка сообщения о доплате пользователю {tg_id}") - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=PAYMENT, callback_data="pay")) - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - await edit_or_send_message( - target_message=callback_query.message, - text=INSUFFICIENT_FUNDS_RENEWAL_MSG.format(required_amount=required_amount), - reply_markup=builder.as_markup(), - media_path=None, - ) - return - - logger.info(f"[RENEW] Средств достаточно. Продление ключа для пользователя {tg_id}") - await complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan) - - else: - await callback_query.message.answer(KEY_NOT_FOUND_MSG) - logger.error(f"[RENEW] Ключ с client_id={client_id} не найден.") - except Exception as e: - logger.error(f"[RENEW] Ошибка при продлении ключа для пользователя {tg_id}: {e}") - - -async def complete_key_renewal(tg_id, client_id, email, new_expiry_time, total_gb, cost, callback_query, plan): - logger.info( - f"[RENEW] Начинаю процесс продления ключа с параметрами: " - f"tg_id={tg_id}, client_id={client_id}, email={email}, " - f"new_expiry_time={new_expiry_time}, total_gb={total_gb}, cost={cost}, " - f"callback_query={'есть' if callback_query else 'отсутствует'}, plan={plan}" - ) - - response_message = SUCCESS_RENEWAL_MSG.format(months=plan) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text=MAIN_MENU, callback_data="profile")) - - if callback_query: - try: - await edit_or_send_message( - target_message=callback_query.message, - text=response_message, - reply_markup=builder.as_markup(), - media_path=None, - ) - except Exception as e: - logger.error(f"Ошибка редактирования сообщения в complete_key_renewal: {e}") - await callback_query.message.answer(response_message, reply_markup=builder.as_markup()) - else: - await bot.send_message(tg_id, response_message, reply_markup=builder.as_markup()) - - conn = await asyncpg.connect(DATABASE_URL) - - logger.info(f"[RENEW] Получение данных о ключе для email: {email}") - key_info = await get_key_details(email, conn) - if not key_info: - logger.error(f"[RENEW] Ключ с client_id {client_id} для пользователя {tg_id} не найден.") - await conn.close() - return - - server_id = key_info["server_id"] - - if USE_COUNTRY_SELECTION: - logger.info(f"[RENEW] USE_COUNTRY_SELECTION включён. Проверяю информацию о сервере {server_id}") - cluster_info = await check_server_name_by_cluster(server_id, conn) - if not cluster_info: - logger.error(f"[RENEW] Сервер {server_id} не найден в таблице servers.") - await conn.close() - return - cluster_id = cluster_info["cluster_name"] - logger.info(f"[RENEW] Информация о сервере получена: {cluster_info}. Использую cluster_id: {cluster_id}") - else: - cluster_id = server_id - logger.info(f"[RENEW] USE_COUNTRY_SELECTION выключен. Использую server_id в качестве cluster_id: {cluster_id}") - - logger.info(f"[RENEW] Запуск продления ключа для пользователя {tg_id} на {plan} мес. в кластере {cluster_id}.") - - async def renew_key_on_cluster(): - logger.info( - f"[RENEW] Запуск renew_key_on_cluster с параметрами: " - f"cluster_id={cluster_id}, email={email}, client_id={client_id}, " - f"new_expiry_time={new_expiry_time}, total_gb={total_gb}" - ) - await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb) - logger.info("[RENEW] Продление ключа на сервере завершено. Обновляю срок действия в базе данных.") - await update_key_expiry(client_id, new_expiry_time, conn) - logger.info("[RENEW] Срок действия ключа обновлён. Обновляю баланс пользователя.") - await update_balance(tg_id, -cost, conn) - logger.info(f"[RENEW] Ключ {client_id} успешно продлён на {plan} мес. для пользователя {tg_id}.") - - logger.info("[RENEW] Инициализация процесса продления ключа в кластере.") - await renew_key_on_cluster() - - logger.info("[RENEW] Процесс продления ключа завершён. Закрываю соединение с базой данных.") - await conn.close()