fix trial

Refactor

.flake8

@@ -1,6 +1,6 @@
 [flake8]
-max-line-length = 250
-ignore = E203, E266, E501, W503, F541, E704, W293, W291, E126, E121, E123, E128, E302, E131, E231, W292, E402, E261, E305
-max-complexity = 25
+max-line-length = 120
+ignore = E203, E266, E501, W503, F541, E704, W293, W291, E126, E121, E123, E128, E302, E131, E231, W292, E402, E261, E305, E701
+max-complexity = 15
 select = B, C, E, F, W, T4, B9
-exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.txt
+exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.txt,config.py

.gitignore

@@ -50,4 +50,7 @@ handlers/texts.py
 Thumbs.db
 
 nginx.conf
-scripts/nginx.sh
+scripts
+models.py
+Dockerfile
+.csv

.isort.cfg

@@ -1,3 +0,0 @@
-[settings]
-profile=black
-line_length = 250

Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.10-slim
-
-ENV PYTHONUNBUFFERED=1
-
-WORKDIR /app
-
-COPY requirements.txt .
-
-RUN apt-get update && \
-    apt-get install -y postgresql-client locales && \
-    pip install --upgrade pip && pip install -r requirements.txt && \
-    sed -i '/ru_RU.UTF-8/s/^# //g' /etc/locale.gen && \
-    locale-gen ru_RU.UTF-8
-
-ENV LANG=ru_RU.UTF-8
-ENV LANGUAGE=ru_RU:ru
-ENV LC_ALL=ru_RU.UTF-8
-
-COPY . .
-
-RUN sed -i "s|DATABASE_URL = .*|DATABASE_URL = '${DATABASE_URL}'|" config.py
-
-CMD ["python", "main.py"]

Makefile

@@ -1,2 +1,5 @@
 formatting:
-	@black . && isort . && flake8
+	@echo "Running black..." && black .
+	@echo "Running isort..." && isort .
+	@echo "Running flake8..." && flake8 --config .flake8
+	# @echo "Running pylint..." && pylint .

README.md

@@ -9,7 +9,7 @@
   - v2.3.1 — стабильная версия подписок вместо ключей с кнопками автодобавления в приложение:
 
 ![Основные окна](preview_v_2.jpg)
-  - v3.0.4_beta — полноценные подписки с выбором серверов из клиентского приложения (не в боте):
+  - v3.1 — настолько большая, что смотрите в [релизе](https://github.com/Vladless/Solo_bot/releases/tag/v3.1):
 
 
 

backup.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 import os
 import subprocess
-from datetime import datetime
+from typing import Union
 
 from aiogram.types import BufferedInputFile
 
@@ -11,6 +12,15 @@ from logger import logger
 async def backup_database():
     from bot import bot
 
+    try:
+        if backup_file_path := _create_database_backup():
+            await _send_backup_to_admin(bot, backup_file_path)
+            _cleanup_old_backups()
+    except Exception as e:
+        logger.error(f"Ошибка при создании или отправке бэкапа: {e}")
+
+
+def _create_database_backup():
     USER = DB_USER
     HOST = "localhost"
     BACKUP_DIR = BACK_DIR
@@ -21,29 +31,51 @@ async def backup_database():
 
     try:
         subprocess.run(
-            ["pg_dump", "-U", USER, "-h", HOST, "-F", "c", "-f", BACKUP_FILE, DB_NAME],
+            [
+                "pg_dump",
+                "-U",
+                USER,
+                "-h",
+                HOST,
+                "-F",
+                "c",
+                "-f",
+                BACKUP_FILE,
+                DB_NAME,
+            ],
             check=True,
         )
         logger.info(f"Бэкап базы данных создан: {BACKUP_FILE}")
+        return BACKUP_FILE
     except subprocess.CalledProcessError as e:
         logger.error(f"Ошибка при создании бэкапа базы данных: {e}")
-        return
+        return None
+    finally:
+        del os.environ["PGPASSWORD"]
 
+
+async def _send_backup_to_admin(bot, backup_file_path):
     try:
-        with open(BACKUP_FILE, "rb") as backup_file:
-            backup_input_file = BufferedInputFile(
-                backup_file.read(), filename=os.path.basename(BACKUP_FILE)
-            )
-            await bot.send_document(ADMIN_ID, backup_input_file)
-        logger.info(f"Бэкап базы данных отправлен админу: {ADMIN_ID}")
+        with open(backup_file_path, "rb") as backup_file:
+            backup_input_file = BufferedInputFile(backup_file.read(), filename=os.path.basename(backup_file_path))
+            admin_ids: Union[int, list[int]] = ADMIN_ID
+            if isinstance(admin_ids, list):
+                for id in admin_ids:
+                    await bot.send_document(id, backup_input_file)
+                    logger.info(f"Бэкап базы данных отправлен админу: {id}")
+            else:
+                await bot.send_document(admin_ids, backup_input_file)
+                logger.info(f"Бэкап базы данных отправлен админу: {ADMIN_ID}")
     except Exception as e:
         logger.error(f"Ошибка при отправке бэкапа в Telegram: {e}")
 
+
+def _cleanup_old_backups():
     try:
         subprocess.run(
             [
                 "find",
-                BACKUP_DIR,
+                BACK_DIR,
                 "-type",
                 "f",
                 "-name",
@@ -60,5 +92,3 @@ async def backup_database():
         logger.info("Старые бэкапы удалены.")
     except subprocess.CalledProcessError as e:
         logger.error(f"Ошибка при удалении старых бэкапов: {e}")
-
-    del os.environ["PGPASSWORD"]

bot.py

@@ -1,26 +1,34 @@
+import traceback
+
 from aiogram import Bot, Dispatcher, Router
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import ParseMode
 from aiogram.fsm.storage.memory import MemoryStorage
+from aiogram.types import ErrorEvent
 
 from config import API_TOKEN, CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE
+from logger import logger
+from middlewares.admin import AdminMiddleware
 from middlewares.database import DatabaseMiddleware
+from middlewares.delete import DeleteMessageMiddleware
 from middlewares.logging import LoggingMiddleware
+from middlewares.user import UserMiddleware
 
-bot = Bot(token=API_TOKEN)
+bot = Bot(token=API_TOKEN, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
 storage = MemoryStorage()
 dp = Dispatcher(bot=bot, storage=storage)
 router = Router()
 
-from handlers import commands, coupons, donate, notifications, pay, profile, start
-from handlers.admin import admin_commands, admin_coupons, admin_panel, admin_user_editor
+from handlers import coupons, donate, notifications, pay, profile, start
+from handlers.admin import admin_coupons, admin_panel, admin_servers, admin_user_editor
 from handlers.instructions import instructions
 from handlers.keys import key_management, keys
 from handlers.payments import cryprobot_pay, freekassa_pay, robokassa_pay, stars_pay, yookassa_pay
 
-dp.include_router(admin_commands.router)
 dp.include_router(admin_coupons.router)
 dp.include_router(admin_panel.router)
 dp.include_router(admin_user_editor.router)
-dp.include_router(commands.router)
+dp.include_router(admin_servers.router)
 dp.include_router(coupons.router)
 dp.include_router(start.router)
 dp.include_router(profile.router)
@@ -44,6 +52,25 @@ if ROBOKASSA_ENABLE:
 dp.message.middleware(LoggingMiddleware())
 dp.callback_query.middleware(LoggingMiddleware())
 
+dp.message.middleware(AdminMiddleware())
+dp.callback_query.middleware(AdminMiddleware())
+
+dp.message.middleware(UserMiddleware())
+dp.callback_query.middleware(UserMiddleware())
 
 dp.message.middleware(DatabaseMiddleware())
 dp.callback_query.middleware(DatabaseMiddleware())
+
+dp.message.outer_middleware(DeleteMessageMiddleware())
+dp.callback_query.outer_middleware(DeleteMessageMiddleware())
+
+
+@dp.error()
+async def error_handler(event: ErrorEvent):
+    logger.error(
+        "Ошибка в боте:\n"
+        f"Исключение: {event.exception}\n"
+        f"Тип: {type(event.exception)}\n"
+        f"Update: {event.update}\n"
+        f"Трассировка:\n{traceback.format_exc()}"
+    )

client.py

@@ -1,6 +1,5 @@
 import py3xui
 
-from config import TOTAL_GB
 from logger import logger
 
 
@@ -14,6 +13,7 @@ async def add_client(
     expiry_time: int,
     enable: bool,
     flow: str,
+    inbound_id: int,
 ):
     """
     Adds a client to the server via 3x-ui.
@@ -25,7 +25,7 @@ async def add_client(
             id=client_id,
             email=email.lower(),
             limit_ip=limit_ip,
-            total_gb=TOTAL_GB,
+            total_gb=total_gb,
             expiry_time=expiry_time,
             enable=enable,
             tg_id=tg_id,
@@ -33,7 +33,7 @@ async def add_client(
             flow=flow,
         )
 
-        response = await xui.client.add(1, [client])
+        response = await xui.client.add(inbound_id, [client])
 
         logger.info(f"Клиент {email} успешно добавлен с ID {client_id}.")
 
@@ -44,9 +44,7 @@ async def add_client(
         return {"status": "failed", "error": str(e)}
 
 
-async def extend_client_key(
-    xui, email: str, new_expiry_time: int, client_id: str, total_gb: int
-):
+async def extend_client_key(xui, inbound_id, email: str, new_expiry_time: int, client_id: str, total_gb: int):
     """
     Функция для обновления срока действия ключа клиента по email.
     """
@@ -62,9 +60,7 @@ async def extend_client_key(
             logger.warning(f"Ошибка: клиент {email} не имеет действительного ID.")
             return
 
-        logger.info(
-            f"Обновление ключа клиента {client.email} с ID {client.id} до нового времени: {new_expiry_time}"
-        )
+        logger.info(f"Обновление ключа клиента {client.email} с ID {client.id} до нового времени: {new_expiry_time}")
 
         client.id = client_id
         client.expiry_time = new_expiry_time
@@ -73,11 +69,11 @@ async def extend_client_key(
         client.total_gb = total_gb
         client.enable = True
         client.limit_ip = 1
+        client.inbound_id = inbound_id
 
         await xui.client.update(client.id, client)
-        logger.info(
-            f"Ключ клиента {client.email} успешно продлён до {new_expiry_time}."
-        )
+        await xui.client.reset_stats(inbound_id, email)
+        logger.info(f"Ключ клиента {client.email} успешно продлён до {new_expiry_time}.")
 
     except Exception as e:
         logger.error(f"Ошибка при обновлении клиента с email {email}: {e}")
@@ -85,6 +81,7 @@ async def extend_client_key(
 
 async def delete_client(
     xui,
+    inbound_id: int,
     email: str,
     client_id: str,
 ) -> bool:
@@ -101,7 +98,6 @@ async def delete_client(
             return False
 
         client.id = client_id
-        inbound_id = 1
 
         await xui.client.delete(inbound_id, client.id)
         logger.info(f"Клиент с ID {client_id} был удален успешно.")

filters/admin.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 from aiogram.filters import BaseFilter
 from aiogram.types import Message
 
@@ -6,9 +8,10 @@ from config import ADMIN_ID
 
 class IsAdminFilter(BaseFilter):
     async def __call__(self, message: Message) -> bool:
-        if isinstance(ADMIN_ID, list):
-            return message.from_user.id in ADMIN_ID
-        elif isinstance(ADMIN_ID, int):
-            return message.from_user.id == ADMIN_ID
-        else:
+        try:
+            admin_ids: Union[int, list[int]] = ADMIN_ID
+            if isinstance(admin_ids, list):
+                return message.from_user.id in admin_ids
+            return message.from_user.id == admin_ids
+        except Exception:
             return False

handlers/admin/admin_commands.py

@@ -1,160 +0,0 @@
-import asyncpg
-from aiogram import Router, types
-from aiogram.filters import Command
-from aiogram.fsm.context import FSMContext
-from aiogram.fsm.state import State, StatesGroup
-
-from bot import bot
-from config import DATABASE_URL
-from database import add_balance_to_client, check_connection_exists
-from filters.admin import IsAdminFilter
-from handlers.texts import TRIAL
-from logger import logger
-
-router = Router()
-
-
-class Form(StatesGroup):
-    waiting_for_server_selection = State()
-    waiting_for_key_name = State()
-    viewing_profile = State()
-    waiting_for_message = State()
-
-
-@router.message(Command("add_balance"), IsAdminFilter())
-async def cmd_add_balance(message: types.Message):
-    try:
-        _, client_id, amount = message.text.split()
-        amount = float(amount)
-
-        if not await check_connection_exists(int(client_id)):
-            await message.reply(f"❌ Клиент с ID {client_id} не найден в базе данных.")
-            return
-
-        await add_balance_to_client(int(client_id), amount)
-        await message.reply(
-            f"✅ Баланс клиента {client_id} успешно пополнен на {amount}"
-        )
-    except ValueError:
-        await message.reply(
-            "❓ Неверный формат команды!\n"
-            "Пожалуйста, используйте следующий шаблон:\n"
-            "/add_balance <ID клиента> <сумма пополнения>"
-        )
-    except Exception as e:
-        await message.reply(f"🚨 Произошла непредвиденная ошибка: {e}")
-
-
-@router.message(Command("backup"), IsAdminFilter())
-async def backup_command(message: types.Message):
-    from backup import backup_database
-
-    await message.answer("🔄 Инициализация резервного копирования базы данных...")
-    await backup_database()
-    await message.answer(
-        "✅ Бэкап базы данных успешно завершен и отправлен администратору."
-    )
-
-
-@router.message(Command("send_trial"), IsAdminFilter())
-async def handle_send_trial_command(message: types.Message, state: FSMContext):
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            records = await conn.fetch(
-                """
-                SELECT tg_id FROM connections WHERE trial = 0
-            """
-            )
-
-            if records:
-                success_count = 0
-                error_count = 0
-                blocked_count = 0
-
-                for record in records:
-                    tg_id = record["tg_id"]
-                    trial_message = TRIAL
-                    try:
-                        await bot.send_message(chat_id=tg_id, text=trial_message)
-                        success_count += 1
-                    except Exception as e:
-                        if "Forbidden: bot was blocked by the user" in str(e):
-                            blocked_count += 1
-                            logger.info(
-                                f"🚫 Бот заблокирован пользователем с tg_id: {tg_id}"
-                            )
-                        else:
-                            error_count += 1
-                            logger.error(
-                                f"❌ Ошибка при отправке сообщения пользователю {tg_id}: {e}"
-                            )
-
-                await message.answer(
-                    f"📊 Результаты рассылки пробных периодов:\n"
-                    f"✅ Успешно отправлено: {success_count}\n"
-                    f"🚫 Заблокировано: {blocked_count}\n"
-                    f"❌ Ошибок: {error_count}"
-                )
-            else:
-                await message.answer(
-                    "📭 Нет пользователей с неиспользованными пробными ключами."
-                )
-
-        finally:
-            await conn.close()
-
-    except Exception as e:
-        await message.answer(f"❗ Ошибка при отправке сообщений: {e}")
-
-
-@router.message(Command("send_to_all"), IsAdminFilter())
-async def send_message_to_all_clients(
-    message: types.Message, state: FSMContext, from_panel=False
-):
-    if from_panel:
-        await message.answer(
-            "✍️ Введите текст сообщения, который вы хотите отправить всем клиентам:"
-        )
-        await state.set_state(Form.waiting_for_message)
-
-
-@router.message(Form.waiting_for_message, IsAdminFilter())
-async def process_message_to_all(
-    message: types.Message,
-    state: FSMContext,
-):
-    text_message = message.text
-
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        tg_ids = await conn.fetch("SELECT tg_id FROM connections")
-
-        total_users = len(tg_ids)
-        success_count = 0
-        error_count = 0
-
-        for record in tg_ids:
-            tg_id = record["tg_id"]
-            try:
-                await bot.send_message(chat_id=tg_id, text=text_message)
-                success_count += 1
-            except Exception as e:
-                error_count += 1
-                logger.error(
-                    f"❌ Ошибка при отправке сообщения пользователю {tg_id}: {e}"
-                )
-
-        await message.answer(
-            f"📤 Рассылка завершена:\n"
-            f"👥 Всего пользователей: {total_users}\n"
-            f"✅ Успешно отправлено: {success_count}\n"
-            f"❌ Не доставлено: {error_count}"
-        )
-    except Exception as e:
-        logger.error(f"❗ Ошибка при подключении к базе данных: {e}")
-        await message.answer("❌ Произошла ошибка при отправке сообщения.")
-    finally:
-        await conn.close()
-
-    await state.clear()

handlers/admin/admin_coupons.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
@@ -5,6 +7,7 @@ from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from database import create_coupon, delete_coupon_from_db, get_all_coupons
+from filters.admin import IsAdminFilter
 from logger import logger
 
 
@@ -15,53 +18,29 @@ class AdminCouponsState(StatesGroup):
 router = Router()
 
 
-@router.callback_query(F.data == "coupons_editor")
-async def show_coupon_management_menu(callback_query: types.CallbackQuery):
-    try:
-        await callback_query.message.delete()
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
-
+@router.callback_query(F.data == "coupons_editor", IsAdminFilter())
+async def show_coupon_management_menu(callback_query: types.CallbackQuery, state: FSMContext):
+    await state.clear()
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="➕ Создать купон", callback_data="create_coupon")
-    )
+    builder.row(InlineKeyboardButton(text="➕ Создать купон", callback_data="create_coupon"))
     builder.row(InlineKeyboardButton(text="Купоны", callback_data="coupons"))
-    builder.row(
-        InlineKeyboardButton(text="🔙 Назад", callback_data="back_to_admin_menu")
-    )
-
-    markup = builder.as_markup()
-    await callback_query.message.answer(
-        "🛠 Меню управления купонами:", reply_markup=markup
-    )
-    await callback_query.answer()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
+    await callback_query.message.answer("🛠 Меню управления купонами:", reply_markup=builder.as_markup())
 
 
-@router.callback_query(F.data == "coupons")
-async def show_coupon_list(callback_query: types.CallbackQuery):
+@router.callback_query(F.data == "coupons", IsAdminFilter())
+async def show_coupon_list(callback_query: types.CallbackQuery, session: Any):
     try:
-        try:
-            await callback_query.message.delete()
-        except Exception as e:
-            logger.error(f"Ошибка при удалении сообщения: {e}")
-
-        coupons = await get_all_coupons()
+        coupons = await get_all_coupons(session)
 
         if not coupons:
             builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-            )
-            markup = builder.as_markup()
+            builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
 
             await callback_query.message.answer(
-                "❌ На данный момент нет доступных купонов.\n"
-                "Вы можете вернуться в меню управления.",
-                parse_mode="HTML",
-                reply_markup=markup,
+                "❌ На данный момент нет доступных купонов. 🚫\nВы можете вернуться в меню управления. 🔙",
+                reply_markup=builder.as_markup(),
             )
-            await callback_query.answer()
             return
 
         coupon_list = "📜 Список всех купонов:\n\n"
@@ -69,10 +48,10 @@ async def show_coupon_list(callback_query: types.CallbackQuery):
 
         for coupon in coupons:
             coupon_list += (
-                f"<b>Код:</b> {coupon['code']}\n"
-                f"<b>Сумма:</b> {coupon['amount']} рублей\n"
-                f"<b>Лимит использования:</b> {coupon['usage_limit']} раз\n"
-                f"<b>Использовано:</b> {coupon['usage_count']} раз\n\n"
+                f"🏷️ <b>Код:</b> {coupon['code']}\n"
+                f"💰 <b>Сумма:</b> {coupon['amount']} рублей\n"
+                f"🔢 <b>Лимит использования:</b> {coupon['usage_limit']} раз\n"
+                f"✅ <b>Использовано:</b> {coupon['usage_count']} раз\n\n"
             )
 
             builder.row(
@@ -82,79 +61,61 @@ async def show_coupon_list(callback_query: types.CallbackQuery):
                 )
             )
 
-        builder.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-        )
-
-        markup = builder.as_markup()
-        await callback_query.message.answer(
-            coupon_list, parse_mode="HTML", reply_markup=markup
-        )
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
+        await callback_query.message.answer(coupon_list, reply_markup=builder.as_markup())
 
     except Exception as e:
         logger.error(f"Ошибка при получении списка купонов: {e}")
-        await callback_query.message.answer(
-            f"❌ Произошла ошибка при получении списка купонов: {e}", parse_mode="HTML"
-        )
-    await callback_query.answer()
 
 
-@router.callback_query(F.data.startswith("delete_coupon_"))
-async def handle_delete_coupon(callback_query: types.CallbackQuery):
+@router.callback_query(F.data.startswith("delete_coupon_"), IsAdminFilter())
+async def handle_delete_coupon(callback_query: types.CallbackQuery, session: Any):
     coupon_code = callback_query.data[len("delete_coupon_") :]
 
     try:
-        result = await delete_coupon_from_db(coupon_code)
+        result = await delete_coupon_from_db(coupon_code, session)
 
         if result:
-            try:
-                await callback_query.message.delete()
-            except Exception as e:
-                logger.error(f"Ошибка при удалении сообщения: {e}")
-
-            await show_coupon_list(callback_query)
+            await show_coupon_list(callback_query, session)
         else:
             await callback_query.message.answer(
-                f"❌ Купон с кодом <b>{coupon_code}</b> не найден.", parse_mode="HTML"
+                f"❌ Купон с кодом <b>{coupon_code}</b> не найден.",
             )
-            await show_coupon_list(callback_query)
+            await show_coupon_list(callback_query, session)
 
     except Exception as e:
         logger.error(f"Ошибка при удалении купона: {e}")
-        await callback_query.message.answer(
-            f"❌ Произошла ошибка при удалении купона: {e}", parse_mode="HTML"
-        )
-    await callback_query.answer()
 
 
-@router.callback_query(F.data == "create_coupon")
+@router.callback_query(F.data == "create_coupon", IsAdminFilter())
 async def handle_create_coupon(callback_query: types.CallbackQuery, state: FSMContext):
-    try:
-        await callback_query.message.delete()
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
 
     await callback_query.message.answer(
-        "<b>Введите данные для создания купона в формате:</b>\n\n"
-        "<i>код</i> <i>сумма</i> <i>лимит</i>\n\n"
-        "Пример: <b>'COUPON1 50 5'</b>\n\n",
-        parse_mode="HTML",
+        "🎫 <b>Введите данные для создания купона в формате:</b>\n\n"
+        "📝 <i>код</i> 💰 <i>сумма</i> 🔢 <i>лимит</i>\n\n"
+        "Пример: <b>'COUPON1 50 5'</b> 👈\n\n",
+        reply_markup=builder.as_markup(),
     )
     await state.set_state(AdminCouponsState.waiting_for_coupon_data)
-    await callback_query.answer()
 
 
-@router.message(AdminCouponsState.waiting_for_coupon_data)
-async def process_coupon_data(message: types.Message, state: FSMContext):
+@router.message(AdminCouponsState.waiting_for_coupon_data, IsAdminFilter())
+async def process_coupon_data(message: types.Message, state: FSMContext, session: Any):
     text = message.text.strip()
 
     parts = text.split()
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
+
     if len(parts) != 3:
         await message.answer(
-            "<b>❌ Некорректный формат!</b> Пожалуйста, введите данные в формате:\n"
-            "<b>код</b> <b>сумма</b> <b>лимит</b>\n"
-            "Пример: <b>'COUPON1 50 5'</b>",
-            parse_mode="HTML",
+            "❌ <b>Некорректный формат!</b> 📝 Пожалуйста, введите данные в формате:\n"
+            "🏷️ <b>код</b> 💰 <b>сумма</b> 🔢 <b>лимит</b>\n"
+            "Пример: <b>'COUPON1 50 5'</b> 👈",
+            reply_markup=builder.as_markup(),
         )
         return
 
@@ -164,44 +125,26 @@ async def process_coupon_data(message: types.Message, state: FSMContext):
         usage_limit = int(parts[2])
     except ValueError:
         await message.answer(
-            "<b>⚠️ Проверьте правильность введенных данных.</b>\n"
-            "Сумма должна быть числом, а лимит — целым числом.",
-            parse_mode="HTML",
+            "⚠️ <b>Проверьте правильность введенных данных!</b>\n"
+            "💱 Сумма должна быть числом, 🔢 а лимит — целым числом.",
+            reply_markup=builder.as_markup(),
         )
         return
 
     try:
-        await create_coupon(coupon_code, coupon_amount, usage_limit)
+        await create_coupon(coupon_code, coupon_amount, usage_limit, session)
 
         result_message = (
-            f"✅ Купон с кодом <b>{coupon_code}</b> успешно создан!\n"
-            f"Сумма: <b>{coupon_amount} рублей</b>\n"
-            f"Лимит использования: <b>{usage_limit} раз</b>."
+            f"✅ Купон с кодом <b>{coupon_code}</b> успешно создан! 🎉\n"
+            f"Сумма: <b>{coupon_amount} рублей</b> 💰\n"
+            f"Лимит использования: <b>{usage_limit} раз</b> 🔢."
         )
 
         builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor")
-        )
-        markup = builder.as_markup()
-
-        try:
-            await message.delete()
-        except Exception as e:
-            logger.error(f"Ошибка при удалении сообщения: {e}")
-
-        await message.answer(result_message, parse_mode="HTML", reply_markup=markup)
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
 
+        await message.answer(result_message, reply_markup=builder.as_markup())
         await state.clear()
 
     except Exception as e:
         logger.error(f"Ошибка при создании купона: {e}")
-        await message.answer(
-            f"<b>❌ Ошибка при создании купона:</b> {e}", parse_mode="HTML"
-        )
-
-
-@router.callback_query(F.data == "back_to_coupons_menu")
-async def back_to_coupons_menu(callback_query: types.CallbackQuery):
-    """Возвращаем пользователя в меню управления купонами"""
-    await show_coupon_management_menu(callback_query)

handlers/admin/admin_panel.py

@@ -1,19 +1,19 @@
-import subprocess
 from datetime import datetime
+from io import BytesIO
+import subprocess
+from typing import Any
 
-import asyncpg
 from aiogram import F, Router, types
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
+from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from backup import backup_database
 from bot import bot
-from config import DATABASE_URL
 from filters.admin import IsAdminFilter
-from handlers.admin.admin_commands import send_message_to_all_clients
+from logger import logger
 
 router = Router()
 
@@ -21,95 +21,243 @@ router = Router()
 class UserEditorState(StatesGroup):
     waiting_for_tg_id = State()
     displaying_user_info = State()
+    waiting_for_restart_confirmation = State()
+    waiting_for_message = State()
 
 
-@router.message(Command("admin"), IsAdminFilter())
-async def handle_admin_command(message: types.Message):
+@router.callback_query(F.data == "admin", IsAdminFilter())
+async def handle_admin_callback_query(callback_query: CallbackQuery, state: FSMContext):
+    await handle_admin_message(callback_query.message, state)
+
+
+@router.message(Command("admin"), F.data == "admin", IsAdminFilter())
+async def handle_admin_message(message: types.Message, state: FSMContext):
+    await state.clear()
+
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="📊 Статистика пользователей", callback_data="user_stats"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="👥 Управление пользователями", callback_data="user_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🎟️ Управление купонами", callback_data="coupons_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="📢 Массовая рассылка", callback_data="send_to_alls")
-    )
-    builder.row(
-        InlineKeyboardButton(text="💾 Создать резервную копию", callback_data="backups")
-    )
-    builder.row(
-        InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot")
-    )
-    await bot.send_message(
-        message.chat.id, "🤖 Панель администратора", reply_markup=builder.as_markup()
-    )
+    builder.row(InlineKeyboardButton(text="📊 Статистика пользователей", callback_data="user_stats"))
+    builder.row(InlineKeyboardButton(text="👥 Управление пользователями", callback_data="user_editor"))
+    builder.row(InlineKeyboardButton(text="🖥️ Управление серверами", callback_data="servers_editor"))
+    builder.row(InlineKeyboardButton(text="🎟️ Управление купонами", callback_data="coupons_editor"))
+    builder.row(InlineKeyboardButton(text="📢 Массовая рассылка", callback_data="send_to_alls"))
+    builder.row(InlineKeyboardButton(text="💾 Создать резервную копию", callback_data="backups"))
+    builder.row(InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+    await message.answer("🤖 Панель администратора", reply_markup=builder.as_markup())
 
 
 @router.callback_query(F.data == "user_stats", IsAdminFilter())
-async def user_stats_menu(callback_query: CallbackQuery):
-    conn = await asyncpg.connect(DATABASE_URL)
+async def user_stats_menu(callback_query: CallbackQuery, session: Any):
     try:
-        total_users = await conn.fetchval("SELECT COUNT(*) FROM connections")
-        total_keys = await conn.fetchval("SELECT COUNT(*) FROM keys")
-        total_referrals = await conn.fetchval("SELECT COUNT(*) FROM referrals")
+        total_users = await session.fetchval("SELECT COUNT(*) FROM connections")
+        total_keys = await session.fetchval("SELECT COUNT(*) FROM keys")
+        total_referrals = await session.fetchval("SELECT COUNT(*) FROM referrals")
 
-        active_keys = await conn.fetchval(
+        total_payments_today = await session.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= CURRENT_DATE"
+        )
+        total_payments_week = await session.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('week', CURRENT_DATE)"
+        )
+        total_payments_all_time = await session.fetchval("SELECT COALESCE(SUM(amount), 0) FROM payments")
+
+        active_keys = await session.fetchval(
             "SELECT COUNT(*) FROM keys WHERE expiry_time > $1",
             int(datetime.utcnow().timestamp() * 1000),
         )
         expired_keys = total_keys - active_keys
 
         stats_message = (
-            f"📈 <b>Подробная статистика проекта:</b>\n\n"
-            f"👤 Зарегистрированных пользователей: <b>{total_users}</b>\n"
-            f"🔑 Всего сгенерированных ключей: <b>{total_keys}</b>\n"
-            f"🤝 Привлеченных рефералов: <b>{total_referrals}</b>\n"
-            f"✅ Действующих ключей: <b>{active_keys}</b>\n"
-            f"❌ Просроченных ключей: <b>{expired_keys}</b>"
+            f"📊 <b>Подробная статистика проекта:</b>\n\n"
+            f"👥 Пользователи:\n"
+            f"   🌐 Зарегистрировано: <b>{total_users}</b>\n"
+            f"   🤝 Привлеченных рефералов: <b>{total_referrals}</b>\n\n"
+            f"🔑 Ключи:\n"
+            f"   🌈 Всего сгенерировано: <b>{total_keys}</b>\n"
+            f"   ✅ Действующих: <b>{active_keys}</b>\n"
+            f"   ❌ Просроченных: <b>{expired_keys}</b>\n\n"
+            f"💰 Финансовая статистика:\n"
+            f"   📅 За день: <b>{total_payments_today} ₽</b>\n"
+            f"   📆 За неделю: <b>{total_payments_week} ₽</b>\n"
+            f"   🏦 За все время: <b>{total_payments_all_time} ₽</b>\n"
         )
 
         builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔙 Вернуться в меню", callback_data="back_to_admin_menu"
-            )
+        builder.row(InlineKeyboardButton(text="🔄 Обновить", callback_data="user_stats"))
+        builder.row(InlineKeyboardButton(text="📥 Выгрузить пользователей в CSV", callback_data="export_users_csv"))
+        builder.row(InlineKeyboardButton(text="📥 Выгрузить оплаты в CSV", callback_data="export_payments_csv"))
+        builder.row(InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin"))
+
+        await callback_query.message.answer(stats_message, reply_markup=builder.as_markup())
+    except Exception as e:
+        logger.error(f"Error in user_stats_menu: {e}")
+
+
+@router.callback_query(F.data == "export_users_csv", IsAdminFilter())
+async def export_users_csv(callback_query: CallbackQuery, session: Any):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_stats"))
+    try:
+        users = await session.fetch(
+            """
+            SELECT 
+                u.tg_id, 
+                u.username, 
+                u.first_name, 
+                u.last_name, 
+                u.language_code, 
+                u.is_bot, 
+                c.balance, 
+                c.trial 
+            FROM users u
+            LEFT JOIN connections c ON u.tg_id = c.tg_id
+        """
         )
 
-        await callback_query.message.edit_text(
-            stats_message, reply_markup=builder.as_markup(), parse_mode="HTML"
+        if not users:
+            await callback_query.message.answer("📭 Нет пользователей для экспорта.", reply_markup=builder.as_markup())
+            return
+
+        csv_data = "tg_id,username,first_name,last_name,language_code,is_bot,balance,trial\n"  # Заголовки CSV
+        for user in users:
+            csv_data += f"{user['tg_id']},{user['username']},{user['first_name']},{user['last_name']},{user['language_code']},{user['is_bot']},{user['balance']},{user['trial']}\n"
+
+        file_name = BytesIO(csv_data.encode("utf-8-sig"))
+        file_name.seek(0)
+
+        file = BufferedInputFile(file_name.getvalue(), filename="users_export.csv")
+
+        await callback_query.message.answer_document(
+            file, caption="📥 Экспорт пользователей в CSV", reply_markup=builder.as_markup()
+        )
+        file_name.close()
+
+    except Exception as e:
+        logger.error(f"Ошибка при экспорте пользователей в CSV: {e}")
+        await callback_query.message.answer(
+            "❗ Произошла ошибка при экспорте пользователей.", reply_markup=builder.as_markup()
+        )
+
+
+@router.callback_query(F.data == "export_payments_csv", IsAdminFilter())
+async def export_payments_csv(callback_query: CallbackQuery, session: Any):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_stats"))
+    try:
+        payments = await session.fetch(
+            """
+            SELECT 
+                u.tg_id, 
+                u.username, 
+                u.first_name, 
+                u.last_name, 
+                p.amount, 
+                p.payment_system,
+                p.status,
+                p.created_at 
+            FROM users u
+            JOIN payments p ON u.tg_id = p.tg_id
+        """
+        )
+
+        if not payments:
+            await callback_query.message.answer("📭 Нет платежей для экспорта.", reply_markup=builder.as_markup())
+            return
+
+        csv_data = "tg_id,username,first_name,last_name,amount,payment_system,status,created_at\n"  # Заголовки CSV
+        for payment in payments:
+            csv_data += f"{payment['tg_id']},{payment['username']},{payment['first_name']},{payment['last_name']},{payment['amount']},{payment['payment_system']},{payment['status']},{payment['created_at']}\n"
+
+        file_name = BytesIO(csv_data.encode("utf-8-sig"))
+        file_name.seek(0)
+
+        file = BufferedInputFile(file_name.getvalue(), filename="payments_export.csv")
+
+        await callback_query.message.answer_document(
+            file, caption="📥 Экспорт платежей в CSV", reply_markup=builder.as_markup()
+        )
+        file_name.close()
+
+    except Exception as e:
+        logger.error(f"Ошибка при экспорте платежей в CSV: {e}")
+        await callback_query.message.answer(
+            "❗ Произошла ошибка при экспорте платежей.", reply_markup=builder.as_markup()
         )
-    finally:
-        await conn.close()
-    await callback_query.answer()
 
 
 @router.callback_query(F.data == "send_to_alls", IsAdminFilter())
 async def handle_send_to_all(callback_query: CallbackQuery, state: FSMContext):
-    await send_message_to_all_clients(callback_query.message, state, from_panel=True)
-    await callback_query.answer()
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
+    await callback_query.message.answer(
+        "✍️ Введите текст сообщения, который вы хотите отправить всем клиентам 📢🌐:",
+        reply_markup=builder.as_markup(),
+    )
+    await state.set_state(UserEditorState.waiting_for_message)
+
+
+@router.message(UserEditorState.waiting_for_message, IsAdminFilter())
+async def process_message_to_all(message: types.Message, state: FSMContext, session: Any):
+    text_message = message.text
+
+    try:
+        tg_ids = await session.fetch("SELECT tg_id FROM connections")
+
+        total_users = len(tg_ids)
+        success_count = 0
+        error_count = 0
+
+        for record in tg_ids:
+            tg_id = record["tg_id"]
+            try:
+                await bot.send_message(chat_id=tg_id, text=text_message)
+                success_count += 1
+            except Exception as e:
+                error_count += 1
+                logger.error(f"❌ Ошибка при отправке сообщения пользователю {tg_id}: {e}")
+
+        await message.answer(
+            f"📤 Рассылка завершена:\n"
+            f"👥 Всего пользователей: {total_users}\n"
+            f"✅ Успешно отправлено: {success_count}\n"
+            f"❌ Не доставлено: {error_count}"
+        )
+    except Exception as e:
+        logger.error(f"❗ Ошибка при подключении к базе данных: {e}")
+
+    await state.clear()
 
 
 @router.callback_query(F.data == "backups", IsAdminFilter())
-async def handle_backup(message: Message):
-    await message.answer("💾 Инициализация резервного копирования базы данных...")
+async def handle_backup(callback_query: CallbackQuery, state: FSMContext):
+    await callback_query.message.answer("💾 Инициализация резервного копирования базы данных...")
     await backup_database()
-    await message.answer(
-        "✅ Резервная копия успешно создана и отправлена администратору."
-    )
+    await callback_query.message.answer("✅ Резервная копия успешно создана и отправлена администратору.")
 
 
 @router.callback_query(F.data == "restart_bot", IsAdminFilter())
-async def handle_restart(callback_query: CallbackQuery):
+async def handle_restart(callback_query: CallbackQuery, state: FSMContext):
+    await state.set_state(UserEditorState.waiting_for_restart_confirmation)
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(text="✅ Да, перезапустить", callback_data="confirm_restart"),
+        InlineKeyboardButton(text="❌ Нет, отмена", callback_data="admin"),
+    )
+    builder.row(InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin"))
+    await callback_query.message.answer(
+        "🤔 Вы уверены, что хотите перезапустить бота?",
+        reply_markup=builder.as_markup(),
+    )
+
+
+@router.callback_query(
+    F.data == "confirm_restart",
+    UserEditorState.waiting_for_restart_confirmation,
+    IsAdminFilter(),
+)
+async def confirm_restart_bot(callback_query: CallbackQuery, state: FSMContext):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Вернуться в меню", callback_data="admin"))
     try:
         subprocess.run(
             ["sudo", "systemctl", "restart", "bot.service"],
@@ -117,10 +265,13 @@ async def handle_restart(callback_query: CallbackQuery):
             capture_output=True,
             text=True,
         )
-        await callback_query.message.answer("🔄 Бот успешно перезапущен.")
-    except subprocess.CalledProcessError as e:
+        await state.clear()
+        await callback_query.message.answer("🔄 Бот успешно перезапущен.", reply_markup=builder.as_markup())
+    except subprocess.CalledProcessError:
+        await callback_query.message.answer("🔄 Бот успешно перезапущен.", reply_markup=builder.as_markup())
+    except Exception as e:
         await callback_query.message.answer(
-            f"⚠️ Перезагрузка бота будет выполнена через 30 секунд. Детали: {e.stderr}"
+            f"⚠️ Ошибка при перезагрузке бота: {e.stderr}", reply_markup=builder.as_markup()
         )
 
 
@@ -129,63 +280,11 @@ async def user_editor_menu(callback_query: CallbackQuery):
     builder = InlineKeyboardBuilder()
     builder.row(
         InlineKeyboardButton(
-            text="🔍 Поиск по названию ключа", callback_data="search_by_key_name"
+            text="🔍 Поиск по названию ключа",
+            callback_data="search_by_key_name",
         )
     )
-    builder.row(
-        InlineKeyboardButton(
-            text="🆔 Поиск по Telegram ID", callback_data="search_by_tg_id"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Вернуться назад", callback_data="back_to_admin_menu"
-        )
-    )
-    await callback_query.message.edit_text(
-        "👇 Выберите способ поиска пользователя:", reply_markup=builder.as_markup()
-    )
-
-
-@router.callback_query(F.data == "back_to_admin_menu", IsAdminFilter())
-async def back_to_admin_menu(callback_query: CallbackQuery):
-    try:
-        await callback_query.message.delete()
-    except Exception:
-        pass
-
-    tg_id = callback_query.from_user.id
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="📊 Статистика пользователей", callback_data="user_stats"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="👥 Управление пользователями", callback_data="user_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="📢 Массовая рассылка", callback_data="send_to_alls")
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🎟️ Управление купонами", callback_data="coupons_editor"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(text="💾 Создать резервную копию", callback_data="backups")
-    )
-    builder.row(
-        InlineKeyboardButton(text="🔄 Перезагрузить бота", callback_data="restart_bot")
-    )
-    await bot.send_message(
-        tg_id, "🤖 Панель администратора", reply_markup=builder.as_markup()
-    )
-
-
-async def handle_error(tg_id, callback_query, message):
-    await bot.edit_message_text(
-        message, chat_id=tg_id, message_id=callback_query.message.message_id
-    )
+    builder.row(InlineKeyboardButton(text="🆔 Поиск по Telegram ID", callback_data="search_by_tg_id"))
+    builder.row(InlineKeyboardButton(text="🌐 Поиск по Username", callback_data="search_by_username"))
+    builder.row(InlineKeyboardButton(text="🔙 Вернуться назад", callback_data="admin"))
+    await callback_query.message.answer("👇 Выберите способ поиска пользователя:", reply_markup=builder.as_markup())

handlers/admin/admin_servers.py

@@ -0,0 +1,363 @@
+from aiogram import F, Router, types
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State, StatesGroup
+from aiogram.types import InlineKeyboardButton
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+import asyncpg
+
+from config import DATABASE_URL
+from database import check_unique_server_name, get_servers_from_db
+from filters.admin import IsAdminFilter
+
+router = Router()
+
+
+class UserEditorState(StatesGroup):
+    waiting_for_cluster_name = State()
+    waiting_for_api_url = State()
+    waiting_for_inbound_id = State()
+    waiting_for_server_name = State()
+    waiting_for_subscription_url = State()
+
+
+@router.callback_query(F.data == "servers_editor", IsAdminFilter())
+async def handle_servers_editor(callback_query: types.CallbackQuery):
+    servers = await get_servers_from_db()
+
+    builder = InlineKeyboardBuilder()
+
+    for cluster_name, cluster_servers in servers.items():
+        builder.row(InlineKeyboardButton(text=f"⚙️ {cluster_name}", callback_data=f"manage_cluster|{cluster_name}"))
+
+    builder.row(InlineKeyboardButton(text="➕ Добавить кластер", callback_data="add_cluster"))
+    builder.row(InlineKeyboardButton(text="🔙 Назад в админку", callback_data="admin"))
+
+    await callback_query.message.answer(
+        "<b>🔧 Управление кластерами</b>\n\n"
+        "<i>📌 Здесь вы можете добавить новый кластер.</i>\n\n"
+        "<i>🌐 <b>Кластеры</b> — это пространство серверов, в пределах которого создается подписка.</i>\n"
+        "💡 Если вы хотите выдавать по 1 серверу, то добавьте всего 1 сервер в кластер.\n\n"
+        "<i>⚠️ <b>Важно:</b> Кластеры удаляются автоматически, если удалить все серверы внутри них.</i>\n\n",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+
+
+@router.callback_query(F.data == "add_cluster", IsAdminFilter())
+async def handle_add_cluster(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.answer(
+        "🔧 <b>Введите имя нового кластера:</b>\n\n"
+        "<b>Имя кластера должно быть уникальным и на английском языке.</b>\n"
+        "<i>Пример:</i> <code>cluster2</code> или <code>us_east_1</code>",
+        parse_mode="HTML",
+    )
+
+    await state.set_state(UserEditorState.waiting_for_cluster_name)
+
+
+@router.message(UserEditorState.waiting_for_cluster_name, IsAdminFilter())
+async def handle_cluster_name_input(message: types.Message, state: FSMContext):
+    cluster_name = message.text.strip()
+
+    if cluster_name == "❌ Отменить":
+        await state.clear()
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔧 Управление кластерами", callback_data="servers_editor"))
+        await message.answer(
+            "Процесс создания кластера отменен. Вы вернулись в меню управления серверами.",
+            reply_markup=builder.as_markup(),
+        )
+        return
+
+    if not cluster_name:
+        await message.answer("❌ Имя кластера не может быть пустым. Попробуйте снова.")
+        return
+
+    await state.update_data(cluster_name=cluster_name)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor"))
+
+    await message.answer(
+        f"<b>Введите имя сервера для кластера {cluster_name}:</b>\n\n"
+        "Рекомендуется указать локацию сервера в имени.\n\n"
+        "<i>Пример:</i> <code>server-asia</code>, <code>server-europe</code>",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+    await state.set_state(UserEditorState.waiting_for_server_name)
+
+
+@router.message(UserEditorState.waiting_for_server_name, IsAdminFilter())
+async def handle_server_name_input(message: types.Message, state: FSMContext):
+    server_name = message.text.strip()
+
+    if server_name == "❌ Отменить":
+        await state.clear()
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔧 Управление кластерами", callback_data="servers_editor"))
+        await message.answer(
+            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
+            reply_markup=builder.as_markup(),
+        )
+        return
+
+    if not server_name:
+        await message.answer("❌ Имя сервера не может быть пустым. Попробуйте снова.")
+        return
+
+    server_unique = await check_unique_server_name(server_name)
+    if not server_unique:
+        await message.answer("❌ Сервер с таким именем уже существует. Пожалуйста, выберите другое имя.")
+        return
+
+    user_data = await state.get_data()
+    cluster_name = user_data.get('cluster_name')
+    await state.update_data(server_name=server_name)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor"))
+
+    await message.answer(
+        f"<b>Введите API URL для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
+        "API URL должен быть в следующем формате:\n\n"
+        "<code>https://your_domain:port/panel_path</code>\n\n"
+        "URL должен быть без слэша на конце!\n",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+    await state.set_state(UserEditorState.waiting_for_api_url)
+
+
+@router.message(UserEditorState.waiting_for_api_url, IsAdminFilter())
+async def handle_api_url_input(message: types.Message, state: FSMContext):
+    api_url = message.text.strip()
+
+    if api_url == "❌ Отменить":
+        await state.clear()
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔧 Управление кластерами", callback_data="servers_editor"))
+        await message.answer(
+            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
+            reply_markup=builder.as_markup(),
+        )
+        return
+
+    if not api_url.startswith("https://"):
+        await message.answer(
+            "❌ API URL должен начинаться с <code>https://</code>. Попробуйте снова.",
+            parse_mode="HTML",
+        )
+        return
+
+    api_url = api_url.rstrip('/')
+
+    user_data = await state.get_data()
+    cluster_name = user_data.get('cluster_name')
+    server_name = user_data.get('server_name')
+    await state.update_data(api_url=api_url)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor"))
+
+    await message.answer(
+        f"<b>Введите subscription_url для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
+        "Subscription URL должен быть в следующем формате:\n\n"
+        "<code>https://your_domain:port_sub/sub_path</code>\n\n"
+        "URL должен быть без слэша и имени клиента на конце!\n"
+        "Его можно увидеть в панели 3x-ui в информации о клиенте.",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+    await state.set_state(UserEditorState.waiting_for_subscription_url)
+
+
+@router.message(UserEditorState.waiting_for_subscription_url, IsAdminFilter())
+async def handle_subscription_url_input(message: types.Message, state: FSMContext):
+    subscription_url = message.text.strip()
+
+    if subscription_url == "❌ Отменить":
+        await state.clear()
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔧 Управление кластерами", callback_data="servers_editor"))
+        await message.answer(
+            "Процесс создания кластера был отменен. Вы вернулись в меню управления серверами.",
+            reply_markup=builder.as_markup(),
+        )
+        return
+
+    if not subscription_url.startswith("https://"):
+        await message.answer(
+            "❌ subscription_url должен начинаться с <code>https://</code>. Попробуйте снова.",
+            parse_mode="HTML",
+        )
+        return
+
+    subscription_url = subscription_url.rstrip('/')
+
+    user_data = await state.get_data()
+    cluster_name = user_data.get('cluster_name')
+    server_name = user_data.get('server_name')
+    await state.update_data(subscription_url=subscription_url)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor"))
+
+    await message.answer(
+        f"<b>Введите inbound_id для сервера {server_name} в кластере {cluster_name}:</b>\n\n"
+        "Это номер подключения vless в вашей панели 3x-ui. Обычно это <b>1</b> при чистой настройке по гайду.\n\n",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+    await state.set_state(UserEditorState.waiting_for_inbound_id)
+
+
+@router.message(UserEditorState.waiting_for_inbound_id, IsAdminFilter())
+async def handle_inbound_id_input(message: types.Message, state: FSMContext):
+    inbound_id = message.text.strip()
+
+    if not inbound_id.isdigit():
+        await message.answer("❌ inbound_id должен быть числовым значением. Попробуйте снова.")
+        return
+
+    user_data = await state.get_data()
+    cluster_name = user_data.get('cluster_name')
+    server_name = user_data.get('server_name')
+    api_url = user_data.get('api_url')
+    subscription_url = user_data.get('subscription_url')
+
+    conn = await asyncpg.connect(DATABASE_URL)
+    await conn.execute(
+        """
+        INSERT INTO servers (cluster_name, server_name, api_url, subscription_url, inbound_id) 
+        VALUES ($1, $2, $3, $4, $5)
+        """,
+        cluster_name,
+        server_name,
+        api_url,
+        subscription_url,
+        inbound_id,
+    )
+    await conn.close()
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад к кластерам", callback_data="servers_editor"))
+
+    await message.answer(
+        f"✅ Кластер {cluster_name} и сервер {server_name} успешно добавлены!", reply_markup=builder.as_markup()
+    )
+
+    await state.clear()
+
+
+@router.callback_query(F.data.startswith("manage_cluster|"), IsAdminFilter())
+async def handle_manage_cluster(callback_query: types.CallbackQuery, state: FSMContext):
+    cluster_name = callback_query.data.split("|")[1]
+
+    servers = await get_servers_from_db()
+    cluster_servers = servers.get(cluster_name, [])
+
+    builder = InlineKeyboardBuilder()
+
+    for server in cluster_servers:
+        builder.row(
+            InlineKeyboardButton(
+                text=f"🌍 {server['server_name']}", callback_data=f"manage_server|{server['server_name']}"
+            )
+        )
+
+    builder.row(InlineKeyboardButton(text="➕ Добавить сервер", callback_data=f"add_server|{cluster_name}"))
+    builder.row(InlineKeyboardButton(text="🔙 Назад в управление кластерами", callback_data="servers_editor"))
+
+    await callback_query.message.answer(
+        f"🔧 Управление серверами для кластера {cluster_name}", reply_markup=builder.as_markup()
+    )
+
+
+@router.callback_query(F.data.startswith("manage_server|"), IsAdminFilter())
+async def handle_manage_server(callback_query: types.CallbackQuery, state: FSMContext):
+    server_name = callback_query.data.split("|")[1]
+
+    servers = await get_servers_from_db()
+
+    server = None
+    cluster_name = None
+    for cluster, cluster_servers in servers.items():
+        server = next((s for s in cluster_servers if s['server_name'] == server_name), None)
+        if server:
+            cluster_name = cluster
+            break
+
+    if server:
+        api_url = server['api_url']
+        subscription_url = server['subscription_url']
+        inbound_id = server['inbound_id']
+
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🗑️ Удалить", callback_data=f"delete_server|{server_name}"))
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data=f"manage_cluster|{cluster_name}"))
+
+        await callback_query.message.answer(
+            f"<b>🔧 Информация о сервере {server_name}:</b>\n\n"
+            f"<b>📡 API URL:</b> {api_url}\n"
+            f"<b>🌐 Subscription URL:</b> {subscription_url}\n"
+            f"<b>🔑 Inbound ID:</b> {inbound_id}",
+            parse_mode="HTML",
+            reply_markup=builder.as_markup(),
+        )
+    else:
+        await callback_query.message.answer("❌ Сервер не найден.")
+
+
+@router.callback_query(F.data.startswith("delete_server|"), IsAdminFilter())
+async def handle_delete_server(callback_query: types.CallbackQuery, state: FSMContext):
+    server_name = callback_query.data.split("|")[1]
+
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(text="✅ Да", callback_data=f"confirm_delete_server|{server_name}"),
+        InlineKeyboardButton(text="❌ Нет", callback_data=f"manage_server|{server_name}"),
+    )
+
+    await callback_query.message.answer(
+        f"🗑️ Вы уверены, что хотите удалить сервер {server_name}?", reply_markup=builder.as_markup()
+    )
+
+
+@router.callback_query(F.data.startswith("confirm_delete_server|"), IsAdminFilter())
+async def handle_confirm_delete_server(callback_query: types.CallbackQuery, state: FSMContext):
+    server_name = callback_query.data.split("|")[1]
+
+    conn = await asyncpg.connect(DATABASE_URL)
+    await conn.execute(
+        """
+        DELETE FROM servers WHERE server_name = $1
+        """,
+        server_name,
+    )
+    await conn.close()
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад в управление кластерами", callback_data="servers_editor"))
+
+    await callback_query.message.answer(f"🗑️ Сервер {server_name} успешно удален.", reply_markup=builder.as_markup())
+
+
+@router.callback_query(F.data.startswith("add_server|"), IsAdminFilter())
+async def handle_add_server(callback_query: types.CallbackQuery, state: FSMContext):
+    cluster_name = callback_query.data.split("|")[1]
+
+    await state.update_data(cluster_name=cluster_name)
+
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="❌ Отменить", callback_data="servers_editor"))
+
+    await callback_query.message.answer(
+        f"<b>Введите имя сервера для кластера {cluster_name}:</b>\n\n"
+        "Рекомендуется указать локацию сервера в имени.\n\n"
+        "<i>Пример:</i> <code>server-asia</code>, <code>server-europe</code>",
+        parse_mode="HTML",
+        reply_markup=builder.as_markup(),
+    )
+
+    await state.set_state(UserEditorState.waiting_for_server_name)

handlers/admin/admin_user_editor.py

@@ -1,19 +1,17 @@
 import asyncio
 from datetime import datetime
+from typing import Any
 
-import asyncpg
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
-from config import CLUSTERS, DATABASE_URL, TOTAL_GB
-from database import get_client_id_by_email, restore_trial, update_key_expiry
+from config import TOTAL_GB
+from database import get_client_id_by_email, get_servers_from_db, restore_trial, update_key_expiry
 from filters.admin import IsAdminFilter
-from handlers.admin.admin_panel import back_to_admin_menu
-from handlers.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster
+from handlers.keys.key_utils import delete_key_from_cluster, delete_key_from_db, renew_key_in_cluster
 from handlers.utils import sanitize_key_name
 from logger import logger
 
@@ -22,6 +20,7 @@ router = Router()
 
 class UserEditorState(StatesGroup):
     waiting_for_tg_id = State()
+    waiting_for_username = State()
     displaying_user_info = State()
     waiting_for_new_balance = State()
     waiting_for_key_name = State()
@@ -30,102 +29,155 @@ class UserEditorState(StatesGroup):
 
 @router.callback_query(F.data == "search_by_tg_id", IsAdminFilter())
 async def prompt_tg_id(callback_query: CallbackQuery, state: FSMContext):
-    await callback_query.message.edit_text("🔍 Введите Telegram ID клиента:")
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+    await callback_query.message.answer("🔍 Введите Telegram ID клиента:", reply_markup=builder.as_markup())
     await state.set_state(UserEditorState.waiting_for_tg_id)
 
 
-@router.message(UserEditorState.waiting_for_tg_id, F.text.isdigit(), IsAdminFilter())
-async def handle_tg_id_input(message: types.Message, state: FSMContext):
-    tg_id = int(message.text)
+@router.callback_query(F.data == "search_by_username", IsAdminFilter())
+async def prompt_username(callback_query: CallbackQuery, state: FSMContext):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+    await callback_query.message.answer("🔍 Введите Username клиента:", reply_markup=builder.as_markup())
+    await state.set_state(UserEditorState.waiting_for_username)
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        balance = await conn.fetchval(
-            "SELECT balance FROM connections WHERE tg_id = $1", tg_id
-        )
-        key_records = await conn.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
-        referral_count = await conn.fetchval(
-            "SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id
-        )
 
-        if balance is None:
-            await message.reply("Пользователь с указанным tg_id не найден.")
-            await state.clear()
-            return
+@router.message(UserEditorState.waiting_for_username, IsAdminFilter())
+async def handle_username_input(message: types.Message, state: FSMContext, session: Any):
+    username = message.text.strip().lstrip("@")
+    user_record = await session.fetchrow("SELECT tg_id FROM users WHERE username = $1", username)
 
+    if not user_record:
         builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer("🔍 Пользователь с указанным username не найден. 🚫", reply_markup=builder.as_markup())
+        await state.clear()
+        return
 
-        for (email,) in key_records:
-            builder.row(
-                InlineKeyboardButton(
-                    text=f"🔑 {email}", callback_data=f"edit_key_{email}"
-                )
-            )
+    tg_id = user_record["tg_id"]
+    username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id)
+    balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id)
+    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
+    referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id)
 
-        builder.row(
-            InlineKeyboardButton(
-                text="📝 Изменить баланс", callback_data=f"change_balance_{tg_id}"
-            )
+    if balance is None:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer("🚫 Пользователь с указанным tg_id не найден. 🔍", reply_markup=builder.as_markup())
+        await state.clear()
+        return
+
+    builder = InlineKeyboardBuilder()
+
+    for (email,) in key_records:
+        builder.row(InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}"))
+
+    builder.row(
+        InlineKeyboardButton(
+            text="📝 Изменить баланс",
+            callback_data=f"change_balance_{tg_id}",
         )
+    )
 
-        builder.row(
-            InlineKeyboardButton(
-                text="🔄 Восстановить пробник", callback_data=f"restore_trial_{tg_id}"
-            )
+    builder.row(
+        InlineKeyboardButton(
+            text="🔄 Восстановить пробник",
+            callback_data=f"restore_trial_{tg_id}",
         )
+    )
 
-        builder.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="back_to_user_editor")
-        )
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
 
-        user_info = (
-            f"📊 Информация о пользователе:\n"
-            f"💰 Баланс: <b>{balance}</b>\n"
-            f"👥 Количество рефералов: <b>{referral_count}</b>\n"
-            f"🔑 Ключи (для редактирования нажмите на ключ):"
-        )
-        await message.reply(
-            user_info, reply_markup=builder.as_markup(), parse_mode="HTML"
-        )
-        await state.set_state(UserEditorState.displaying_user_info)
+    user_info = (
+        f"📊 Информация о пользователе:\n\n"
+        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
+        f"👤 Логин пользователя: <b>@{username}</b>\n"
+        f"💰 Баланс: <b>{balance}</b>\n"
+        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
+        f"🔑 Ключи (для редактирования нажмите на ключ):"
+    )
+    await message.answer(user_info, reply_markup=builder.as_markup())
+    await state.set_state(UserEditorState.displaying_user_info)
 
-    finally:
-        await conn.close()
+
+@router.message(UserEditorState.waiting_for_tg_id, F.text.isdigit(), IsAdminFilter())
+async def handle_tg_id_input(message: types.Message, state: FSMContext, session: Any):
+    tg_id = int(message.text)
+    username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id)
+    balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id)
+    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
+    referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id)
+
+    if balance is None:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer("❌ Пользователь с указанным tg_id не найден. 🔍", reply_markup=builder.as_markup())
+        await state.clear()
+        return
+
+    builder = InlineKeyboardBuilder()
+
+    for (email,) in key_records:
+        builder.row(InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}"))
+
+    builder.row(
+        InlineKeyboardButton(
+            text="📝 Изменить баланс",
+            callback_data=f"change_balance_{tg_id}",
+        )
+    )
+
+    builder.row(
+        InlineKeyboardButton(
+            text="🔄 Восстановить пробник",
+            callback_data=f"restore_trial_{tg_id}",
+        )
+    )
+
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+
+    user_info = (
+        f"📊 Информация о пользователе:\n\n"
+        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
+        f"👤 Логин пользователя: <b>@{username}</b>\n"
+        f"💰 Баланс: <b>{balance}</b>\n"
+        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
+        f"🔑 Ключи (для редактирования нажмите на ключ):"
+    )
+    await message.answer(user_info, reply_markup=builder.as_markup())
+    await state.set_state(UserEditorState.displaying_user_info)
 
 
 @router.callback_query(F.data.startswith("restore_trial_"), IsAdminFilter())
-async def handle_restore_trial(callback_query: types.CallbackQuery):
+async def handle_restore_trial(callback_query: types.CallbackQuery, session: Any):
     tg_id = int(callback_query.data.split("_")[2])
 
-    await restore_trial(tg_id)
+    await restore_trial(tg_id, session)
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(
-            text="🔙 Назад в меню администратора", callback_data="back_to_user_editor"
-        )
-    )
+    builder.row(InlineKeyboardButton(text="🔙 Назад в меню администратора", callback_data="admin"))
 
-    await callback_query.message.edit_text(
-        "✅ Триал успешно восстановлен.", reply_markup=builder.as_markup()
-    )
+    await callback_query.message.answer("✅ Триал успешно восстановлен.", reply_markup=builder.as_markup())
 
 
 @router.callback_query(F.data.startswith("change_balance_"), IsAdminFilter())
 async def process_balance_change(callback_query: CallbackQuery, state: FSMContext):
     tg_id = int(callback_query.data.split("_")[2])
     await state.update_data(tg_id=tg_id)
-
-    await callback_query.message.edit_text("💸 Введите новую сумму баланса:")
-    await callback_query.answer()
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+    await callback_query.message.answer("💸 Введите новую сумму баланса:", reply_markup=builder.as_markup())
     await state.set_state(UserEditorState.waiting_for_new_balance)
 
 
 @router.message(UserEditorState.waiting_for_new_balance, IsAdminFilter())
-async def handle_new_balance_input(message: types.Message, state: FSMContext):
+async def handle_new_balance_input(message: types.Message, state: FSMContext, session: Any):
     if not message.text.isdigit() or int(message.text) < 0:
-        await message.reply(
-            "❌ Пожалуйста, введите корректную сумму для изменения баланса."
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer(
+            "❌ Пожалуйста, введите корректную сумму для изменения баланса.", reply_markup=builder.as_markup()
         )
         return
 
@@ -133,258 +185,220 @@ async def handle_new_balance_input(message: types.Message, state: FSMContext):
     user_data = await state.get_data()
     tg_id = user_data.get("tg_id")
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        await conn.execute(
-            "UPDATE connections SET balance = $1 WHERE tg_id = $2", new_balance, tg_id
+    await session.execute(
+        "UPDATE connections SET balance = $1 WHERE tg_id = $2",
+        new_balance,
+        tg_id,
+    )
+
+    response_message = f"✅ Баланс успешно изменен на <b>{new_balance}</b>."
+
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(
+            text="🔙 Назад в меню администратора",
+            callback_data="admin",
         )
-
-        response_message = f"✅ Баланс успешно изменен на <b>{new_balance}</b>."
-
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="🔙 Назад в меню администратора",
-                callback_data="back_to_user_editor",
-            )
-        )
-        await message.reply(
-            response_message, reply_markup=builder.as_markup(), parse_mode="HTML"
-        )
-
-    finally:
-        await conn.close()
-
+    )
+    await message.answer(response_message, reply_markup=builder.as_markup())
     await state.clear()
 
 
+async def get_key_details(email, session):
+    record = await session.fetchrow(
+        """
+        SELECT k.key, k.expiry_time, k.server_id, c.tg_id, c.balance
+        FROM keys k
+        JOIN connections c ON k.tg_id = c.tg_id
+        WHERE k.email = $1
+        """,
+        email,
+    )
+
+    if not record:
+        return None
+
+    servers = await get_servers_from_db()
+
+    cluster_name = "Неизвестный кластер"
+    for cluster_name, cluster_servers in servers.items():
+        if any(server['inbound_id'] == record['server_id'] for server in cluster_servers):
+            cluster_name = cluster_name
+            break
+
+    expiry_date = datetime.utcfromtimestamp(record['expiry_time'] / 1000)
+    current_date = datetime.utcnow()
+    time_left = expiry_date - current_date
+
+    if time_left.total_seconds() <= 0:
+        days_left_message = "<b>Ключ истек.</b>"
+    elif time_left.days > 0:
+        days_left_message = f"Осталось дней: <b>{time_left.days}</b>"
+    else:
+        hours_left = time_left.seconds // 3600
+        days_left_message = f"Осталось часов: <b>{hours_left}</b>"
+
+    return {
+        'key': record['key'],
+        'expiry_date': expiry_date.strftime("%d %B %Y года"),
+        'days_left_message': days_left_message,
+        'server_name': cluster_name,
+        'balance': record['balance'],
+        'tg_id': record['tg_id'],
+    }
+
+
 @router.callback_query(F.data.startswith("edit_key_"), IsAdminFilter())
-async def process_key_edit(callback_query: CallbackQuery):
+async def process_key_edit(callback_query: CallbackQuery, session: Any):
     email = callback_query.data.split("_", 2)[2]
+    key_details = await get_key_details(email, session)
 
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            record = await conn.fetchrow(
-                """
-                SELECT k.key, k.expiry_time, k.server_id 
-                FROM keys k
-                WHERE k.email = $1
-            """,
-                email,
-            )
+    if not key_details:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await callback_query.message.answer(
+            "🔍 <b>Информация о ключе не найдена.</b> 🚫", reply_markup=builder.as_markup()
+        )
+        return
 
-            if record:
-                key = record["key"]
-                expiry_time = record["expiry_time"]
-                server_id = record["server_id"]
-                server_name = "Неизвестный сервер"
+    response_message = (
+        f"🔑 Ключ: <code>{key_details['key']}</code>\n"
+        f"⏰ Дата истечения: <b>{key_details['expiry_date']}</b>\n"
+        f"💰 Баланс пользователя: <b>{key_details['balance']}</b>\n"
+        f"🌐 Кластер: <b>{key_details['server_name']}</b>"
+    )
 
-                for cluster in CLUSTERS.values():
-                    if server_id in cluster:
-                        server_name = cluster[server_id].get(
-                            "name", "Неизвестный сервер"
-                        )
-                        break
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(
+            text="ℹ️ Получить информацию о юзере",
+            callback_data=f"user_info|{key_details['tg_id']}",
+        )
+    )
+    builder.row(
+        InlineKeyboardButton(
+            text="⏳ Изменить время истечения",
+            callback_data=f"change_expiry|{email}",
+        )
+    )
+    builder.row(
+        InlineKeyboardButton(
+            text="❌ Удалить ключ",
+            callback_data=f"delete_key_admin|{email}",
+        )
+    )
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
 
-                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 = "<b>Ключ истек.</b>"
-                elif time_left.days > 0:
-                    days_left_message = f"Осталось дней: <b>{time_left.days}</b>"
-                else:
-                    hours_left = time_left.seconds // 3600
-                    days_left_message = f"Осталось часов: <b>{hours_left}</b>"
-
-                formatted_expiry_date = expiry_date.strftime("%d %B %Y года")
-
-                response_message = (
-                    f"Ключ: <pre>{key}</pre>\n"
-                    f"Дата истечения: <b>{formatted_expiry_date}</b>\n"
-                    f"{days_left_message}\n"
-                    f"Сервер: <b>{server_name}</b>"
-                )
-
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    InlineKeyboardButton(
-                        text="⏳ Изменить время истечения",
-                        callback_data=f"change_expiry|{email}",
-                    ),
-                    InlineKeyboardButton(
-                        text="❌ Удалить ключ",
-                        callback_data=f"delete_key_admin|{email}",
-                    ),
-                )
-                builder.row(
-                    InlineKeyboardButton(
-                        text="🔙 Назад", callback_data="back_to_user_editor"
-                    )
-                )
-                await callback_query.message.edit_text(
-                    response_message,
-                    reply_markup=builder.as_markup(),
-                    parse_mode="HTML",
-                )
-            else:
-                await callback_query.message.edit_text(
-                    "<b>Информация о ключе не найдена.</b>", parse_mode="HTML"
-                )
-
-        finally:
-            await conn.close()
-
-    except Exception as e:
-        logger.error(f"Ошибка при получении информации о ключе: {e}")
-    await callback_query.answer()
+    await callback_query.message.answer(response_message, reply_markup=builder.as_markup())
 
 
 @router.callback_query(F.data == "search_by_key_name", IsAdminFilter())
 async def prompt_key_name(callback_query: CallbackQuery, state: FSMContext):
-    await callback_query.message.edit_text("🔑 Введите имя ключа:")
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+    await callback_query.message.answer("🔑 Введите имя ключа:", reply_markup=builder.as_markup())
     await state.set_state(UserEditorState.waiting_for_key_name)
 
 
 @router.message(UserEditorState.waiting_for_key_name, IsAdminFilter())
-async def handle_key_name_input(message: types.Message, state: FSMContext):
+async def handle_key_name_input(message: types.Message, state: FSMContext, session: Any):
     key_name = sanitize_key_name(message.text)
+    key_details = await get_key_details(key_name, session)
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        user_records = await conn.fetch(
-            """
-            SELECT c.tg_id, c.balance, k.email, k.key, k.expiry_time, k.server_id 
-            FROM connections c 
-            JOIN keys k ON c.tg_id = k.tg_id 
-            WHERE k.email = $1
-        """,
-            key_name,
+    if not key_details:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer(
+            "🚫 Пользователь с указанным именем ключа не найден.",
+            reply_markup=builder.as_markup(),
         )
+        await state.clear()
+        return
 
-        if not user_records:
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(
-                    text="🔙 Назад в меню администратора",
-                    callback_data="back_to_user_editor",
-                )
-            )
+    response_message = (
+        f"🔑 Ключ: <code>{key_details['key']}</code>\n"
+        f"⏰ Дата истечения: <b>{key_details['expiry_date']}</b>\n"
+        f"💰 Баланс пользователя: <b>{key_details['balance']}</b>\n"
+        f"🌐 Сервер: <b>{key_details['server_name']}</b>"
+    )
 
-            await message.reply(
-                "🚫 Пользователь с указанным именем ключа не найден.",
-                reply_markup=builder.as_markup(),
-            )
-            await state.clear()
-            return
-
-        response_messages = []
-        key_buttons = InlineKeyboardBuilder()
-
-        for record in user_records:
-            balance = record["balance"]
-            email = record["email"]
-            key = record["key"]
-            expiry_time = record["expiry_time"]
-            server_id = record["server_id"]
-            server_name = "Неизвестный сервер"
-
-            for cluster in CLUSTERS.values():
-                if server_id in cluster:
-                    server_name = cluster[server_id].get("name", "Неизвестный сервер")
-                    break
-
-            expiry_date = datetime.utcfromtimestamp(expiry_time / 1000).strftime(
-                "%d %B %Y"
-            )
-
-            response_messages.append(
-                f"🔑 Ключ: <pre>{key}</pre>\n"
-                f"⏰ Дата истечения: <b>{expiry_date}</b>\n"
-                f"💰 Баланс пользователя: <b>{balance}</b>\n"
-                f"🌐 Сервер: <b>{server_name}</b>"
-            )
-
-            key_buttons.row(
-                InlineKeyboardButton(
-                    text="⏳ Изменить время истечения",
-                    callback_data=f"change_expiry|{email}",
-                )
-            )
-            key_buttons.row(
-                InlineKeyboardButton(
-                    text="❌ Удалить ключ", callback_data=f"delete_key_admin|{email}"
-                )
-            )
-
-        key_buttons.row(
-            InlineKeyboardButton(text="🔙 Назад", callback_data="back_to_user_editor")
+    key_buttons = InlineKeyboardBuilder()
+    key_buttons.row(
+        InlineKeyboardButton(
+            text="ℹ️ Получить информацию о юзере",
+            callback_data=f"user_info|{key_details['tg_id']}",
         )
-
-        await message.reply(
-            "\n".join(response_messages),
-            reply_markup=key_buttons.as_markup(),
-            parse_mode="HTML",
+    )
+    key_buttons.row(
+        InlineKeyboardButton(
+            text="⏳ Изменить время истечения",
+            callback_data=f"change_expiry|{key_name}",
         )
+    )
+    key_buttons.row(
+        InlineKeyboardButton(
+            text="❌ Удалить ключ",
+            callback_data=f"delete_key_admin|{key_name}",
+        )
+    )
+    key_buttons.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
 
-    finally:
-        await conn.close()
-
+    await message.answer(response_message, reply_markup=key_buttons.as_markup())
     await state.clear()
 
 
 @router.callback_query(F.data.startswith("change_expiry|"), IsAdminFilter())
 async def prompt_expiry_change(callback_query: CallbackQuery, state: FSMContext):
     email = callback_query.data.split("|")[1]
-    await callback_query.message.edit_text(
-        f"⏳ Введите новое время истечения для ключа <b>{email}</b> в формате <code>YYYY-MM-DD HH:MM:SS</code>:",
-        parse_mode="HTML",
+    await callback_query.message.answer(
+        f"⏳ Введите новое время истечения для ключа <b>{email}</b> в формате <code>YYYY-MM-DD HH:MM:SS</code>:"
     )
     await state.update_data(email=email)
     await state.set_state(UserEditorState.waiting_for_expiry_time)
 
 
 @router.message(UserEditorState.waiting_for_expiry_time, IsAdminFilter())
-async def handle_expiry_time_input(message: types.Message, state: FSMContext):
+async def handle_expiry_time_input(message: types.Message, state: FSMContext, session: Any):
     user_data = await state.get_data()
     email = user_data.get("email")
 
     if not email:
-        await message.reply("Email не найден в состоянии.")
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer("📧 Email не найден в состоянии. 🚫", reply_markup=builder.as_markup())
         await state.clear()
         return
 
     try:
         expiry_time_str = message.text
-        expiry_time = int(
-            datetime.strptime(expiry_time_str, "%Y-%m-%d %H:%M:%S").timestamp() * 1000
-        )
+        expiry_time = int(datetime.strptime(expiry_time_str, "%Y-%m-%d %H:%M:%S").timestamp() * 1000)
 
         client_id = await get_client_id_by_email(email)
         if client_id is None:
-            await message.reply(f"Клиент с email {email} не найден.")
+            builder = InlineKeyboardBuilder()
+            builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+            await message.answer(f"🚫 Клиент с email {email} не найден. 🔍", reply_markup=builder.as_markup())
             await state.clear()
             return
 
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            record = await conn.fetchrow(
-                "SELECT server_id FROM keys WHERE client_id = $1", client_id
-            )
-            if not record:
-                await message.reply("Клиент не найден в базе данных.")
-                await state.clear()
-                return
+        record = await session.fetchrow("SELECT server_id FROM keys WHERE client_id = $1", client_id)
+        if not record:
+            builder = InlineKeyboardBuilder()
+            builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+            await message.answer("🚫 Клиент не найден в базе данных. 🔍", reply_markup=builder.as_markup())
+            await state.clear()
+            return
 
-            async def update_key_on_all_servers():
-                tasks = []
-                for cluster_id in CLUSTERS:
+        clusters = await get_servers_from_db()
+
+        async def update_key_on_all_servers():
+            tasks = []
+            for cluster_name, cluster_servers in clusters.items():
+                for server in cluster_servers:
                     tasks.append(
                         asyncio.create_task(
                             renew_key_in_cluster(
-                                cluster_id,
+                                cluster_name,
                                 email,
                                 client_id,
                                 expiry_time,
@@ -392,152 +406,122 @@ async def handle_expiry_time_input(message: types.Message, state: FSMContext):
                             )
                         )
                     )
-                await asyncio.gather(*tasks)
+            await asyncio.gather(*tasks)
 
-            await update_key_on_all_servers()
+        await update_key_on_all_servers()
 
-            await update_key_expiry(client_id, expiry_time)
+        await update_key_expiry(client_id, expiry_time)
 
-            response_message = f"✅ Время истечения ключа для клиента {client_id} ({email}) успешно обновлено на всех серверах."
-
-            builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(
-                    text="🔙 Назад", callback_data="back_to_user_editor"
-                )
-            )
-            await message.reply(
-                response_message, reply_markup=builder.as_markup(), parse_mode="HTML"
-            )
-
-        finally:
-            await conn.close()
+        response_message = (
+            f"✅ Время истечения ключа для клиента {client_id} ({email}) успешно обновлено на всех серверах."
+        )
 
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
+        await message.answer(response_message, reply_markup=builder.as_markup())
     except ValueError:
-        await message.reply("❌ Пожалуйста, используйте формат: YYYY-MM-DD HH:MM:SS.")
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await message.answer(
+            "❌ Пожалуйста, используйте формат: YYYY-MM-DD HH:MM:SS.", reply_markup=builder.as_markup()
+        )
     except Exception as e:
-        await message.reply(f"Произошла ошибка: {e}")
-
+        logger.error(e)
     await state.clear()
 
 
 @router.callback_query(F.data.startswith("delete_key_admin|"), IsAdminFilter())
-async def process_callback_delete_key(callback_query: types.CallbackQuery):
-    tg_id = callback_query.from_user.id
+async def process_callback_delete_key(callback_query: types.CallbackQuery, session: Any):
     email = callback_query.data.split("|")[1]
+    client_id = await session.fetchval("SELECT client_id FROM keys WHERE email = $1", email)
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        client_id = await conn.fetchval(
-            "SELECT client_id FROM keys WHERE email = $1", email
-        )
-
-        if client_id is None:
-            await bot.edit_message_text(
-                "Ключ не найден.",
-                chat_id=tg_id,
-                message_id=callback_query.message.message_id,
-            )
-            return
-
+    if client_id is None:
         builder = InlineKeyboardBuilder()
-        builder.row(
-            types.InlineKeyboardButton(
-                text="✅ Да, удалить", callback_data=f"confirm_delete_admin|{client_id}"
-            )
-        )
-        builder.row(
-            types.InlineKeyboardButton(
-                text="❌ Нет, отменить", callback_data="view_keys"
-            )
-        )
-        await bot.edit_message_text(
-            "<b>❓ Вы уверены, что хотите удалить ключ?</b>",
-            chat_id=tg_id,
-            message_id=callback_query.message.message_id,
-            reply_markup=builder.as_markup(),
-            parse_mode="HTML",
-        )
-    finally:
-        await conn.close()
+        builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
+        await callback_query.message.answer("🔍 Ключ не найден. 🚫", reply_markup=builder.as_markup())
+        return
 
-    await callback_query.answer()
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        types.InlineKeyboardButton(
+            text="✅ Да, удалить",
+            callback_data=f"confirm_delete_admin|{client_id}",
+        )
+    )
+    builder.row(types.InlineKeyboardButton(text="❌ Нет, отменить", callback_data="user_editor"))
+    await callback_query.message.answer(
+        "<b>❓ Вы уверены, что хотите удалить ключ?</b>",
+        reply_markup=builder.as_markup(),
+    )
 
 
 @router.callback_query(F.data.startswith("confirm_delete_admin|"), IsAdminFilter())
-async def process_callback_confirm_delete(callback_query: types.CallbackQuery):
-    tg_id = callback_query.from_user.id
+async def process_callback_confirm_delete(callback_query: types.CallbackQuery, session: Any):
     client_id = callback_query.data.split("|")[1]
+    record = await session.fetchrow("SELECT email FROM keys WHERE client_id = $1", client_id)
 
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            record = await conn.fetchrow(
-                "SELECT email FROM keys WHERE client_id = $1", client_id
-            )
+    if record:
+        email = record["email"]
+        response_message = "✅ Ключ успешно удален."
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
 
-            if record:
-                email = record["email"]
-                response_message = "✅ Ключ успешно удален."
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys")
-                )
+        clusters = await get_servers_from_db()
 
-                async def delete_key_from_servers(email, client_id):
-                    tasks = []
-                    for cluster_id in CLUSTERS:
-                        tasks.append(
-                            delete_key_from_cluster(cluster_id, email, client_id)
-                        )
-                    await asyncio.gather(*tasks)
+        async def delete_key_from_servers(email, client_id):
+            tasks = []
+            for cluster_name, cluster_servers in clusters.items():
+                for server in cluster_servers:
+                    tasks.append(delete_key_from_cluster(cluster_name, email, client_id))
+            await asyncio.gather(*tasks)
 
-                await delete_key_from_servers(email, client_id)
-                await delete_key_from_db(client_id)
+        await delete_key_from_servers(email, client_id)
+        await delete_key_from_db(client_id, session)
 
-                await bot.edit_message_text(
-                    response_message,
-                    chat_id=tg_id,
-                    message_id=callback_query.message.message_id,
-                    reply_markup=builder.as_markup(),
-                )
-            else:
-                response_message = "🚫 Ключ не найден или уже удален."
-                builder = InlineKeyboardBuilder()
-                builder.row(
-                    InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys")
-                )
-                await bot.edit_message_text(
-                    response_message,
-                    chat_id=tg_id,
-                    message_id=callback_query.message.message_id,
-                    reply_markup=builder.as_markup(),
-                )
+        await callback_query.message.answer(response_message, reply_markup=builder.as_markup())
+    else:
+        response_message = "🚫 Ключ не найден или уже удален."
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys"))
+        await callback_query.message.answer(response_message, reply_markup=builder.as_markup())
 
-        finally:
-            await conn.close()
 
-    except Exception as e:
-        await bot.edit_message_text(
-            f"Ошибка при удалении ключа: {e}",
-            chat_id=tg_id,
-            message_id=callback_query.message.message_id,
+@router.callback_query(F.data.startswith("user_info|"), IsAdminFilter())
+async def handle_user_info(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
+    tg_id = int(callback_query.data.split("|")[1])
+    username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id)
+    balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id)
+    key_records = await session.fetch("SELECT email FROM keys WHERE tg_id = $1", tg_id)
+    referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id)
+
+    builder = InlineKeyboardBuilder()
+
+    for (email,) in key_records:
+        builder.row(InlineKeyboardButton(text=f"🔑 {email}", callback_data=f"edit_key_{email}"))
+
+    builder.row(
+        InlineKeyboardButton(
+            text="📝 Изменить баланс",
+            callback_data=f"change_balance_{tg_id}",
         )
+    )
 
-    await callback_query.answer()
+    builder.row(
+        InlineKeyboardButton(
+            text="🔄 Восстановить пробник",
+            callback_data=f"restore_trial_{tg_id}",
+        )
+    )
 
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
 
-async def delete_key_from_db(client_id):
-    """Удаление ключа из базы данных"""
-    try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        await conn.execute("DELETE FROM keys WHERE client_id = $1", client_id)
-    except Exception as e:
-        logger.error(f"Ошибка при удалении ключа {client_id} из базы данных: {e}")
-    finally:
-        await conn.close()
-
-
-@router.callback_query(F.data == "back_to_user_editor")
-async def back_to_user_editor(callback_query: CallbackQuery):
-    await back_to_admin_menu(callback_query)
+    user_info = (
+        f"📊 Информация о пользователе:\n\n"
+        f"🆔 ID пользователя: <b>{tg_id}</b>\n"
+        f"👤 Логин пользователя: <b>@{username}</b>\n"
+        f"💰 Баланс: <b>{balance}</b>\n"
+        f"👥 Количество рефералов: <b>{referral_count}</b>\n"
+        f"🔑 Ключи (для редактирования нажмите на ключ):"
+    )
+    await callback_query.message.answer(user_info, reply_markup=builder.as_markup())
+    await state.set_state(UserEditorState.displaying_user_info)

handlers/commands.py

@@ -1,17 +0,0 @@
-from aiogram import Router, types
-from aiogram.filters import Command
-from aiogram.fsm.context import FSMContext
-
-from handlers.start import start_command
-
-router = Router()
-
-
-@router.message(Command("start"))
-async def handle_start(message: types.Message, state: FSMContext):
-    await start_command(message)
-
-
-@router.message(Command("menu"))
-async def handle_menu(message: types.Message, state: FSMContext):
-    await start_command(message)

handlers/coupons.py

@@ -1,15 +1,13 @@
 from datetime import datetime
+from typing import Any
 
-import asyncpg
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from config import DATABASE_URL
 from database import update_balance
-from logger import logger
 
 
 class CouponActivationState(StatesGroup):
@@ -20,109 +18,76 @@ router = Router()
 
 
 @router.callback_query(F.data == "activate_coupon")
-async def handle_activate_coupon(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    try:
-        await callback_query.message.delete()
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
-
+async def handle_activate_coupon(callback_query: types.CallbackQuery, state: FSMContext):
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="⬅️ Вернуться в профиль", callback_data="view_profile")
-    )
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
     await callback_query.message.answer(
-        "<b>Введите код купона:</b>\n\n"
-        "Пожалуйста, введите действующий код купона, который вы хотите активировать.",
-        parse_mode="HTML",
+        "<b>🎫 Введите код купона:</b>\n\n"
+        "📝 Пожалуйста, введите действующий код купона, который вы хотите активировать. 🔑",
         reply_markup=builder.as_markup(),
     )
     await state.set_state(CouponActivationState.waiting_for_coupon_code)
-    await callback_query.answer()
 
 
 @router.message(CouponActivationState.waiting_for_coupon_code)
-async def process_coupon_code(message: types.Message, state: FSMContext):
-    try:
-        await message.delete()
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
-
+async def process_coupon_code(message: types.Message, state: FSMContext, session: Any):
     coupon_code = message.text.strip()
-    activation_result = await activate_coupon(message.from_user.id, coupon_code)
+    activation_result = await activate_coupon(message.chat.id, coupon_code, session)
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="view_profile")
-    )
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    markup = builder.as_markup()
-
-    await message.answer(activation_result, reply_markup=markup, parse_mode="HTML")
+    await message.answer(activation_result, reply_markup=builder.as_markup(), parse_mode="HTML")
     await state.clear()
 
 
-async def activate_coupon(user_id: int, coupon_code: str):
-    """Функция для активации купона"""
-    conn = await asyncpg.connect(DATABASE_URL)
+async def activate_coupon(user_id: int, coupon_code: str, session: Any):
+    coupon_record = await session.fetchrow(
+        """
+        SELECT id, usage_limit, usage_count, is_used, amount
+        FROM coupons
+        WHERE code = $1 AND (usage_count < usage_limit OR usage_limit = 0) AND is_used = FALSE
+    """,
+        coupon_code,
+    )
 
-    try:
-        coupon_record = await conn.fetchrow(
+    if not coupon_record:
+        return "<b>❌ Купон не найден</b> 🚫 или его использование ограничено. 🔒 Пожалуйста, проверьте код и попробуйте снова. 🔍"
+
+    usage_exists = await session.fetchrow(
+        """
+        SELECT 1 FROM coupon_usages WHERE coupon_id = $1 AND user_id = $2
+    """,
+        coupon_record["id"],
+        user_id,
+    )
+
+    if usage_exists:
+        return "<b>❌ Вы уже активировали этот купон.</b> 🚫 Купоны могут быть активированы только один раз. 🔒"
+
+    coupon_amount = coupon_record["amount"]
+
+    async with session.transaction():
+        await session.execute(
             """
-            SELECT id, usage_limit, usage_count, is_used, amount
-            FROM coupons
-            WHERE code = $1 AND (usage_count < usage_limit OR usage_limit = 0) AND is_used = FALSE
+            UPDATE coupons
+            SET usage_count = usage_count + 1,
+                is_used = CASE WHEN usage_count + 1 >= usage_limit AND usage_limit > 0 THEN TRUE ELSE FALSE END
+            WHERE id = $1
         """,
-            coupon_code,
+            coupon_record["id"],
         )
 
-        if not coupon_record:
-            return "<b>❌ Купон не найден</b> или его использование ограничено. Пожалуйста, проверьте код и попробуйте снова."
-
-        usage_exists = await conn.fetchrow(
+        await session.execute(
             """
-            SELECT 1 FROM coupon_usages WHERE coupon_id = $1 AND user_id = $2
+            INSERT INTO coupon_usages (coupon_id, user_id, used_at)
+            VALUES ($1, $2, $3)
         """,
             coupon_record["id"],
             user_id,
+            datetime.utcnow(),
         )
 
-        if usage_exists:
-            return "<b>❌ Вы уже активировали этот купон.</b> Купоны могут быть активированы только один раз."
-
-        coupon_amount = coupon_record["amount"]
-
-        async with conn.transaction():
-            await conn.execute(
-                """
-                UPDATE coupons
-                SET usage_count = usage_count + 1,
-                    is_used = CASE WHEN usage_count + 1 >= usage_limit AND usage_limit > 0 THEN TRUE ELSE FALSE END
-                WHERE id = $1
-            """,
-                coupon_record["id"],
-            )
-
-            await conn.execute(
-                """
-                INSERT INTO coupon_usages (coupon_id, user_id, used_at)
-                VALUES ($1, $2, $3)
-            """,
-                coupon_record["id"],
-                user_id,
-                datetime.utcnow(),
-            )
-
-        await update_balance(user_id, coupon_amount)
-        return f"<b>✅ Купон успешно активирован!</b>\n\nНа ваш баланс добавлено <b>{coupon_amount} рублей</b>."
-
-    except Exception as e:
-        logger.error(f"Ошибка при активации купона: {e}")
-        return (
-            "<b>⚠️ Произошла ошибка при активации купона.</b>\nПопробуйте ещё раз позже."
-        )
-
-    finally:
-        await conn.close()
+    await update_balance(user_id, coupon_amount)
+    return f"<b>✅ Купон успешно активирован! 🎉</b>\n\nНа ваш баланс добавлено <b>{coupon_amount} рублей</b> 💰."

handlers/donate.py

@@ -4,7 +4,6 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, LabeledPrice, PreCheckoutQuery
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
 from config import RUB_TO_XTR
 from logger import logger
 
@@ -20,59 +19,40 @@ router = Router()
 
 @router.callback_query(F.data == "donate")
 async def process_donate(callback_query: types.CallbackQuery, state: FSMContext):
-
-    try:
-        await callback_query.message.delete()
-    except Exception as e:
-        logger.error(f"Не удалось удалить сообщение: {e}")
+    await state.clear()
 
     builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"))
     builder.row(
         InlineKeyboardButton(
-            text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"
+            text="💰 Ввести сумму доната",
+            callback_data="enter_custom_donate_amount",
         )
     )
-    builder.row(
-        InlineKeyboardButton(
-            text="💰 Ввести сумму доната", callback_data="enter_custom_donate_amount"
-        )
-    )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_profile"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    await bot.send_message(
-        chat_id=callback_query.from_user.id,
-        text="🌟 Поддержите наш проект!\n\n"
-        "Каждый донат помогает развивать и улучшать сервис. "
-        "Мы ценим вашу поддержку и работаем над тем, чтобы сделать наш продукт еще лучше. 💡",
+    await callback_query.message.answer(
+        text="🌟 Поддержите наш проект! 💪\n\n"
+        "💖 Каждый донат помогает развивать и улучшать сервис. "
+        "🤝 Мы ценим вашу поддержку и работаем над тем, чтобы сделать наш продукт еще лучше. 🚀💡",
         reply_markup=builder.as_markup(),
     )
 
-    await callback_query.answer()
-
 
 @router.callback_query(F.data == "enter_custom_donate_amount")
-async def process_enter_donate_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    await callback_query.message.edit_text(f"💸 Введите сумму доната в рублях:")
+async def process_enter_donate_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="donate"))
+    await callback_query.message.answer(f"💸 Введите сумму доната в рублях:", reply_markup=builder.as_markup())
     await state.set_state(DonateState.entering_donate_amount)
-    await callback_query.answer()
 
 
 @router.message(DonateState.entering_donate_amount)
 async def process_donate_amount_input(message: types.Message, state: FSMContext):
-
-    try:
-        await message.delete()
-    except Exception as e:
-        logger.error(f"Не удалось удалить сообщение: {e}")
-
     if message.text.isdigit():
         amount = int(message.text)
         if amount // RUB_TO_XTR <= 0:
-            await message.answer(
-                f"Сумма доната должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer(f"Сумма доната должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:")
             return
 
         await state.update_data(amount=amount)
@@ -95,7 +75,6 @@ async def process_donate_amount_input(message: types.Message, state: FSMContext)
             await state.set_state(DonateState.waiting_for_donate_payment)
         except Exception as e:
             logger.error(f"Ошибка при создании доната: {e}")
-            await message.answer("Произошла ошибка при создании доната.")
     else:
         await message.answer("Некорректная сумма. Пожалуйста, введите сумму еще раз:")
 
@@ -108,37 +87,14 @@ async def on_pre_checkout_query(pre_checkout_query: PreCheckoutQuery):
 @router.message(F.successful_payment, DonateState.waiting_for_donate_payment)
 async def on_successful_donate(message: types.Message, state: FSMContext):
     try:
-        user_id = int(message.from_user.id)
         amount = float(message.successful_payment.invoice_payload.split("_")[0])
-        logger.debug(f"Donate succeeded for user_id: {user_id}, amount: {amount}")
-
-        state_data = await state.get_data()
-        previous_message_id = state_data.get("last_message_id")
-
-        if previous_message_id:
-            try:
-                await bot.delete_message(
-                    chat_id=user_id, message_id=previous_message_id
-                )
-            except Exception as e:
-                logger.error(f"Не удалось удалить сообщение: {e}")
-
         builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(
-                text="Вернуться в профиль", callback_data="view_profile"
-            )
-        )
-
-        sent_message = await bot.send_message(
-            chat_id=user_id,
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+        await message.answer(
             text=f"🙏 Спасибо за донат {amount} рублей! Ваша поддержка очень важна для нас. 💖",
             reply_markup=builder.as_markup(),
         )
-
-        await state.update_data(last_message_id=sent_message.message_id)
         await state.clear()
-
     except ValueError as e:
         logger.error(f"Ошибка конвертации user_id или amount: {e}")
     except Exception as e:

handlers/instructions/instructions.py

@@ -1,77 +1,65 @@
 import os
+from typing import Any
 
 from aiogram import F, Router, types
-from aiogram.types import BufferedInputFile, InlineKeyboardButton, InlineKeyboardMarkup
+from aiogram.types import BufferedInputFile, InlineKeyboardButton
+from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
-from config import CONNECT_WINDOWS, SUPPORT_CHAT_URL
+from config import CONNECT_IOS, CONNECT_WINDOWS, SUPPORT_CHAT_URL
 from handlers.texts import INSTRUCTION_PC, INSTRUCTIONS, KEY_MESSAGE
-from logger import logger
 
 router = Router()
 
 
+@router.callback_query(F.data == "instructions")
 async def send_instructions(callback_query: types.CallbackQuery):
-    await callback_query.message.delete()
-
     instructions_message = INSTRUCTIONS
-
-    image_path = os.path.join(os.path.dirname(__file__), "instructions.jpg")
-
+    image_path = os.path.join("img", "instructions.jpg")
     if not os.path.isfile(image_path):
         await callback_query.message.answer("Файл изображения не найден.")
-        await callback_query.answer()
         return
 
-    back_button = InlineKeyboardButton(
-        text="⬅️ Вернуться в профиль", callback_data="view_profile"
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
+    builder.row(
+        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"),
     )
-    keyboard = InlineKeyboardMarkup(inline_keyboard=[[back_button]])
 
     with open(image_path, "rb") as image_from_buffer:
         await callback_query.message.answer_photo(
             BufferedInputFile(image_from_buffer.read(), filename="instructions.jpg"),
             caption=instructions_message,
-            parse_mode="Markdown",
-            reply_markup=keyboard,
+            reply_markup=builder.as_markup(),
         )
 
-    await callback_query.answer()
-
 
 @router.callback_query(F.data.startswith("connect_pc|"))
-async def process_connect_pc(callback_query: types.CallbackQuery):
-    tg_id = callback_query.from_user.id
-    key = callback_query.data.split("|")[1]
+async def process_connect_pc(callback_query: types.CallbackQuery, session: Any):
+    tg_id = callback_query.message.chat.id
+    key_name = callback_query.data.split("|")[1]
 
-    try:
-        await bot.delete_message(
-            chat_id=tg_id, message_id=callback_query.message.message_id
-        )
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
+    record = await session.fetchrow(
+        """
+        SELECT k.key
+        FROM keys k
+        WHERE k.tg_id = $1 AND k.email = $2
+        """,
+        tg_id,
+        key_name,
+    )
 
+    if not record:
+        await callback_query.message.answer("❌ <b>Ключ не найден. Проверьте имя ключа.</b> 🔍")
+        return
+
+    key = record["key"]
     key_message = KEY_MESSAGE.format(key)
-
     instruction_message = f"{key_message}{INSTRUCTION_PC}"
 
-    connect_windows_button = types.InlineKeyboardButton(
-        text="💻 Подключить Windows", url=f"{CONNECT_WINDOWS}{key}"
-    )
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="💻 Подключить Windows", url=f"{CONNECT_WINDOWS}{key}"))
+    builder.row(InlineKeyboardButton(text="💻 Подключить MacOS", url=f"{CONNECT_IOS}{key}"))
+    builder.row(InlineKeyboardButton(text="🆘 Поддержка", url=f"{SUPPORT_CHAT_URL}"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-    support_button = types.InlineKeyboardButton(
-        text="🆘 Поддержка", url=f"{SUPPORT_CHAT_URL}"
-    )
-
-    back_button = types.InlineKeyboardButton(
-        text="🔙 Назад в профиль", callback_data="view_profile"
-    )
-
-    inline_keyboard = [[connect_windows_button], [support_button], [back_button]]
-    keyboard = types.InlineKeyboardMarkup(inline_keyboard=inline_keyboard)
-
-    await bot.send_message(
-        tg_id, instruction_message, reply_markup=keyboard, parse_mode="HTML"
-    )
-
-    await callback_query.answer()
+    await callback_query.message.answer(instruction_message, reply_markup=builder.as_markup())

handlers/keys/key_management.py

@@ -1,21 +1,29 @@
 import asyncio
-import uuid
 from datetime import datetime, timedelta
+from typing import Any, Union
+import uuid
 
-import asyncpg
 from aiogram import F, Router
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, Message
+from aiogram.types import CallbackQuery, InlineKeyboardButton, Message
+from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot, dp
-from config import CONNECT_ANDROID, CONNECT_IOS, DATABASE_URL, DOWNLOAD_ANDROID, DOWNLOAD_IOS, PUBLIC_LINK
-from database import add_connection, get_balance, store_key, update_balance
-from handlers.instructions.instructions import send_instructions
+from config import (
+    CONNECT_ANDROID,
+    CONNECT_IOS,
+    DOWNLOAD_ANDROID,
+    DOWNLOAD_IOS,
+    PUBLIC_LINK,
+    RENEWAL_PLANS,
+    RENEWAL_PRICES,
+    SUPPORT_CHAT_URL,
+    TRIAL_TIME,
+)
+from database import get_balance, get_trial, store_key, update_balance
 from handlers.keys.key_utils import create_key_on_cluster
-from handlers.profile import process_callback_view_profile
-from handlers.texts import KEY, KEY_TRIAL, NULL_BALANCE, RENEWAL_PLANS, key_message_success
-from handlers.utils import get_least_loaded_cluster, sanitize_key_name
+from handlers.texts import KEY, NULL_BALANCE, key_message_success
+from handlers.utils import generate_random_email, get_least_loaded_cluster
 from logger import logger
 
 router = Router()
@@ -28,220 +36,149 @@ class Form(StatesGroup):
     waiting_for_message = State()
 
 
-@dp.callback_query(F.data == "create_key")
-async def process_callback_create_key(callback_query: CallbackQuery, state: FSMContext):
-    tg_id = callback_query.from_user.id
-
-    try:
-        await bot.delete_message(
-            chat_id=tg_id, message_id=callback_query.message.message_id
-        )
-    except Exception:
-        pass
-
+@router.callback_query(F.data == "create_key")
+async def process_callback_create_key(callback_query: CallbackQuery, state: FSMContext, session: Any):
     server_id = "все сервера"
     await state.update_data(selected_server_id=server_id)
-    await select_server(callback_query, state)
-    await callback_query.answer()
+    await select_server(callback_query, state, session)
 
 
-async def select_server(callback_query: CallbackQuery, state: FSMContext):
-
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        existing_connection = await conn.fetchrow(
-            "SELECT trial FROM connections WHERE tg_id = $1",
-            callback_query.from_user.id,
-        )
-    finally:
-        await conn.close()
-
-    trial_status = existing_connection["trial"] if existing_connection else 0
-
+async def select_server(callback_query: CallbackQuery, state: FSMContext, session: Any):
+    trial_status = await get_trial(callback_query.message.chat.id, session)
     if trial_status == 1:
-        await bot.send_message(
-            chat_id=callback_query.from_user.id,
+        builder = InlineKeyboardBuilder()
+        builder.row(
+            InlineKeyboardButton(text="✅ Да, подключить новое устройство", callback_data="confirm_create_new_key")
+        )
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+        await callback_query.message.answer(
             text=KEY,
-            parse_mode="HTML",
-            reply_markup=InlineKeyboardMarkup(
-                inline_keyboard=[
-                    [
-                        InlineKeyboardButton(
-                            text="✅ Да, подключить новое устройство",
-                            callback_data="confirm_create_new_key",
-                        )
-                    ],
-                    [
-                        InlineKeyboardButton(
-                            text="↩️ Назад", callback_data="cancel_create_key"
-                        )
-                    ],
-                ]
-            ),
+            reply_markup=builder.as_markup(),
         )
         await state.update_data(creating_new_key=True)
     else:
-        await bot.send_message(
-            chat_id=callback_query.from_user.id, text=KEY_TRIAL, parse_mode="HTML"
-        )
-        await state.set_state(Form.waiting_for_key_name)
-
-    await callback_query.answer()
+        await handle_key_creation(callback_query.message.chat.id, state, session, callback_query)
 
 
-@dp.callback_query(F.data == "confirm_create_new_key")
-async def confirm_create_new_key(callback_query: CallbackQuery, state: FSMContext):
-    tg_id = callback_query.from_user.id
+@router.callback_query(F.data == "confirm_create_new_key")
+async def confirm_create_new_key(callback_query: CallbackQuery, state: FSMContext, session: Any):
+    tg_id = callback_query.message.chat.id
 
     logger.info(f"User {tg_id} confirmed creation of a new key.")
 
     balance = await get_balance(tg_id)
     if balance < RENEWAL_PLANS["1"]["price"]:
-        replenish_button = InlineKeyboardButton(
-            text="Перейти в профиль", callback_data="view_profile"
-        )
-        keyboard = InlineKeyboardMarkup(inline_keyboard=[[replenish_button]])
-        await callback_query.message.edit_text(NULL_BALANCE, reply_markup=keyboard)
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+        await callback_query.message.answer(NULL_BALANCE, reply_markup=builder.as_markup())
         await state.clear()
         return
 
-    logger.info(f"Balance for user {tg_id} is sufficient. Asking for device name.")
+    logger.info(f"Balance for user {tg_id} is sufficient. Proceeding with key creation.")
 
-    await callback_query.message.edit_text(
-        "🔑 Пожалуйста, введите имя подключаемого устройства:"
-    )
-    await state.set_state(Form.waiting_for_key_name)
-    logger.info(f"State set to waiting_for_key_name for user {tg_id}")
-    await state.update_data(creating_new_key=True)
-
-    await callback_query.answer()
+    await handle_key_creation(tg_id, state, session, callback_query)
 
 
-@dp.callback_query(F.data == "cancel_create_key")
-async def cancel_create_key(callback_query: CallbackQuery, state: FSMContext):
-    await process_callback_view_profile(callback_query, state)
-    await callback_query.answer()
+async def handle_key_creation(
+    tg_id: int, state: FSMContext, session: Any, message_or_query: Union[Message, CallbackQuery]
+):
+    """Создание ключа с учётом выбора тарифного плана."""
+    current_time = datetime.utcnow()
+    trial_status = await get_trial(tg_id, session)
 
-
-@router.message(Form.waiting_for_key_name)
-async def handle_key_name_input(message: Message, state: FSMContext):
-    tg_id = message.from_user.id
-    key_name = sanitize_key_name(message.text)
-
-    logger.info(f"User {tg_id} is attempting to create a key with the name: {key_name}")
-
-    if not key_name:
-        await message.bot.send_message(
-            tg_id, "📝 Пожалуйста, назовите устройство на английском языке."
+    if trial_status == 0:
+        expiry_time = current_time + timedelta(days=TRIAL_TIME)
+        logger.info(f"Assigned 1-day trial to user {tg_id}.")
+        
+        await session.execute(
+            "UPDATE connections SET trial = 1 WHERE tg_id = $1", tg_id
         )
-        logger.warning(f"User {tg_id} entered an invalid key name: {key_name}")
+        await create_key(tg_id, expiry_time, state, session, message_or_query)
+    else:
+        builder = InlineKeyboardBuilder()
+
+        for plan_id, price in RENEWAL_PRICES.items():
+            discount_text = ""
+            if plan_id == "3":
+                discount_text = " (5% скидка)"
+            elif plan_id == "6":
+                discount_text = " (10% скидка)"
+            elif plan_id == "12":
+                discount_text = " (20% 🔥)"
+
+            builder.row(
+                InlineKeyboardButton(
+                    text=f"📅 {plan_id} мес. - {price}₽{discount_text}", callback_data=f"select_plan_{plan_id}"
+                )
+            )
+
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+        await message_or_query.message.answer(
+            "💳 Выберите тарифный план для создания нового ключа:", reply_markup=builder.as_markup()
+        )
+        await state.update_data(tg_id=tg_id)
+        await state.set_state(Form.waiting_for_server_selection)
+
+
+
+@router.callback_query(F.data.startswith("select_plan_"))
+async def select_tariff_plan(callback_query: CallbackQuery, state: FSMContext, session: Any):
+    tg_id = callback_query.message.chat.id
+    plan_id = callback_query.data.split("_")[-1]
+    plan_price = RENEWAL_PRICES.get(plan_id)
+
+    if plan_price is None:
+        await callback_query.message.answer("🚫 Неверный тарифный план.")
         return
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        logger.info(
-            f"Checking if key name '{key_name}' already exists in the database."
+    duration_days = int(plan_id) * 30
+
+    balance = await get_balance(tg_id)
+    if balance < plan_price:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+        await callback_query.message.answer(
+            "💳 Недостаточно средств для создания подписки. Пополните баланс в личном кабинете.",
+            reply_markup=builder.as_markup(),
         )
-        existing_key = await conn.fetchrow(
-            "SELECT * FROM keys WHERE email = $1", key_name.lower()
+        await state.clear()
+        return
+
+    await update_balance(tg_id, -plan_price)
+
+    expiry_time = datetime.utcnow() + timedelta(days=duration_days)
+
+    await create_key(tg_id, expiry_time, state, session, callback_query)
+
+
+async def create_key(
+    tg_id: int, expiry_time: datetime, state: FSMContext, session: Any, message_or_query: Union[Message, CallbackQuery]
+):
+    """Создаёт ключ с заданным сроком действия."""
+    while True:
+        key_name = generate_random_email()
+        logger.info(f"Generated random key name for user {tg_id}: {key_name}")
+
+        existing_key = await session.fetchrow(
+            "SELECT * FROM keys WHERE email = $1 AND tg_id = $2",
+            key_name,
+            tg_id,
         )
-        if existing_key:
-            await message.bot.send_message(
-                tg_id,
-                "❌ Упс! Это имя уже используется. Выберите другое уникальное название для ключа.",
-            )
-            logger.warning(
-                f"Key name '{key_name}' already exists in the database for user {tg_id}."
-            )
-            await state.set_state(Form.waiting_for_key_name)
-            return
-    finally:
-        await conn.close()
+        if not existing_key:
+            break
+        logger.warning(f"Key name '{key_name}' already exists for user {tg_id}. Generating a new one.")
 
     client_id = str(uuid.uuid4())
     email = key_name.lower()
-    current_time = datetime.utcnow()
-    expiry_time = None
-
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        logger.info(f"Checking trial status for user {tg_id}.")
-        existing_connection = await conn.fetchrow(
-            "SELECT trial FROM connections WHERE tg_id = $1", tg_id
-        )
-    finally:
-        await conn.close()
-
-    trial_status = existing_connection["trial"] if existing_connection else 0
-
-    if trial_status == 0:
-        expiry_time = current_time + timedelta(days=1, hours=3)
-        logger.info(f"Assigned 1-day trial to user {tg_id}.")
-    else:
-        balance = await get_balance(tg_id)
-        if balance < RENEWAL_PLANS["1"]["price"]:
-            replenish_button = InlineKeyboardButton(
-                text="Перейти в профиль", callback_data="view_profile"
-            )
-            keyboard = InlineKeyboardMarkup(inline_keyboard=[[replenish_button]])
-            await message.bot.send_message(
-                tg_id,
-                "💳 Недостаточно средств для создания подписки на новое устройство. Пополните баланс в личном кабинете.",
-                reply_markup=keyboard,
-            )
-            logger.warning(f"User {tg_id} has insufficient funds for key creation.")
-            await state.clear()
-            return
-
-        await update_balance(tg_id, -RENEWAL_PLANS["1"]["price"])
-        expiry_time = current_time + timedelta(days=30, hours=3)
-        logger.info(f"User {tg_id} balance deducted for key creation.")
-
     expiry_timestamp = int(expiry_time.timestamp() * 1000)
-    public_link = f"{PUBLIC_LINK}{email}"
-
-    logger.info(f"Generated public link for the key: {public_link}")
-
-    button_profile = InlineKeyboardButton(
-        text="👤 Личный кабинет", callback_data="view_profile"
-    )
-    button_iphone = InlineKeyboardButton(
-        text="🍏 Подключить", url=f"{CONNECT_IOS}{public_link}"
-    )
-    button_android = InlineKeyboardButton(
-        text="🤖 Подключить",
-        url=f"{CONNECT_ANDROID}{public_link}",
-    )
-
-    button_download_ios = InlineKeyboardButton(text="🍏 Скачать", url=DOWNLOAD_IOS)
-    button_download_android = InlineKeyboardButton(
-        text="🤖 Скачать",
-        url=DOWNLOAD_ANDROID,
-    )
-
-    keyboard = InlineKeyboardMarkup(
-        inline_keyboard=[
-            [button_download_ios, button_download_android],
-            [button_iphone, button_android],
-            [button_profile],
-        ]
-    )
-
-    remaining_time = expiry_time - current_time
-    days = remaining_time.days
-    key_message = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
-
-    logger.info(f"Sending key message to user {tg_id} with the public link.")
-
-    await message.bot.send_message(
-        tg_id, key_message, parse_mode="HTML", reply_markup=keyboard
-    )
+    public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
 
     try:
         least_loaded_cluster = await get_least_loaded_cluster()
 
-        tasks = []
-        tasks.append(
+        tasks = [
             asyncio.create_task(
                 create_key_on_cluster(
                     least_loaded_cluster,
@@ -251,43 +188,34 @@ async def handle_key_name_input(message: Message, state: FSMContext):
                     expiry_timestamp,
                 )
             )
-        )
+        ]
 
         await asyncio.gather(*tasks)
+        logger.info(f"Key created on cluster {least_loaded_cluster} for user {tg_id}.")
 
-        conn = await asyncpg.connect(DATABASE_URL)
-        try:
-            logger.info(f"Updating trial status for user {tg_id} in the database.")
-            existing_connection = await conn.fetchrow(
-                "SELECT * FROM connections WHERE tg_id = $1", tg_id
-            )
-            if existing_connection:
-                await conn.execute(
-                    "UPDATE connections SET trial = 1 WHERE tg_id = $1", tg_id
-                )
-            else:
-                await add_connection(tg_id, 0, 1)
-        finally:
-            await conn.close()
-
-        logger.info(f"Storing key for user {tg_id} in the database.")
-        await store_key(
-            tg_id, client_id, email, expiry_timestamp, public_link, least_loaded_cluster
-        )
+        await store_key(tg_id, client_id, email, expiry_timestamp, public_link, least_loaded_cluster, session)
 
     except Exception as e:
-        logger.error(f"Error while creating the key for user {tg_id}: {e}")
-        await message.bot.send_message(tg_id, f"❌ Ошибка при создании ключа: {e}")
+        logger.error(f"Error while creating the key for user {tg_id} on cluster: {e}")
+        await message_or_query.message.answer("❌ Произошла ошибка при создании ключа. Пожалуйста, попробуйте снова.")
+        return
 
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
+    builder.row(
+        InlineKeyboardButton(text="🍏 Скачать для iOS", url=DOWNLOAD_IOS),
+        InlineKeyboardButton(text="🤖 Скачать для Android", url=DOWNLOAD_ANDROID),
+    )
+    builder.row(
+        InlineKeyboardButton(text="🍏 Подключить на iOS", url=f"{CONNECT_IOS}{public_link}"),
+        InlineKeyboardButton(text="🤖 Подключить на Android", url=f"{CONNECT_ANDROID}{public_link}"),
+    )
+    builder.row(InlineKeyboardButton(text="💻 Windows/Linux", callback_data=f"connect_pc|{email}"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    remaining_time = expiry_time - datetime.utcnow()
+    days = remaining_time.days
+    key_message = key_message_success(public_link, f"⏳ Осталось дней: {days} 📅")
+
+    await message_or_query.message.answer(key_message, reply_markup=builder.as_markup())
     await state.clear()
-
-
-@dp.callback_query(F.data == "instructions")
-async def handle_instructions(callback_query: CallbackQuery):
-    await send_instructions(callback_query)
-
-
-@dp.callback_query(F.data == "back_to_main")
-async def handle_back_to_main(callback_query: CallbackQuery, state: FSMContext):
-    await process_callback_view_profile(callback_query, state)
-    await callback_query.answer()

handlers/keys/key_utils.py

@@ -4,29 +4,36 @@ import asyncpg
 from py3xui import AsyncApi
 
 from client import add_client, delete_client, extend_client_key
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, CLUSTERS, DATABASE_URL, TOTAL_GB
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, TOTAL_GB
+from database import get_servers_from_db
 from logger import logger
 
 
 async def create_key_on_cluster(cluster_id, tg_id, client_id, email, expiry_timestamp):
     try:
         tasks = []
-        cluster = CLUSTERS.get(cluster_id)
+        servers = await get_servers_from_db()
+        cluster = servers.get(cluster_id)
 
         if not cluster:
             raise ValueError(f"Кластер с ID {cluster_id} не найден.")
 
-        for server_info in cluster.values():
+        for server_info in cluster:
             xui = AsyncApi(
-                server_info["API_URL"],
+                server_info["api_url"],
                 username=ADMIN_USERNAME,
                 password=ADMIN_PASSWORD,
             )
 
+            inbound_id = server_info.get("inbound_id")
+            if not inbound_id:
+                logger.warning(
+                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+                )
+                continue
+
             conn = await asyncpg.connect(DATABASE_URL)
-            existing_key = await conn.fetchrow(
-                "SELECT 1 FROM keys WHERE email = $1", email
-            )
+            existing_key = await conn.fetchrow("SELECT 1 FROM keys WHERE email = $1", email)
 
             if existing_key:
                 raise ValueError(f"Email {email} уже существует в базе данных.")
@@ -42,6 +49,7 @@ async def create_key_on_cluster(cluster_id, tg_id, client_id, email, expiry_time
                     expiry_time=expiry_timestamp,
                     enable=True,
                     flow="xtls-rprx-vision",
+                    inbound_id=int(inbound_id),
                 )
             )
             await conn.close()
@@ -54,90 +62,116 @@ async def create_key_on_cluster(cluster_id, tg_id, client_id, email, expiry_time
 
 
 async def renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb):
-    """
-    Функция для продления срока действия ключа на всех серверах в кластере
-    и обновления объема трафика.
-    """
     try:
-        cluster = CLUSTERS.get(cluster_id)
+        servers = await get_servers_from_db()
+        cluster = servers.get(cluster_id)
 
         if not cluster:
             raise ValueError(f"Кластер с ID {cluster_id} не найден.")
 
         tasks = []
-        for server_info in cluster.values():
+        for server_info in cluster:
             xui = AsyncApi(
-                server_info["API_URL"],
+                server_info["api_url"],
                 username=ADMIN_USERNAME,
                 password=ADMIN_PASSWORD,
             )
 
+            inbound_id = server_info.get("inbound_id")
+            if not inbound_id:
+                logger.warning(
+                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+                )
+                continue
+
             tasks.append(
-                extend_client_key(xui, email, new_expiry_time, client_id, total_gb)
+                extend_client_key(
+                    xui,
+                    int(inbound_id),
+                    email,
+                    new_expiry_time,
+                    client_id,
+                    total_gb,
+                )
             )
 
         await asyncio.gather(*tasks)
 
     except Exception as e:
-        logger.error(
-            f"Не удалось продлить ключ {client_id} в кластере {cluster_id}: {e}"
-        )
+        logger.error(f"Не удалось продлить ключ {client_id} в кластере {cluster_id}: {e}")
         raise e
 
 
-async def delete_key_from_db(client_id):
-    """Удаление ключа из базы данных"""
+async def delete_key_from_db(client_id, session):
     try:
-        conn = await asyncpg.connect(DATABASE_URL)
-        await conn.execute("DELETE FROM keys WHERE client_id = $1", client_id)
+        await session.execute("DELETE FROM keys WHERE client_id = $1", client_id)
     except Exception as e:
         logger.error(f"Ошибка при удалении ключа {client_id} из базы данных: {e}")
-    finally:
-        await conn.close()
 
 
 async def delete_key_from_cluster(cluster_id, email, client_id):
     """Удаление ключа с серверов в кластере"""
     try:
-        cluster = CLUSTERS.get(cluster_id)
+        servers = await get_servers_from_db()
+        cluster = servers.get(cluster_id)
 
         if not cluster:
             raise ValueError(f"Кластер с ID {cluster_id} не найден.")
 
         tasks = []
-        for server_info in cluster.values():
+        for server_info in cluster:
             xui = AsyncApi(
-                server_info["API_URL"],
+                server_info["api_url"],
                 username=ADMIN_USERNAME,
                 password=ADMIN_PASSWORD,
             )
 
-            tasks.append(delete_client(xui, email, client_id))
+            inbound_id = server_info.get("inbound_id")
+            if not inbound_id:
+                logger.warning(
+                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+                )
+                continue
+
+            tasks.append(
+                delete_client(
+                    xui,
+                    int(inbound_id),
+                    email,
+                    client_id,
+                )
+            )
 
         await asyncio.gather(*tasks)
 
     except Exception as e:
-        logger.error(
-            f"Не удалось удалить ключ {client_id} в кластере {cluster_id}: {e}"
-        )
+        logger.error(f"Не удалось удалить ключ {client_id} в кластере {cluster_id}: {e}")
         raise e
 
 
 async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id):
     try:
-        cluster = CLUSTERS.get(cluster_id)
+        servers = await get_servers_from_db()
+        cluster = servers.get(cluster_id)
 
         if not cluster:
             raise ValueError(f"Кластер с ID {cluster_id} не найден.")
 
         tasks = []
-        for server_info in cluster.values():
+        for server_info in cluster:
             xui = AsyncApi(
-                server_info["API_URL"],
+                server_info["api_url"],
                 username=ADMIN_USERNAME,
                 password=ADMIN_PASSWORD,
             )
 
+            inbound_id = server_info.get("inbound_id")
+            if not inbound_id:
+                logger.warning(
+                    f"INBOUND_ID отсутствует для сервера {server_info.get('server_name', 'unknown')}. Пропуск."
+                )
+                continue
+
             tasks.append(
                 add_client(
                     xui,
@@ -149,17 +183,14 @@ async def update_key_on_cluster(tg_id, client_id, email, expiry_time, cluster_id
                     expiry_time=expiry_time,
                     enable=True,
                     flow="xtls-rprx-vision",
+                    inbound_id=int(inbound_id),
                 )
             )
 
         await asyncio.gather(*tasks)
 
-        logger.info(
-            f"Ключ успешно обновлен для {client_id} на всех серверах в кластере {cluster_id}"
-        )
+        logger.info(f"Ключ успешно обновлен для {client_id} на всех серверах в кластере {cluster_id}")
 
     except Exception as e:
-        logger.error(
-            f"Ошибка при обновлении ключа на серверах кластера {cluster_id} для {client_id}: {e}"
-        )
+        logger.error(f"Ошибка при обновлении ключа на серверах кластера {cluster_id} для {client_id}: {e}")
         raise e

handlers/keys/subscriptions.py

@@ -1,68 +1,169 @@
 import base64
+from datetime import datetime
 
 import aiohttp
 from aiohttp import web
+import asyncpg
 
-from config import CLUSTERS
+from config import DATABASE_URL, TRANSITION_DATE_STR
+from database import get_servers_from_db
 from logger import logger
 
 
-async def fetch_url_content(url):
+async def fetch_url_content(url, tg_id):
     try:
-        logger.debug(f"Получение URL: {url}")
+        logger.info(f"Получение URL: {url} для tg_id: {tg_id}")
         async with aiohttp.ClientSession() as session:
             async with session.get(url, ssl=False) as response:
                 if response.status == 200:
                     content = await response.text()
-                    logger.debug(f"Успешно получен контент с {url}")
+                    logger.info(f"Успешно получен контент с {url} для tg_id: {tg_id}")
                     return base64.b64decode(content).decode("utf-8").split("\n")
                 else:
-                    logger.error(
-                        f"Не удалось получить {url}, статус: {response.status}"
-                    )
+                    logger.error(f"Не удалось получить {url} для tg_id: {tg_id}, статус: {response.status}")
                     return []
     except Exception as e:
-        logger.error(f"Ошибка при получении {url}: {e}")
+        logger.error(f"Ошибка при получении {url} для tg_id: {tg_id}: {e}")
         return []
 
 
-async def combine_unique_lines(urls, query_string):
+async def combine_unique_lines(urls, tg_id, query_string):
     all_lines = []
-    logger.debug(f"Начинаем объединение подписок для запроса: {query_string}")
+    logger.info(f"Начинаем объединение подписок для tg_id: {tg_id}, запрос: {query_string}")
 
     urls_with_query = [f"{url}?{query_string}" for url in urls]
-    logger.debug(f"Составлены URL-адреса: {urls_with_query}")
+    logger.info(f"Составлены URL-адреса: {urls_with_query}")
 
     for url in urls_with_query:
-        lines = await fetch_url_content(url)
+        lines = await fetch_url_content(url, tg_id)
         all_lines.extend(lines)
 
     all_lines = list(set(filter(None, all_lines)))
-    logger.debug(
-        f"Объединено {len(all_lines)} строк после фильтрации и удаления дубликатов"
-    )
+    logger.info(f"Объединено {len(all_lines)} строк после фильтрации и удаления дубликатов для tg_id: {tg_id}")
 
     return all_lines
 
 
-async def handle_subscription(request):
-    email = request.match_info["email"]
-    logger.info(f"Получен запрос на подписку для email: {email}")
+transition_date = datetime.strptime(TRANSITION_DATE_STR, "%Y-%m-%d %H:%M:%S")
+
+transition_timestamp_ms = int(transition_date.timestamp() * 1000)
+
+transition_timestamp_ms_adjusted = transition_timestamp_ms - (3 * 60 * 60 * 1000)
+
+logger.info(f"Время перехода (с поправкой на часовой пояс): {transition_timestamp_ms_adjusted}")
+
+
+async def handle_old_subscription(request):
+    email = request.match_info.get("email")
+
+    if not email:
+        logger.warning("Получен запрос без email")
+        return web.Response(
+            text="❌ Неверные параметры запроса. Требуется email.",
+            status=400,
+        )
+
+    logger.info(f"Обработка запроса для старого клиента с email: {email}")
+
+    conn = await asyncpg.connect(DATABASE_URL)
+    try:
+        key_info = await conn.fetchrow("SELECT created_at FROM keys WHERE email = $1", email)
+
+        if not key_info:
+            logger.warning(f"Клиент с email {email} не найден в базе.")
+            return web.Response(
+                text="❌ Клиент с таким email не найден.",
+                status=404,
+            )
+
+        created_at_ms = key_info["created_at"]
+        logger.info(f"Значение created_at для клиента с email {email}: {created_at_ms}")
+
+        created_at_datetime = datetime.utcfromtimestamp(created_at_ms / 1000)
+        logger.info(f"Время создания клиента в формате datetime (UTC): {created_at_datetime}")
+
+        if created_at_ms >= transition_timestamp_ms_adjusted:
+            logger.info(f"Клиент с email {email} является новым.")
+            return web.Response(
+                text="❌ Эта ссылка устарела. Пожалуйста, обновите ссылку.",
+                status=400,
+            )
+
+        servers = await get_servers_from_db()
+
+        urls = []
+        for cluster_name, cluster_servers in servers.items():
+            for server in cluster_servers:
+                server_subscription_url = f"{server['subscription_url']}/{email}"
+                urls.append(server_subscription_url)
+
+        combined_subscriptions = await combine_unique_lines(urls, email, "")
+
+        base64_encoded = base64.b64encode("\n".join(combined_subscriptions).encode("utf-8")).decode("utf-8")
+
+        headers = {
+            "Content-Type": "text/plain; charset=utf-8",
+            "Content-Disposition": "inline",
+            "profile-update-interval": "7",
+            "profile-title": email,
+        }
+
+        logger.info(f"Возвращаем объединенные подписки для email: {email}")
+        return web.Response(text=base64_encoded, headers=headers)
+
+    finally:
+        await conn.close()
+
+
+async def handle_new_subscription(request):
+    email = request.match_info.get("email")
+    tg_id = request.match_info.get("tg_id")
+
+    if not email or not tg_id:
+        logger.warning("Получен запрос с отсутствующими параметрами email или tg_id")
+        return web.Response(
+            text="❌ Неверные параметры запроса. Требуются email и tg_id.",
+            status=400,
+        )
+
+    logger.info(f"Обработка запроса для нового клиента: email={email}, tg_id={tg_id}")
+
+    conn = await asyncpg.connect(DATABASE_URL)
+    try:
+        client_data = await conn.fetchrow("SELECT tg_id FROM keys WHERE email = $1", email)
+
+        if not client_data:
+            logger.warning(f"Клиент с email {email} не найден в базе.")
+            return web.Response(
+                text="❌ Клиент с таким email не найден.",
+                status=404,
+            )
+
+        stored_tg_id = client_data["tg_id"]
+
+        if str(tg_id) != str(stored_tg_id):
+            logger.warning(f"Неверный tg_id для клиента с email {email}.")
+            return web.Response(
+                text="❌ Неверные данные. Получите свой ключ в боте.",
+                status=403,
+            )
+    finally:
+        await conn.close()
+
+    servers = await get_servers_from_db()
 
     urls = []
-    for cluster in CLUSTERS.values():
-        for server in cluster.values():
-            server_subscription_url = f"{server['SUBSCRIPTION']}/{email}"
+    for cluster_name, cluster_servers in servers.items():
+        for server in cluster_servers:
+            server_subscription_url = f"{server['subscription_url']}/{email}"
             urls.append(server_subscription_url)
 
     query_string = request.query_string
-    logger.debug(f"Извлечен query string: {query_string}")
+    logger.info(f"Извлечен query string: {query_string}")
 
-    combined_subscriptions = await combine_unique_lines(urls, query_string)
+    combined_subscriptions = await combine_unique_lines(urls, tg_id, query_string)
 
-    base64_encoded = base64.b64encode(
-        "\n".join(combined_subscriptions).encode("utf-8")
-    ).decode("utf-8")
+    base64_encoded = base64.b64encode("\n".join(combined_subscriptions).encode("utf-8")).decode("utf-8")
 
     headers = {
         "Content-Type": "text/plain; charset=utf-8",

handlers/keys/trial_key.py

@@ -1,111 +1,68 @@
 import asyncio
-import uuid
 from datetime import datetime, timedelta
+from typing import Any
+import uuid
 
-import asyncpg
 from py3xui import AsyncApi
 
 from client import add_client
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, CLUSTERS, DATABASE_URL, PUBLIC_LINK, TRIAL_TIME
-from database import store_key
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, PUBLIC_LINK, TOTAL_GB, TRIAL_TIME
+from database import get_servers_from_db, store_key, use_trial
 from handlers.texts import INSTRUCTIONS
 from handlers.utils import generate_random_email, get_least_loaded_cluster
 
 
-async def create_trial_key(tg_id: int):
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        client_id = str(uuid.uuid4())
-        email = generate_random_email()
+async def create_trial_key(tg_id: int, session: Any):
+    client_id = str(uuid.uuid4())
+    email = generate_random_email()
+    public_link = f"{PUBLIC_LINK}{email}/{tg_id}"
+    instructions = INSTRUCTIONS
+    result = {"key": public_link, "instructions": instructions, "email": email}
+    current_time = datetime.utcnow()
+    expiry_time = current_time + timedelta(days=TRIAL_TIME)
+    expiry_timestamp = int(expiry_time.timestamp() * 1000)
 
-        public_link = f"{PUBLIC_LINK}{email}"
-        instructions = INSTRUCTIONS
+    clusters = await get_servers_from_db()
 
-        result = {"key": public_link, "instructions": instructions}
+    least_loaded_cluster = await get_least_loaded_cluster()
 
-        asyncio.create_task(
-            generate_and_store_keys(tg_id, client_id, email, public_link)
-        )
+    if least_loaded_cluster not in clusters:
+        raise ValueError(f"Кластер {least_loaded_cluster} не найден в базе данных.")
 
-        return result
+    servers_in_cluster = clusters[least_loaded_cluster]
 
-    finally:
-        await conn.close()
+    tasks = []
 
-
-async def generate_and_store_keys(
-    tg_id: int, client_id: str, email: str, public_link: str
-):
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        current_time = datetime.utcnow()
-        expiry_time = current_time + timedelta(days=TRIAL_TIME, hours=3)
-        expiry_timestamp = int(expiry_time.timestamp() * 1000)
-
-        least_loaded_cluster = await get_least_loaded_cluster()
-
-        tasks = []
-        for server_id, server in CLUSTERS[least_loaded_cluster].items():
-            task = create_key_on_server(
-                least_loaded_cluster,
-                server_id,
+    for server_info in servers_in_cluster:
+        tasks.append(
+            add_client(
+                AsyncApi(
+                    server_info["api_url"],
+                    username=ADMIN_USERNAME,
+                    password=ADMIN_PASSWORD,
+                ),
                 client_id,
                 email,
                 tg_id,
-                expiry_timestamp,
+                limit_ip=1,
+                total_gb=TOTAL_GB,
+                expiry_time=expiry_timestamp,
+                enable=True,
+                flow="xtls-rprx-vision",
+                inbound_id=int(server_info["inbound_id"]),
             )
-            tasks.append(task)
-
-        await asyncio.gather(*tasks)
-
-        await store_key(
-            tg_id,
-            client_id,
-            email,
-            expiry_timestamp,
-            public_link,
-            server_id=least_loaded_cluster,
         )
 
-        await conn.execute(
-            """
-            INSERT INTO connections (tg_id, trial) 
-            VALUES ($1, 1) 
-            ON CONFLICT (tg_id) 
-            DO UPDATE SET trial = 1
-            """,
-            tg_id,
-        )
-    finally:
-        await conn.close()
+    await asyncio.gather(*tasks)
 
-
-async def create_key_on_server(
-    cluster_id: str,
-    server_id: str,
-    client_id: str,
-    email: str,
-    tg_id: int,
-    expiry_timestamp: int,
-):
-    """Создает ключ на сервере в указанном кластере и возвращает результат."""
-
-    xui = AsyncApi(
-        CLUSTERS[cluster_id][server_id]["API_URL"],
-        username=ADMIN_USERNAME,
-        password=ADMIN_PASSWORD,
-    )
-
-    response = await add_client(
-        xui,
+    await store_key(
+        tg_id,
         client_id,
         email,
-        tg_id,
-        limit_ip=1,
-        total_gb=0,
-        expiry_time=expiry_timestamp,
-        enable=True,
-        flow="xtls-rprx-vision",
+        expiry_timestamp,
+        public_link,
+        server_id=least_loaded_cluster,
+        session=session,
     )
-
-    return response
+    await use_trial(tg_id, session)
+    return result

handlers/notifications.py

@@ -1,15 +1,23 @@
 import asyncio
 from datetime import datetime, timedelta
 
-import asyncpg
 from aiogram import Bot, Router, types
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+import asyncpg
 from py3xui import AsyncApi
 
-from client import delete_client
-from config import ADMIN_PASSWORD, ADMIN_USERNAME, CLUSTERS, DATABASE_URL, TOTAL_GB
-from database import delete_key, get_balance, update_balance, update_key_expiry
-from handlers.keys.key_utils import renew_key_in_cluster
-from handlers.texts import KEY_EXPIRY_10H, KEY_EXPIRY_24H, KEY_RENEWED, RENEWAL_PLANS
+from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, DEV_MODE, RENEWAL_PLANS, TOTAL_GB, TRIAL_TIME
+from database import (
+    add_notification,
+    check_notification_time,
+    delete_key,
+    get_balance,
+    get_servers_from_db,
+    update_balance,
+    update_key_expiry,
+)
+from handlers.keys.key_utils import delete_key_from_cluster, renew_key_in_cluster
+from handlers.texts import KEY_EXPIRY_10H, KEY_EXPIRY_24H, KEY_RENEWED
 from logger import logger
 
 router = Router()
@@ -21,14 +29,16 @@ async def notify_expiring_keys(bot: Bot):
         conn = await asyncpg.connect(DATABASE_URL)
         logger.info("Подключение к базе данных успешно.")
 
-        current_time = datetime.utcnow().timestamp() * 1000
-        threshold_time_10h = (
-            datetime.utcnow() + timedelta(hours=10)
-        ).timestamp() * 1000
-        threshold_time_24h = (datetime.utcnow() + timedelta(days=1)).timestamp() * 1000
+        current_time = int(datetime.utcnow().timestamp() * 1000)
+        threshold_time_10h = int((datetime.utcnow() + timedelta(hours=10)).timestamp() * 1000)
+        threshold_time_24h = int((datetime.utcnow() + timedelta(days=1)).timestamp() * 1000)
 
         logger.info("Начало обработки уведомлений.")
 
+        await notify_inactive_trial_users(bot, conn)
+        await asyncio.sleep(1)
+        await check_online_users()
+        await asyncio.sleep(1)
         await notify_10h_keys(bot, conn, current_time, threshold_time_10h)
         await asyncio.sleep(1)
         await notify_24h_keys(bot, conn, current_time, threshold_time_24h)
@@ -45,22 +55,23 @@ async def notify_expiring_keys(bot: Bot):
 
 
 async def is_bot_blocked(bot: Bot, chat_id: int) -> bool:
+    if DEV_MODE:
+        return False
     try:
         member = await bot.get_chat_member(chat_id, bot.id)
         blocked = member.status == "left"
-        logger.info(
-            f"Статус бота для пользователя {chat_id}: {'заблокирован' if blocked else 'активен'}"
-        )
+        logger.info(f"Статус бота для пользователя {chat_id}: {'заблокирован' if blocked else 'активен'}")
         return blocked
     except Exception as e:
-        logger.warning(
-            f"Не удалось проверить статус бота для пользователя {chat_id}: {e}"
-        )
+        logger.warning(f"Не удалось проверить статус бота для пользователя {chat_id}: {e}")
         return False
 
 
 async def notify_10h_keys(
-    bot: Bot, conn: asyncpg.Connection, current_time: float, threshold_time_10h: float
+    bot: Bot,
+    conn: asyncpg.Connection,
+    current_time: float,
+    threshold_time_10h: float,
 ):
     records = await conn.fetch(
         """
@@ -93,37 +104,21 @@ async def notify_10h_keys(
             email=email,
             expiry_date=expiry_date.strftime("%Y-%m-%d %H:%M:%S"),
             days_left_message=days_left_message,
+            price=RENEWAL_PLANS["1"]["price"],
         )
 
-        if not await is_bot_blocked(bot, tg_id):
+        if not await is_bot_blocked(bot, tg_id) and not DEV_MODE:
             try:
-                keyboard = types.InlineKeyboardMarkup(
-                    inline_keyboard=[
-                        [
-                            types.InlineKeyboardButton(
-                                text="🔄 Продлить VPN",
-                                callback_data=f'renew_key|{record["client_id"]}',
-                            )
-                        ],
-                        [
-                            types.InlineKeyboardButton(
-                                text="💳 Пополнить баланс",
-                                callback_data="pay",
-                            )
-                        ],
-                        [
-                            types.InlineKeyboardButton(
-                                text="👤 Личный кабинет", callback_data="view_profile"
-                            )
-                        ],
-                    ]
-                )
+                keyboard = InlineKeyboardBuilder()
+                keyboard.button(text="🔄 Продлить VPN", callback_data=f'renew_key|{email}')
+                keyboard.button(text="💳 Пополнить баланс", callback_data="pay")
+                keyboard.button(text="👤 Личный кабинет", callback_data="profile")
+                keyboard.adjust(1)
+                keyboard = keyboard.as_markup()
                 await bot.send_message(tg_id, message, reply_markup=keyboard)
                 logger.info(f"Уведомление отправлено пользователю {tg_id}.")
             except Exception as e:
-                logger.error(
-                    f"Ошибка при отправке уведомления пользователю {tg_id}: {e}"
-                )
+                logger.error(f"Ошибка при отправке уведомления пользователю {tg_id}: {e}")
                 continue
 
             await conn.execute(
@@ -136,7 +131,10 @@ async def notify_10h_keys(
 
 
 async def notify_24h_keys(
-    bot: Bot, conn: asyncpg.Connection, current_time: float, threshold_time_24h: float
+    bot: Bot,
+    conn: asyncpg.Connection,
+    current_time: float,
+    threshold_time_24h: float,
 ):
     logger.info("Проверка истекших ключей...")
 
@@ -173,155 +171,184 @@ async def notify_24h_keys(
             expiry_date=expiry_date.strftime("%Y-%m-%d %H:%M:%S"),
         )
 
-        if not await is_bot_blocked(bot, tg_id):
+        if not await is_bot_blocked(bot, tg_id) and not DEV_MODE:
             try:
-                keyboard = types.InlineKeyboardMarkup(
-                    inline_keyboard=[
-                        [
-                            types.InlineKeyboardButton(
-                                text="🔄 Продлить VPN",
-                                callback_data=f'renew_key|{record["client_id"]}',
-                            )
-                        ],
-                        [
-                            types.InlineKeyboardButton(
-                                text="💳 Пополнить баланс",
-                                callback_data="pay",
-                            )
-                        ],
-                        [
-                            types.InlineKeyboardButton(
-                                text="👤 Личный кабинет", callback_data="view_profile"
-                            )
-                        ],
-                    ]
+                builder = InlineKeyboardBuilder()
+                builder.row(
+                    types.InlineKeyboardButton(
+                        text="🔄 Продлить VPN",
+                        callback_data=f'renew_key|{email}',
+                    )
                 )
+                builder.row(
+                    types.InlineKeyboardButton(
+                        text="💳 Пополнить баланс",
+                        callback_data="pay",
+                    )
+                )
+                builder.row(
+                    types.InlineKeyboardButton(
+                        text="👤 Личный кабинет",
+                        callback_data="profile",
+                    )
+                )
+                keyboard = builder.as_markup()
                 await bot.send_message(tg_id, message_24h, reply_markup=keyboard)
                 logger.info(f"Уведомление за 24 часа отправлено пользователю {tg_id}.")
             except Exception as e:
-                logger.error(
-                    f"Ошибка при отправке уведомления за 24 часа пользователю {tg_id}: {e}"
-                )
+                logger.error(f"Ошибка при отправке уведомления за 24 часа пользователю {tg_id}: {e}")
                 continue
 
             await conn.execute(
                 "UPDATE keys SET notified_24h = TRUE WHERE client_id = $1",
                 record["client_id"],
             )
-            logger.info(
-                f"Обновлено поле notified_24h для клиента {record['client_id']}."
-            )
+            logger.info(f"Обновлено поле notified_24h для клиента {record['client_id']}.")
+
+        await asyncio.sleep(1)
+
+
+async def notify_inactive_trial_users(bot: Bot, conn: asyncpg.Connection):
+    logger.info("Проверка пользователей, не активировавших пробный период...")
+
+    inactive_trial_users = await conn.fetch(
+        """
+        SELECT tg_id, username FROM users 
+        WHERE tg_id IN (
+            SELECT tg_id FROM connections 
+            WHERE trial = 0
+        ) AND tg_id NOT IN (
+            SELECT DISTINCT tg_id FROM keys
+        )
+        """
+    )
+    logger.info(f"Найдено {len(inactive_trial_users)} неактивных пользователей.")
+
+    for user in inactive_trial_users:
+        tg_id = user['tg_id']
+        username = user.get('username', 'Пользователь')
+
+        try:
+            can_notify = await check_notification_time(tg_id, 'inactive_trial', hours=24, session=conn)
+
+            if can_notify and not await is_bot_blocked(bot, tg_id):
+                builder = InlineKeyboardBuilder()
+                builder.row(
+                    types.InlineKeyboardButton(text="🚀 Активировать пробный период", callback_data="create_key")
+                )
+                builder.row(types.InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+                keyboard = builder.as_markup()
+
+                message = (
+                    f"👋 Привет, {username}!\n\n"
+                    f"🎉 У тебя есть бесплатный пробный период на {TRIAL_TIME} дней!\n"
+                    "🕒 Не упусти возможность попробовать наш VPN прямо сейчас.\n\n"
+                    "💡 Нажми на кнопку ниже, чтобы активировать пробный доступ."
+                )
+
+                await bot.send_message(tg_id, message, reply_markup=keyboard)
+                logger.info(f"Отправлено уведомление неактивному пользователю {tg_id}.")
+
+                await add_notification(tg_id, 'inactive_trial', session=conn)
+
+        except Exception as e:
+            logger.error(f"Ошибка при отправке уведомления неактивному пользователю {tg_id}: {e}")
 
         await asyncio.sleep(1)
 
 
 async def handle_expired_keys(bot: Bot, conn: asyncpg.Connection, current_time: float):
     logger.info("Проверка истекших ключей...")
-
-    adjusted_current_time = current_time + (3 * 60 * 60 * 1000)
     expiring_keys = await conn.fetch(
         """
         SELECT tg_id, client_id, expiry_time, email FROM keys 
         WHERE expiry_time <= $1
         """,
-        adjusted_current_time,
+        current_time,
     )
+    logger.info(f"current_time {current_time}")
     logger.info(f"Найдено {len(expiring_keys)} истекающих ключей.")
 
-    async def process_key(record):
-        tg_id = record["tg_id"]
-        client_id = record["client_id"]
-        email = record["email"]
-        balance = await get_balance(tg_id)
-        expiry_time = record["expiry_time"]
-        expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
-        current_date = datetime.utcnow()
-        time_left = expiry_date - current_date
-
-        logger.info(
-            f"Время истечения ключа: {expiry_time} (дата: {expiry_date}), Текущее время: {current_date}, Оставшееся время: {time_left}"
-        )
-
-        message_expired = (
-            f"❌ Ваша подписка {email} истекла и была удалена!\n\n"
-            "🔍 Перейдите в профиль для создания новой подписки.\n"
-            "💡 Не откладывайте подключение VPN!"
-        )
-        keyboard = types.InlineKeyboardMarkup(
-            inline_keyboard=[
-                [
-                    types.InlineKeyboardButton(
-                        text="👤 Личный кабинет", callback_data="view_profile"
-                    )
-                ]
-            ]
-        )
-
-        try:
-            if balance >= RENEWAL_PLANS["1"]["price"]:
-                await update_balance(tg_id, -RENEWAL_PLANS["1"]["price"])
-                new_expiry_time = int(
-                    (datetime.utcnow() + timedelta(days=30)).timestamp() * 1000
-                )
-                await update_key_expiry(client_id, new_expiry_time)
-
-                for cluster_id in CLUSTERS:
-                    await renew_key_in_cluster(
-                        cluster_id, email, client_id, new_expiry_time, TOTAL_GB
-                    )
-                    logger.info(
-                        f"Ключ для пользователя {tg_id} успешно продлен в кластере {cluster_id}."
-                    )
-
-                await conn.execute(
-                    """
-                    UPDATE keys
-                    SET notified = FALSE, notified_24h = FALSE
-                    WHERE client_id = $1
-                    """,
-                    client_id,
-                )
-                logger.info(
-                    f"Флаги notified и notified_24 сброшены для клиента с ID {client_id}."
-                )
-                try:
-                    await bot.send_message(
-                        tg_id, text=KEY_RENEWED, reply_markup=keyboard
-                    )
-                    logger.info(
-                        f"Уведомление об успешном продлении отправлено клиенту {tg_id}."
-                    )
-                except Exception as e:
-                    logger.error(
-                        f"Ошибка при отправке уведомления клиенту {tg_id}: {e}"
-                    )
-
-            else:
-                await safe_send_message(
-                    bot, tg_id, message_expired, reply_markup=keyboard
-                )
-                await delete_key(client_id)
-
-                for cluster_id, cluster in CLUSTERS.items():
-                    for server_id, server in cluster.items():
-                        xui = AsyncApi(
-                            server["API_URL"],
-                            username=ADMIN_USERNAME,
-                            password=ADMIN_PASSWORD,
-                        )
-                        await delete_client(xui, email, client_id)
-
-        except Exception as e:
-            logger.error(f"Ошибка при обработке ключа для клиента {tg_id}: {e}")
-
-    await asyncio.gather(*[process_key(record) for record in expiring_keys])
+    await asyncio.gather(*[process_key(record, bot, conn) for record in expiring_keys])
 
 
-async def safe_send_message(bot, tg_id, text, reply_markup=None):
+async def process_key(record, bot, conn):
+    tg_id = record["tg_id"]
+    client_id = record["client_id"]
+    email = record["email"]
+    balance = await get_balance(tg_id)
+    expiry_time = record["expiry_time"]
+    expiry_date = datetime.utcfromtimestamp(expiry_time / 1000)
+    current_date = datetime.utcnow()
+    time_left = expiry_date - current_date
+
+    logger.info(
+        f"Время истечения ключа: {expiry_time} (дата: {expiry_date}), Текущее время: {current_date}, Оставшееся время: {time_left}"
+    )
+    keyboard = types.InlineKeyboardMarkup(
+        inline_keyboard=[[types.InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")]]
+    )
+
     try:
-        await bot.send_message(tg_id, text, reply_markup=reply_markup)
-    except Exception as e:
-        if "chat not found" in str(e):
-            logger.warning(f"Чат для клиента {tg_id} не найден.")
+        if balance >= RENEWAL_PLANS["1"]["price"]:
+            await update_balance(tg_id, -RENEWAL_PLANS["1"]["price"])
+            new_expiry_time = int((datetime.utcnow() + timedelta(days=30)).timestamp() * 1000)
+            await update_key_expiry(client_id, new_expiry_time)
+
+            servers = await get_servers_from_db()
+
+            for cluster_id in servers:
+                await renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, TOTAL_GB)
+                logger.info(f"Ключ для пользователя {tg_id} успешно продлен в кластере {cluster_id}.")
+
+            await conn.execute(
+                """
+                UPDATE keys
+                SET notified = FALSE, notified_24h = FALSE
+                WHERE client_id = $1
+                """,
+                client_id,
+            )
+            logger.info(f"Флаги notified и notified_24 сброшены для клиента с ID {client_id}.")
+            try:
+                await bot.send_message(tg_id, text=KEY_RENEWED, reply_markup=keyboard)
+                logger.info(f"Уведомление об успешном продлении отправлено клиенту {tg_id}.")
+            except Exception as e:
+                logger.error(f"Ошибка при отправке уведомления клиенту {tg_id}: {e}")
+
         else:
-            logger.error(f"Ошибка при отправке сообщения клиенту {tg_id}: {e}")
+            message_expired = "Ваша подписка истекла и была удалена. Получите новую через личный кабинет"
+
+            try:
+                await bot.send_message(tg_id, text=message_expired, reply_markup=keyboard)
+                logger.info(f"Уведомление об истечении подписки и удалении ключа отправлено пользователю {tg_id}.")
+            except Exception as e:
+                logger.error(f"Ошибка при отправке уведомления об истечении подписки пользователю {tg_id}: {e}")
+
+            servers = await get_servers_from_db()
+
+            for cluster_id in servers:
+                await delete_key_from_cluster(cluster_id, email, client_id)
+                logger.info(f"Клиент {client_id} удален из кластера {cluster_id}.")
+
+            await delete_key(client_id)
+            logger.info(f"Ключ для клиента с ID {client_id} удален из базы данных.")
+
+    except Exception as e:
+        logger.error(f"Ошибка при обработке ключа для клиента {tg_id}: {e}")
+
+
+async def check_online_users():
+    servers = await get_servers_from_db()
+
+    for cluster_id, cluster in servers.items():
+        for server_id, server in enumerate(cluster):
+            xui = AsyncApi(server["api_url"], username=ADMIN_USERNAME, password=ADMIN_PASSWORD)
+            await xui.login()
+            try:
+                online_users = len(await xui.client.online())
+                logger.info(
+                    f"Сервер '{server['server_name']}' доступен, текущее количество активных пользователей: {online_users}."
+                )
+            except Exception as e:
+                logger.error(f"Не удалось проверить пользователей на сервере {server_id}: {e}")

handlers/pay.py

@@ -3,15 +3,12 @@ from aiogram.types import CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from config import CRYPTO_BOT_ENABLE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, STARS_ENABLE, YOOKASSA_ENABLE
-from database import get_trial
-from handlers.start import send_welcome_message
 
 router = Router()
 
 
 @router.callback_query(F.data == "pay")
 async def handle_pay(callback_query: CallbackQuery):
-    await callback_query.message.delete()
     builder = InlineKeyboardBuilder()
 
     if YOOKASSA_ENABLE:
@@ -49,31 +46,14 @@ async def handle_pay(callback_query: CallbackQuery):
                 callback_data="pay_robokassa",
             )
         )
-    builder.row(
-        InlineKeyboardButton(
-            text="🎟️ Активировать купон", callback_data="activate_coupon"
-        )
-    )
-
-    builder.row(
-        InlineKeyboardButton(text="⬅️ Вернуться в профиль", callback_data="view_profile")
-    )
+    builder.row(InlineKeyboardButton(text="🎟️ Активировать купон", callback_data="activate_coupon"))
+    builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
     await callback_query.message.answer(
         "💸 <b>Выберите удобный способ пополнения баланса:</b>\n\n"
         "• Быстро и безопасно\n"
         "• Поддержка разных платежных систем\n"
         "• Моментальное зачисление средств 🚀",
-        parse_mode="HTML",
         reply_markup=builder.as_markup(),
     )
-
-    await callback_query.answer()
-
-
-@router.callback_query(F.data == "back_to_menu")
-async def handle_back_to_menu(callback_query: CallbackQuery):
-    await callback_query.message.delete()
-    trial_status = await get_trial(callback_query.from_user.id)
-    await send_welcome_message(callback_query.from_user.id, trial_status)
-    await callback_query.answer()

handlers/payments/cryprobot_pay.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from aiocryptopay import AioCryptoPay, Networks
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
@@ -6,9 +8,9 @@ from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
 
-from bot import bot
 from config import CRYPTO_BOT_ENABLE, CRYPTO_BOT_TOKEN, RUB_TO_USDT
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -24,39 +26,9 @@ class ReplenishBalanceState(StatesGroup):
     entering_custom_amount_crypto = State()
 
 
-async def send_message_with_deletion(
-    chat_id, text, reply_markup=None, state=None, message_key="last_message_id"
-):
-    if state:
-        try:
-            state_data = await state.get_data()
-            previous_message_id = state_data.get(message_key)
-
-            if previous_message_id:
-                await bot.delete_message(
-                    chat_id=chat_id, message_id=previous_message_id
-                )
-
-            sent_message = await bot.send_message(
-                chat_id=chat_id, text=text, reply_markup=reply_markup
-            )
-            await state.update_data({message_key: sent_message.message_id})
-
-        except Exception as e:
-            logger.error(f"Ошибка при удалении/отправке сообщения: {e}")
-            return None
-
-    return sent_message
-
-
 @router.callback_query(F.data == "pay_cryptobot")
-async def process_callback_pay_cryptobot(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
-
+async def process_callback_pay_cryptobot(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
     builder = InlineKeyboardBuilder()
-
     for i in range(0, len(PAYMENT_OPTIONS), 2):
         if i + 1 < len(PAYMENT_OPTIONS):
             builder.row(
@@ -78,47 +50,28 @@ async def process_callback_pay_cryptobot(
             )
     builder.row(
         InlineKeyboardButton(
-            text="💰 Ввести свою сумму", callback_data="enter_custom_amount_crypto"
+            text="💰 Ввести свою сумму",
+            callback_data="enter_custom_amount_crypto",
         )
     )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="back_to_profile"))
-
-    key_count = await get_key_count(tg_id)
-
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
+    key_count = await get_key_count(callback_query.message.chat.id)
     if key_count == 0:
-        exists = await check_connection_exists(tg_id)
+        exists = await check_connection_exists(callback_query.message.chat.id)
         if not exists:
-            await add_connection(tg_id, balance=0.0, trial=0)
-
-    try:
-        await bot.delete_message(
-            chat_id=tg_id, message_id=callback_query.message.message_id
-        )
-    except Exception as e:
-        logger.error(f"Не удалось удалить сообщение: {e}")
-
-    await bot.send_message(
-        chat_id=tg_id,
-        text="Выберите сумму пополнения:",
+            await add_connection(tg_id=callback_query.message.chat.id, balance=0.0, trial=0, session=session)
+    await callback_query.message.answer(
+        "Выберите сумму пополнения:",
         reply_markup=builder.as_markup(),
     )
-
     await state.set_state(ReplenishBalanceState.choosing_amount_crypto)
-    await callback_query.answer()
 
 
 @router.callback_query(F.data.startswith("crypto_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     data = callback_query.data.split("|", 1)
 
     if len(data) != 2:
-        try:
-            await callback_query.message.delete()
-        except Exception as e:
-            logger.error(f"Ошибка при удалении сообщения: {e}")
-
         await callback_query.message.answer("Неверные данные для выбора суммы.")
         return
 
@@ -126,11 +79,6 @@ async def process_amount_selection(
     try:
         amount = int(amount_str)
     except ValueError:
-        try:
-            await callback_query.message.delete()
-        except Exception as e:
-            logger.error(f"Ошибка при удалении сообщения: {e}")
-
         await callback_query.message.answer("Некорректная сумма.")
         return
 
@@ -138,26 +86,18 @@ async def process_amount_selection(
     await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_crypto)
 
     try:
-        try:
-            await callback_query.message.delete()
-        except Exception as e:
-            logger.error(f"Ошибка при удалении сообщения: {e}")
-
         invoice = await crypto.create_invoice(
             asset="USDT",
             amount=str(int(amount // RUB_TO_USDT)),
             description=f"Пополнения баланса на {amount} руб",
-            payload=f"{callback_query.from_user.id}:{int(amount)}",
+            payload=f"{callback_query.message.chat.id}:{int(amount)}",
         )
 
         if hasattr(invoice, "bot_invoice_url"):
             builder = InlineKeyboardBuilder()
-            builder.row(
-                InlineKeyboardButton(text="Пополнить", url=invoice.bot_invoice_url)
-            )
+            builder.row(InlineKeyboardButton(text="Пополнить", url=invoice.bot_invoice_url))
             builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
-            await bot.send_message(
-                chat_id=callback_query.from_user.id,
+            await callback_query.message.answer(
                 text=f"Вы выбрали пополнение на {amount} рублей.",
                 reply_markup=builder.as_markup(),
             )
@@ -165,24 +105,6 @@ async def process_amount_selection(
             await callback_query.message.answer("Ошибка при создании платежа.")
     except Exception as e:
         logger.error(f"Ошибка при создании платежа: {e}")
-        await callback_query.message.answer("Произошла ошибка при создании платежа.")
-
-    await callback_query.answer()
-
-
-async def send_payment_success_notification(user_id: int, amount: float):
-    try:
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="Перейти в профиль", callback_data="view_profile")
-        )
-        await bot.send_message(
-            chat_id=user_id,
-            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
-            reply_markup=builder.as_markup(),
-        )
-    except Exception as e:
-        logger.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")
 
 
 async def cryptobot_webhook(request):
@@ -193,9 +115,7 @@ async def cryptobot_webhook(request):
             await process_crypto_payment(data["payload"])
             return web.Response(status=200)
         else:
-            logger.warning(
-                f"Неподдерживаемый тип обновления: {data.get('update_type')}"
-            )
+            logger.warning(f"Неподдерживаемый тип обновления: {data.get('update_type')}")
             return web.Response(status=400)
     except Exception as e:
         logger.error(f"Ошибка обработки вебхука: {e}")
@@ -209,6 +129,7 @@ async def process_crypto_payment(payload):
         try:
             user_id = int(user_id_str)
             amount = int(amount_str)
+            await add_payment(int(user_id), float(amount), "cryptobot")
             logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
             await update_balance(user_id, amount)
             await send_payment_success_notification(user_id, amount)
@@ -219,12 +140,9 @@ async def process_crypto_payment(payload):
 
 
 @router.callback_query(F.data == "enter_custom_amount_crypto")
-async def process_enter_custom_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    await callback_query.message.edit_text(text="Введите сумму пополнения:")
+async def process_enter_custom_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.answer(text="Введите сумму пополнения:")
     await state.set_state(ReplenishBalanceState.entering_custom_amount_crypto)
-    await callback_query.answer()
 
 
 @router.message(ReplenishBalanceState.entering_custom_amount_crypto)
@@ -232,41 +150,30 @@ async def process_custom_amount_input(message: types.Message, state: FSMContext)
     if message.text.isdigit():
         amount = int(message.text)
         if amount // RUB_TO_USDT <= 0:
-            await message.answer(
-                f"Сумма должна быть больше {RUB_TO_USDT}. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer(f"Сумма должна быть больше {RUB_TO_USDT}. Пожалуйста, введите сумму еще раз:")
             return
 
         await state.update_data(amount=amount)
-        await state.set_state(
-            ReplenishBalanceState.waiting_for_payment_confirmation_crypto
-        )
+        await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_crypto)
         try:
             invoice = await crypto.create_invoice(
                 asset="USDT",
                 amount=str(int(amount // RUB_TO_USDT)),
                 description=f"Пополнения баланса на {amount} руб",
-                payload=f"{message.from_user.id}:{amount}",
+                payload=f"{message.chat.id}:{amount}",
             )
 
             if hasattr(invoice, "bot_invoice_url"):
                 builder = InlineKeyboardBuilder()
-                builder.row(
-                    InlineKeyboardButton(text="Пополнить", url=invoice.bot_invoice_url)
-                )
+                builder.row(InlineKeyboardButton(text="Пополнить", url=invoice.bot_invoice_url))
                 builder.row(
                     InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"),
                 )
-                await message.message.edit_text(
+                await message.answer(
                     text=f"Вы выбрали пополнение на {amount} рублей.",
                     reply_markup=builder.as_markup(),
                 )
-            else:
-                await send_message_with_deletion(
-                    message.from_user.id, "Ошибка при создании платежа.", state=state
-                )
         except Exception as e:
             logger.error(f"Ошибка при создании платежа: {e}")
-            await message.answer("Произошла ошибка при создании платежа.")
     else:
         await message.answer("Некорректная сумма. Пожалуйста, введите сумму еще раз:")

handlers/payments/freekassa_pay.py

@@ -4,17 +4,17 @@ import logging
 import time
 import uuid
 
-import requests
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
+import requests
 
-from bot import bot
 from config import FREEKASSA_API_KEY, FREEKASSA_SHOP_ID
-from database import update_balance
+from database import add_payment, update_balance
+from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 
 router = Router()
@@ -49,9 +49,7 @@ async def create_payment(user_id, amount, email, ip):
     params["signature"] = generate_signature(params, FREEKASSA_API_KEY)
 
     try:
-        response = requests.post(
-            "https://api.freekassa.com/v1/orders/create", json=params
-        )
+        response = requests.post("https://api.freekassa.com/v1/orders/create", json=params)
         response_data = response.json()
 
         logging.debug(f"Ответ от FreeKassa при создании платежа: {response_data}")
@@ -67,16 +65,6 @@ async def create_payment(user_id, amount, email, ip):
         return None
 
 
-async def send_payment_success_notification(user_id, amount):
-    try:
-        await bot.send_message(
-            chat_id=user_id,
-            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
-        )
-    except Exception as e:
-        logging.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")
-
-
 async def freekassa_webhook(request):
     data = await request.json()
     logging.debug(f"Получен вебхук от FreeKassa: {data}")
@@ -86,6 +74,7 @@ async def freekassa_webhook(request):
     if data["status"] == "completed":
         user_id = data["metadata"]["user_id"]
         amount = float(data["amount"])
+        await add_payment(int(user_id), float(amount), "freekassa")
 
         await update_balance(user_id, amount)
         await send_payment_success_notification(user_id, amount)
@@ -94,11 +83,7 @@ async def freekassa_webhook(request):
 
 
 @router.callback_query(lambda c: c.data == "pay_freekassa")
-async def process_callback_pay_freekassa(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
-
+async def process_callback_pay_freekassa(callback_query: types.CallbackQuery, state: FSMContext):
     builder = InlineKeyboardBuilder()
     for i in range(0, len(PAYMENT_OPTIONS), 2):
         if i + 1 < len(PAYMENT_OPTIONS):
@@ -121,76 +106,56 @@ async def process_callback_pay_freekassa(
             )
     builder.row(
         InlineKeyboardButton(
-            text="💰 Ввести свою сумму", callback_data="enter_custom_amount_freekassa"
+            text="💰 Ввести свою сумму",
+            callback_data="enter_custom_amount_freekassa",
         )
     )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="back_to_profile"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
 
-    await bot.delete_message(
-        chat_id=tg_id, message_id=callback_query.message.message_id
-    )
-
-    await bot.send_message(
-        chat_id=tg_id,
+    await callback_query.message.answer(
         text="Выберите сумму пополнения через FreeKassa:",
         reply_markup=builder.as_markup(),
     )
 
     await state.set_state(ReplenishBalanceState.choosing_amount_freekassa)
-    await callback_query.answer()
 
 
 @router.callback_query(F.data.startswith("freekassa_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     data = callback_query.data.split("|", 1)
     amount_str = data[1]
     try:
         amount = int(amount_str)
     except ValueError:
-        await bot.send_message(callback_query.from_user.id, "Некорректная сумма.")
+        await callback_query.message.answer("Некорректная сумма.")
         return
 
-    user_email = f"{callback_query.from_user.id}@solo.net"
+    user_email = f"{callback_query.message.chat.id}@solo.net"
     user_ip = callback_query.message.chat.id
-    payment_url = await create_payment(
-        callback_query.from_user.id, amount, user_email, user_ip
-    )
+    payment_url = await create_payment(callback_query.message.chat.id, amount, user_email, user_ip)
 
     if payment_url:
         confirm_keyboard = InlineKeyboardMarkup(
             inline_keyboard=[
-                [
-                    InlineKeyboardButton(
-                        text=f"Оплатить {amount} рублей", url=payment_url
-                    )
-                ],
+                [InlineKeyboardButton(text=f"Оплатить {amount} рублей", url=payment_url)],
                 [InlineKeyboardButton(text="⬅️ Назад", callback_data="pay")],
             ]
         )
 
-        await bot.send_message(
-            callback_query.from_user.id,
+        await callback_query.message.answer(
             f"Вы выбрали оплату на {amount} рублей. Перейдите по ссылке для завершения оплаты:",
             reply_markup=confirm_keyboard,
         )
     else:
-        await bot.send_message(
-            callback_query.from_user.id,
+        await callback_query.message.answer(
             "Ошибка при создании платежа. Попробуйте позже.",
         )
 
-    await callback_query.answer()
-
 
 @router.callback_query(F.data == "enter_custom_amount_freekassa")
-async def process_enter_custom_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    await callback_query.message.edit_text(text="Введите сумму пополнения:")
+async def process_enter_custom_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.answer(text="Введите сумму пополнения:")
     await state.set_state(ReplenishBalanceState.entering_custom_amount_freekassa)
-    await callback_query.answer()
 
 
 @router.message(ReplenishBalanceState.entering_custom_amount_freekassa)
@@ -198,21 +163,15 @@ async def process_custom_amount_input(message: types.Message, state: FSMContext)
     if message.text.isdigit():
         amount = int(message.text)
         if amount <= 0:
-            await message.answer(
-                "Сумма должна быть больше нуля. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer("Сумма должна быть больше нуля. Пожалуйста, введите сумму еще раз:")
             return
 
-        user_email = f"{message.from_user.id}@solo.net"
+        user_email = f"{message.chat.id}@solo.net"
         user_ip = message.chat.id
-        payment_url = await create_payment(
-            message.from_user.id, amount, user_email, user_ip
-        )
+        payment_url = await create_payment(message.chat.id, amount, user_email, user_ip)
 
         if payment_url:
-            keyboard = InlineKeyboardMarkup(
-                inline_keyboard=[[InlineKeyboardButton("Оплатить", url=payment_url)]]
-            )
+            keyboard = InlineKeyboardMarkup(inline_keyboard=[[InlineKeyboardButton("Оплатить", url=payment_url)]])
             await message.answer(
                 f"Вы выбрали оплату на {amount} рублей. Перейдите по ссылке для завершения оплаты:",
                 reply_markup=keyboard,

handlers/payments/robokassa_pay.py

@@ -1,4 +1,5 @@
 import hashlib
+from typing import Any
 
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
@@ -6,13 +7,13 @@ from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
-from loguru import logger
 from robokassa import HashAlgorithm, Robokassa
 
-from bot import bot
-from config import ROBOKASSA_LOGIN, ROBOKASSA_PASSWORD1, ROBOKASSA_PASSWORD2, ROBOKASSA_TEST_MODE
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from config import ROBOKASSA_ENABLE, ROBOKASSA_LOGIN, ROBOKASSA_PASSWORD1, ROBOKASSA_PASSWORD2, ROBOKASSA_TEST_MODE
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
+from logger import logger
 
 router = Router()
 
@@ -22,65 +23,34 @@ class ReplenishBalanceState(StatesGroup):
     waiting_for_payment_confirmation_robokassa = State()
 
 
-robokassa = Robokassa(
-    merchant_login=ROBOKASSA_LOGIN,
-    password1=ROBOKASSA_PASSWORD1,
-    password2=ROBOKASSA_PASSWORD2,
-    algorithm=HashAlgorithm.md5,
-    is_test=ROBOKASSA_TEST_MODE,
-)
-
-logger.info("Robokassa initialized with login: {}", ROBOKASSA_LOGIN)
-
-
-def generate_payment_link(amount, inv_id, description):
-    """Генерация ссылки на оплату."""
-    logger.debug(
-        f"Generating payment link for amount: {amount}, inv_id: {inv_id}, description: {description}"
+if ROBOKASSA_ENABLE:
+    robokassa = Robokassa(
+        merchant_login=ROBOKASSA_LOGIN,
+        password1=ROBOKASSA_PASSWORD1,
+        password2=ROBOKASSA_PASSWORD2,
+        algorithm=HashAlgorithm.md5,
+        is_test=ROBOKASSA_TEST_MODE,
     )
+
+    logger.info("Robokassa initialized with login: {}", ROBOKASSA_LOGIN)
+
+
+def generate_payment_link(amount, inv_id, description, tg_id):
+    """Генерация ссылки на оплату."""
+    logger.debug(f"Generating payment link for amount: {amount}, inv_id: {inv_id}, description: {description}")
     payment_link = robokassa._payment.link.generate_by_script(
         out_sum=amount,
         inv_id=inv_id,
-        description="description",
+        description="пополнение баланса",
+        id=f"{tg_id}",
     )
     logger.info(f"Generated payment link: {payment_link}")
     return payment_link
 
 
-async def send_message_with_deletion(
-    chat_id, text, reply_markup=None, state=None, message_key="last_message_id"
-):
-    if state:
-        try:
-            state_data = await state.get_data()
-            previous_message_id = state_data.get(message_key)
-
-            if previous_message_id:
-                logger.debug(
-                    f"Deleting previous message with ID: {previous_message_id}"
-                )
-                await bot.delete_message(
-                    chat_id=chat_id, message_id=previous_message_id
-                )
-
-            sent_message = await bot.send_message(
-                chat_id=chat_id, text=text, reply_markup=reply_markup
-            )
-            await state.update_data({message_key: sent_message.message_id})
-
-            logger.debug(f"Sent new message with ID: {sent_message.message_id}")
-        except Exception as e:
-            logger.error(f"Ошибка при удалении/отправке сообщения: {e}")
-            return None
-
-    return sent_message
-
-
 @router.callback_query(F.data == "pay_robokassa")
-async def process_callback_pay_robokassa(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
+async def process_callback_pay_robokassa(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
+    tg_id = callback_query.message.chat.id
     logger.info(f"User {tg_id} initiated Robokassa payment.")
 
     builder = InlineKeyboardBuilder()
@@ -105,52 +75,36 @@ async def process_callback_pay_robokassa(
             )
     builder.row(
         InlineKeyboardButton(
-            text="💰 Ввести свою сумму", callback_data="enter_custom_amount_robokassa"
+            text="💰 Ввести свою сумму",
+            callback_data="enter_custom_amount_robokassa",
         )
     )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="back_to_profile"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
 
     key_count = await get_key_count(tg_id)
 
     if key_count == 0:
         exists = await check_connection_exists(tg_id)
         if not exists:
-            await add_connection(tg_id, balance=0.0, trial=0)
+            await add_connection(tg_id, balance=0.0, trial=0, session=session)
             logger.info(f"Created new connection for user {tg_id} with balance 0.0.")
 
-    try:
-        await bot.delete_message(
-            chat_id=tg_id, message_id=callback_query.message.message_id
-        )
-        logger.debug(f"Deleted message with ID: {callback_query.message.message_id}")
-    except Exception as e:
-        logger.error(f"Не удалось удалить сообщение: {e}")
-
-    await bot.send_message(
-        chat_id=tg_id,
+    await callback_query.message.answer(
         text="Выберите сумму пополнения:",
         reply_markup=builder.as_markup(),
     )
     await state.set_state(ReplenishBalanceState.choosing_amount_robokassa)
     logger.info(f"Displayed amount selection for user {tg_id}.")
-    await callback_query.answer()
 
 
 @router.callback_query(F.data.startswith("robokassa_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     logger.info(f"Получены данные callback_data: {callback_query.data}")
 
     data = callback_query.data.split("|")
     if len(data) != 3 or data[1] != "amount":
         logger.error("Ошибка: callback_data не соответствует формату.")
-        await send_message_with_deletion(
-            chat_id=callback_query.from_user.id,
-            text="Неверные данные для выбора суммы.",
-            state=state,
-        )
-        await callback_query.answer("Ошибка: данные повреждены.")
+        await callback_query.message.answer("Ошибка: данные повреждены.")
         return
 
     amount_str = data[2]
@@ -160,25 +114,17 @@ async def process_amount_selection(
             raise ValueError("Сумма должна быть положительным числом.")
     except ValueError as e:
         logger.error(f"Некорректное значение суммы: {amount_str}. Ошибка: {e}")
-        await send_message_with_deletion(
-            chat_id=callback_query.from_user.id,
-            text="Некорректная сумма. Попробуйте снова.",
-            state=state,
-        )
-        await callback_query.answer("Некорректная сумма.")
+        await callback_query.message.answer("Некорректная сумма.")
         return
 
     await state.update_data(amount=amount)
-    logger.info(f"User {callback_query.from_user.id} selected amount: {amount}.")
+    logger.info(f"User {callback_query.message.chat.id} selected amount: {amount}.")
+    inv_id = 0
 
-    tg_id = callback_query.from_user.id
-    payment_url = generate_payment_link(
-        amount,
-        tg_id,
-        "Пополнение баланса",
-    )
+    tg_id = callback_query.message.chat.id
+    payment_url = generate_payment_link(amount, inv_id, "Пополнение баланса", tg_id)
 
-    logger.info(f"Payment URL for user {callback_query.from_user.id}: {payment_url}")
+    logger.info(f"Payment URL for user {callback_query.message.chat.id}: {payment_url}")
 
     confirm_keyboard = InlineKeyboardMarkup(
         inline_keyboard=[
@@ -187,95 +133,86 @@ async def process_amount_selection(
         ]
     )
 
-    await callback_query.message.edit_text(
+    await callback_query.message.answer(
         text=f"Вы выбрали пополнение на {amount} рублей. Для оплаты перейдите по ссылке ниже:",
         reply_markup=confirm_keyboard,
     )
-    logger.info(f"Payment link sent to user {callback_query.from_user.id}.")
-    await callback_query.answer()
+    logger.info(f"Payment link sent to user {callback_query.message.chat.id}.")
 
 
 async def robokassa_webhook(request):
-    """Обработка webhook-уведомлений от Robokassa."""
+    """Обработка webhook-уведомлений от Robokassa с учетом shp_id."""
     try:
         params = await request.post()
-        logger.debug(f"Received webhook params: {params}")
+
+        logger.info(f"Received webhook params: {params}")
+
+        amount = params.get("OutSum")
+        inv_id = params.get("InvId")
+        shp_id = params.get("shp_id")
+        signature_value = params.get("SignatureValue")
+
+        logger.info(f"OutSum: {amount}, InvId: {inv_id}, shp_id: {shp_id}, SignatureValue: {signature_value}")
 
         if not check_payment_signature(params):
             logger.error("Неверная подпись или данные запроса.")
             return web.Response(status=400)
 
-        amount = params.get("OutSum")
-        inv_id = params.get("InvId")
-
-        if not amount or not inv_id:
+        if not amount or not inv_id or not shp_id:
             logger.error("Отсутствуют обязательные параметры.")
             return web.Response(status=400)
 
-        tg_id = inv_id
+        tg_id = shp_id
+
+        logger.info(f"Processing payment for user {tg_id} with amount {amount}.")
 
         await update_balance(int(tg_id), float(amount))
         await send_payment_success_notification(tg_id, float(amount))
 
+        await add_payment(int(tg_id), float(amount), "robokassa")
+
         logger.info(f"Payment successful. Balance updated for user {tg_id}.")
+
         return web.Response(text=f"OK{inv_id}")
+
     except Exception as e:
         logger.error(f"Error processing webhook: {e}")
         return web.Response(status=500)
 
 
 def check_payment_signature(params):
-    """Проверка подписи запроса от Robokassa."""
+    """Проверка подписи запроса от Robokassa с учетом shp_id."""
     out_sum = params.get("OutSum")
     inv_id = params.get("InvId")
     signature_value = params.get("SignatureValue")
+    shp_id = params.get("shp_id")
 
-    signature_string = f"{out_sum}:{inv_id}:{ROBOKASSA_PASSWORD2}"
+    signature_string = f"{out_sum}:{inv_id}:{ROBOKASSA_PASSWORD2}:shp_id={shp_id}"
 
-    expected_signature = (
-        hashlib.md5(signature_string.encode("utf-8")).hexdigest().upper()
-    )
+    logger.info(f"Signature string before hashing: {signature_string}")
 
-    logger.debug(f"Expected signature: {expected_signature}")
-    logger.debug(f"Received signature: {signature_value}")
+    expected_signature = hashlib.md5(signature_string.encode("utf-8")).hexdigest().upper()
 
-    return signature_value == expected_signature
+    logger.info(f"Expected signature: {expected_signature}")
+    logger.info(f"Received signature: {signature_value}")
 
-
-async def send_payment_success_notification(user_id: int, amount: float):
-    builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="Перейти в профиль", callback_data="view_profile")
-    )
-
-    await bot.send_message(
-        chat_id=user_id,
-        text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
-        reply_markup=builder.as_markup(),
-    )
-    logger.info(f"Sent payment success notification to user {user_id}.")
+    return signature_value.upper() == expected_signature.upper()
 
 
 @router.callback_query(F.data == "enter_custom_amount_robokassa")
-async def process_custom_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
+async def process_custom_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
+    tg_id = callback_query.message.chat.id
     logger.info(f"User {tg_id} chose to enter a custom amount.")
 
-    await callback_query.message.edit_text(
-        text="Пожалуйста, введите сумму пополнения в рублях (например, 150):"
-    )
-    await state.set_state(
-        ReplenishBalanceState.waiting_for_payment_confirmation_robokassa
-    )
-    await callback_query.answer()
+    await callback_query.message.answer(text="Пожалуйста, введите сумму пополнения в рублях (например, 150):")
+    await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_robokassa)
 
 
 @router.message(ReplenishBalanceState.waiting_for_payment_confirmation_robokassa)
 async def handle_custom_amount_input(message: types.Message, state: FSMContext):
-    tg_id = message.from_user.id
+    tg_id = message.chat.id
     logger.info(f"User {tg_id} entered custom amount: {message.text}")
+    inv_id = 0
 
     try:
         amount = int(message.text)
@@ -284,11 +221,7 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext):
 
         await state.update_data(amount=amount)
 
-        payment_url = generate_payment_link(
-            amount,
-            tg_id,
-            "Пополнение баланса",
-        )
+        payment_url = generate_payment_link(amount, inv_id, "Пополнение баланса", tg_id)
 
         logger.info(f"Generated payment link for user {tg_id}: {payment_url}")
 
@@ -306,6 +239,4 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext):
         await state.clear()
     except ValueError as e:
         logger.error(f"Некорректная сумма от пользователя {tg_id}: {e}")
-        await message.answer(
-            text="Введите корректную сумму в рублях (целое положительное число)."
-        )
+        await message.answer(text="Введите корректную сумму в рублях (целое положительное число).")

handlers/payments/stars_pay.py

@@ -1,12 +1,14 @@
+from typing import Any
+
 from aiogram import F, Router, types
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import InlineKeyboardButton, LabeledPrice, PreCheckoutQuery
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
 from config import RUB_TO_XTR
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -19,38 +21,12 @@ class ReplenishBalanceState(StatesGroup):
     entering_custom_amount_stars = State()
 
 
-async def send_message_with_deletion(
-    chat_id, text, reply_markup=None, state=None, message_key="last_message_id"
-):
-    if state:
-        try:
-            state_data = await state.get_data()
-            previous_message_id = state_data.get(message_key)
-
-            if previous_message_id:
-                await bot.delete_message(
-                    chat_id=chat_id, message_id=previous_message_id
-                )
-
-            sent_message = await bot.send_message(
-                chat_id=chat_id, text=text, reply_markup=reply_markup
-            )
-            await state.update_data({message_key: sent_message.message_id})
-
-        except Exception as e:
-            logger.error(f"Ошибка при удалении/отправке сообщения: {e}")
-            return None
-
-    return sent_message
-
-
 @router.callback_query(F.data == "pay_stars")
-async def process_callback_pay_stars(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
+async def process_callback_pay_stars(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
+    tg_id = callback_query.message.chat.id
 
     builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"))
 
     for i in range(0, len(PAYMENT_OPTIONS), 2):
         if i + 1 < len(PAYMENT_OPTIONS):
@@ -73,12 +49,8 @@ async def process_callback_pay_stars(
             )
     builder.row(
         InlineKeyboardButton(
-            text="💰 Ввести свою сумму", callback_data="enter_custom_amount_stars"
-        )
-    )
-    builder.row(
-        InlineKeyboardButton(
-            text="🤖 Бот для покупки звезд", url="https://t.me/PremiumBot"
+            text="💰 Ввести свою сумму",
+            callback_data="enter_custom_amount_stars",
         )
     )
     builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
@@ -88,27 +60,23 @@ async def process_callback_pay_stars(
     if key_count == 0:
         exists = await check_connection_exists(tg_id)
         if not exists:
-            await add_connection(tg_id, balance=0.0, trial=0)
+            await add_connection(tg_id, balance=0.0, trial=0, session=session)
 
     try:
         await callback_query.message.delete()
     except Exception as e:
         logger.error(f"Не удалось удалить сообщение: {e}")
 
-    await bot.send_message(
-        chat_id=tg_id,
+    await callback_query.message.answer(
         text="Выберите сумму пополнения:",
         reply_markup=builder.as_markup(),
     )
 
     await state.set_state(ReplenishBalanceState.choosing_amount_stars)
-    await callback_query.answer()
 
 
 @router.callback_query(F.data.startswith("stars_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     data = callback_query.data.split("|", 1)
 
     if len(data) != 2:
@@ -136,7 +104,6 @@ async def process_amount_selection(
     await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_stars)
 
     try:
-        await callback_query.message.delete()
 
         builder = InlineKeyboardBuilder()
         builder.row(
@@ -159,31 +126,11 @@ async def process_amount_selection(
         logger.error(f"Ошибка при создании платежа: {e}")
         await callback_query.message.answer("Произошла ошибка при создании платежа.")
 
-    await callback_query.answer()
-
-
-async def send_payment_success_notification(user_id: int, amount: float):
-    try:
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="Перейти в профиль", callback_data="view_profile")
-        )
-        await bot.send_message(
-            chat_id=user_id,
-            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
-            reply_markup=builder.as_markup(),
-        )
-    except Exception as e:
-        logger.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")
-
 
 @router.callback_query(F.data == "enter_custom_amount_stars")
-async def process_enter_custom_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    await callback_query.message.edit_text(text="Введите сумму пополнения:")
+async def process_enter_custom_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.answer(text="Введите сумму пополнения:")
     await state.set_state(ReplenishBalanceState.entering_custom_amount_stars)
-    await callback_query.answer()
 
 
 @router.message(ReplenishBalanceState.entering_custom_amount_stars)
@@ -191,15 +138,11 @@ async def process_custom_amount_input(message: types.Message, state: FSMContext)
     if message.text.isdigit():
         amount = int(message.text)
         if amount // RUB_TO_XTR <= 0:
-            await message.answer(
-                f"Сумма должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer(f"Сумма должна быть больше {RUB_TO_XTR}. Пожалуйста, введите сумму еще раз:")
             return
 
         await state.update_data(amount=amount)
-        await state.set_state(
-            ReplenishBalanceState.waiting_for_payment_confirmation_stars
-        )
+        await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_stars)
         try:
             builder = InlineKeyboardBuilder()
             builder.row(
@@ -234,9 +177,10 @@ async def on_successful_payment(
     message: types.Message,
 ):
     try:
-        user_id = int(message.from_user.id)
+        user_id = int(message.chat.id)
         amount = float(message.successful_payment.invoice_payload.split("_")[0])
         logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
+        await add_payment(int(user_id), float(amount), "stars")
         await update_balance(user_id, amount)
         await send_payment_success_notification(user_id, amount)
     except ValueError as e:

handlers/payments/utils.py

@@ -0,0 +1,18 @@
+from aiogram.types import InlineKeyboardButton
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from bot import bot
+from logger import logger
+
+
+async def send_payment_success_notification(user_id: int, amount: float):
+    try:
+        builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+        await bot.send_message(
+            chat_id=user_id,
+            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
+            reply_markup=builder.as_markup(),
+        )
+    except Exception as e:
+        logger.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")

handlers/payments/yookassa_pay.py

@@ -1,3 +1,4 @@
+from typing import Any
 import uuid
 
 from aiogram import F, Router, types
@@ -8,9 +9,9 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 from aiohttp import web
 from yookassa import Configuration, Payment
 
-from bot import bot
 from config import YOOKASSA_ENABLE, YOOKASSA_SECRET_KEY, YOOKASSA_SHOP_ID
-from database import add_connection, check_connection_exists, get_key_count, update_balance
+from database import add_connection, add_payment, check_connection_exists, get_key_count, update_balance
+from handlers.payments.utils import send_payment_success_notification
 from handlers.texts import PAYMENT_OPTIONS
 from logger import logger
 
@@ -29,36 +30,9 @@ class ReplenishBalanceState(StatesGroup):
     entering_custom_amount_yookassa = State()
 
 
-async def send_message_with_deletion(
-    chat_id, text, reply_markup=None, state=None, message_key="last_message_id"
-):
-    if state:
-        try:
-            state_data = await state.get_data()
-            previous_message_id = state_data.get(message_key)
-
-            if previous_message_id:
-                await bot.delete_message(
-                    chat_id=chat_id, message_id=previous_message_id
-                )
-
-            sent_message = await bot.send_message(
-                chat_id=chat_id, text=text, reply_markup=reply_markup
-            )
-            await state.update_data({message_key: sent_message.message_id})
-
-        except Exception as e:
-            logger.error(f"Ошибка при удалении/отправке сообщения: {e}")
-            return None
-
-    return sent_message
-
-
 @router.callback_query(F.data == "pay_yookassa")
-async def process_callback_pay_yookassa(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    tg_id = callback_query.from_user.id
+async def process_callback_pay_yookassa(callback_query: types.CallbackQuery, state: FSMContext, session: Any):
+    tg_id = callback_query.message.chat.id
 
     builder = InlineKeyboardBuilder()
 
@@ -71,7 +45,7 @@ async def process_callback_pay_yookassa(
                 ),
                 InlineKeyboardButton(
                     text=PAYMENT_OPTIONS[i + 1]["text"],
-                    callback_data=f'yookassa_{PAYMENT_OPTIONS[i + 1]["callback_data"]},',
+                    callback_data=f'yookassa_{PAYMENT_OPTIONS[i + 1]["callback_data"]}',
                 ),
             )
         else:
@@ -83,77 +57,56 @@ async def process_callback_pay_yookassa(
             )
     builder.row(
         InlineKeyboardButton(
-            text="💰 Ввести свою сумму", callback_data="enter_custom_amount_yookassa"
+            text="💰 Ввести свою сумму",
+            callback_data="enter_custom_amount_yookassa",
         )
     )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_profile"))
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="pay"))
 
     key_count = await get_key_count(tg_id)
 
     if key_count == 0:
         exists = await check_connection_exists(tg_id)
         if not exists:
-            await add_connection(tg_id, balance=0.0, trial=0)
+            await add_connection(tg_id, balance=0.0, trial=0, session=session)
 
-    try:
-        await bot.delete_message(
-            chat_id=tg_id, message_id=callback_query.message.message_id
-        )
-    except Exception as e:
-        logger.error(f"Не удалось удалить сообщение: {e}")
-
-    await bot.send_message(
-        chat_id=tg_id,
+    await callback_query.message.answer(
         text="Выберите сумму пополнения:",
         reply_markup=builder.as_markup(),
     )
 
     await state.set_state(ReplenishBalanceState.choosing_amount_yookassa)
-    await callback_query.answer()
 
 
 @router.callback_query(F.data.startswith("yookassa_amount|"))
-async def process_amount_selection(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
+async def process_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
     data = callback_query.data.split("|", 1)
 
     if len(data) != 2:
-        await send_message_with_deletion(
-            callback_query.from_user.id,
-            "Неверные данные для выбора суммы.",
-            state=state,
-            message_key="amount_error_message_id",
-        )
         return
 
     amount_str = data[1]
     try:
         amount = int(amount_str)
     except ValueError:
-        await send_message_with_deletion(
-            callback_query.from_user.id,
-            "Некорректная сумма.",
-            state=state,
-            message_key="amount_error_message_id",
-        )
         return
 
     await state.update_data(amount=amount)
-    await state.set_state(
-        ReplenishBalanceState.waiting_for_payment_confirmation_yookassa
-    )
+    await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_yookassa)
 
     # state_data = await state.get_data()
     customer_name = callback_query.from_user.full_name
-    customer_id = callback_query.from_user.id
+    customer_id = callback_query.message.chat.id
 
     customer_email = f"{customer_id}@solo.net"
 
     payment = Payment.create(
         {
             "amount": {"value": str(amount), "currency": "RUB"},
-            "confirmation": {"type": "redirect", "return_url": "https://pocomacho.ru/"},
+            "confirmation": {
+                "type": "redirect",
+                "return_url": "https://pocomacho.ru/success.html",
+            },
             "capture": True,
             "description": "Пополнение баланса",
             "receipt": {
@@ -186,32 +139,12 @@ async def process_amount_selection(
             ]
         )
 
-        await callback_query.message.edit_text(
+        await callback_query.message.answer(
             text=f"Вы выбрали пополнение на {amount} рублей.",
             reply_markup=confirm_keyboard,
         )
     else:
-        await send_message_with_deletion(
-            callback_query.from_user.id, "Ошибка при создании платежа.", state=state
-        )
-
-    await callback_query.answer()
-
-
-async def send_payment_success_notification(user_id: int, amount: float):
-    try:
-        builder = InlineKeyboardBuilder()
-        builder.row(
-            InlineKeyboardButton(text="Перейти в профиль", callback_data="view_profile")
-        )
-
-        await bot.send_message(
-            chat_id=user_id,
-            text=f"Ваш баланс успешно пополнен на {amount} рублей. Спасибо за оплату!",
-            reply_markup=builder.as_markup(),
-        )
-    except Exception as e:
-        logger.error(f"Ошибка при отправке уведомления пользователю {user_id}: {e}")
+        await callback_query.message.answer("Ошибка при создании платежа.")
 
 
 async def yookassa_webhook(request):
@@ -224,6 +157,7 @@ async def yookassa_webhook(request):
             user_id = int(user_id_str)
             amount = float(amount_str)
             logger.debug(f"Payment succeeded for user_id: {user_id}, amount: {amount}")
+            await add_payment(int(user_id), float(amount), "yookassa")
             await update_balance(user_id, amount)
             await send_payment_success_notification(user_id, amount)
         except ValueError as e:
@@ -233,12 +167,9 @@ async def yookassa_webhook(request):
 
 
 @router.callback_query(F.data == "enter_custom_amount_yookassa")
-async def process_enter_custom_amount(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    await callback_query.message.edit_text(text="Введите сумму пополнения:")
+async def process_enter_custom_amount(callback_query: types.CallbackQuery, state: FSMContext):
+    await callback_query.message.answer(text="Введите сумму пополнения:")
     await state.set_state(ReplenishBalanceState.entering_custom_amount_yookassa)
-    await callback_query.answer()
 
 
 @router.message(ReplenishBalanceState.entering_custom_amount_yookassa)
@@ -246,15 +177,11 @@ async def process_custom_amount_input(message: types.Message, state: FSMContext)
     if message.text.isdigit():
         amount = int(message.text)
         if amount <= 0:
-            await message.answer(
-                "Сумма должна быть больше нуля. Пожалуйста, введите сумму еще раз:"
-            )
+            await message.answer("Сумма должна быть больше нуля. Пожалуйста, введите сумму еще раз:")
             return
 
         await state.update_data(amount=amount)
-        await state.set_state(
-            ReplenishBalanceState.waiting_for_payment_confirmation_yookassa
-        )
+        await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_yookassa)
 
         try:
             payment = Payment.create(
@@ -262,26 +189,29 @@ async def process_custom_amount_input(message: types.Message, state: FSMContext)
                     "amount": {"value": str(amount), "currency": "RUB"},
                     "confirmation": {
                         "type": "redirect",
-                        "return_url": "https://pocomacho.ru/",
+                        "return_url": "https://pocomacho.ru/success.html",
                     },
                     "capture": True,
                     "description": "Пополнение баланса",
                     "receipt": {
                         "customer": {
                             "full_name": message.from_user.full_name,
-                            "email": f"{message.from_user.id}@solo.net",
+                            "email": f"{message.chat.id}@solo.net",
                             "phone": "79000000000",
                         },
                         "items": [
                             {
                                 "description": "Пополнение баланса",
                                 "quantity": "1.00",
-                                "amount": {"value": str(amount), "currency": "RUB"},
+                                "amount": {
+                                    "value": str(amount),
+                                    "currency": "RUB",
+                                },
                                 "vat_code": 6,
                             }
                         ],
                     },
-                    "metadata": {"user_id": message.from_user.id},
+                    "metadata": {"user_id": message.chat.id},
                 },
                 uuid.uuid4(),
             )

handlers/profile.py

@@ -5,139 +5,105 @@ from aiogram.fsm.context import FSMContext
 from aiogram.types import BufferedInputFile, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
-from config import CHANNEL_URL
+from config import NEWS_MESSAGE, RENEWAL_PLANS
 from database import get_balance, get_key_count, get_referral_stats
 from handlers.texts import get_referral_link, invite_message_send, profile_message_send
-from logger import logger
 
 router = Router()
 
 
-async def process_callback_view_profile(
-    callback_query: types.CallbackQuery, state: FSMContext
-):
-    chat_id = callback_query.from_user.id
+@router.callback_query(F.data == "profile")
+async def process_callback_view_profile(callback_query: types.CallbackQuery, state: FSMContext, admin: bool):
+    chat_id = callback_query.message.chat.id
     username = callback_query.from_user.full_name
+    image_path = os.path.join("img", "pic.jpg")
+    key_count = await get_key_count(chat_id)
+    balance = await get_balance(chat_id)
+    if balance is None:
+        balance = 0
 
-    image_path = os.path.join(os.path.dirname(__file__), "pic.jpg")
+    profile_message = profile_message_send(username, chat_id, balance, key_count)
 
-    try:
-        key_count = await get_key_count(chat_id)
-        balance = await get_balance(chat_id)
-        if balance is None:
-            balance = 0
+    if key_count == 0:
+        profile_message += "\n<pre>🔧 <i>Нажмите кнопку ➕ Устройство, чтобы настроить VPN-подключение</i></pre>"
+    else:
+        profile_message += f"\n<pre>🔧 <i>{NEWS_MESSAGE}</i></pre>"
 
-        profile_message = profile_message_send(username, chat_id, balance, key_count)
-
-        if key_count == 0:
-            profile_message += "\n🔧 <i>Нажмите кнопку ➕ Устройство, чтобы настроить VPN-подключение</i>"
-
-        builder = InlineKeyboardBuilder()
-        builder.row(InlineKeyboardButton(text="📢 Наш канал", url=CHANNEL_URL))
-        builder.row(
-            InlineKeyboardButton(text="➕ Устройство", callback_data="create_key"),
-            InlineKeyboardButton(text="📱 Мои устройства", callback_data="view_keys"),
-        )
-        builder.row(
-            InlineKeyboardButton(
-                text="💳 Пополнить баланс",
-                callback_data="pay",
-            )
-        )
-        builder.row(
-            InlineKeyboardButton(text="👥 Пригласить друзей", callback_data="invite"),
-            InlineKeyboardButton(text="📘 Инструкции", callback_data="instructions"),
-        )
-        builder.row(
-            InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")
-        )
-        builder.row(
-            InlineKeyboardButton(text="⬅️ Главное меню", callback_data="back_to_menu")
+    builder = InlineKeyboardBuilder()
+    builder.row(
+        InlineKeyboardButton(text="➕ Устройство", callback_data="create_key"),
+        InlineKeyboardButton(text="📱 Мои устройства", callback_data="view_keys"),
+    )
+    builder.row(
+        InlineKeyboardButton(
+            text="💳 Пополнить баланс",
+            callback_data="pay",
         )
+    )
+    builder.row(
+        InlineKeyboardButton(text="👥 Пригласить друзей", callback_data="invite"),
+        InlineKeyboardButton(text="📘 Инструкции", callback_data="instructions"),
+    )
+    builder.row(InlineKeyboardButton(text="💡 Тарифы", callback_data="view_tariffs"))
+    if admin:
+        builder.row(InlineKeyboardButton(text="🔧 Администратор", callback_data="admin"))
+    builder.row(InlineKeyboardButton(text="⬅️ Главное меню", callback_data="start"))
 
-        try:
-            await callback_query.message.delete()
-        except Exception as e:
-            logger.error(f"❗ Ошибка при удалении сообщения: {e}")
-
-        if os.path.isfile(image_path):
-            with open(image_path, "rb") as image_file:
-                await bot.send_photo(
-                    chat_id=chat_id,
-                    photo=BufferedInputFile(image_file.read(), filename="pic.jpg"),
-                    caption=profile_message,
-                    parse_mode="HTML",
-                    reply_markup=builder.as_markup(),
-                )
-        else:
-            await bot.send_message(
-                chat_id=chat_id,
-                text=profile_message,
-                parse_mode="HTML",
+    if os.path.isfile(image_path):
+        with open(image_path, "rb") as image_file:
+            await callback_query.message.answer_photo(
+                photo=BufferedInputFile(image_file.read(), filename="pic.jpg"),
+                caption=profile_message,
                 reply_markup=builder.as_markup(),
             )
-
-    except Exception as e:
-        await bot.send_message(
-            chat_id, f"❗️ Не удалось загрузить профиль. Техническая ошибка: {e}"
+    else:
+        await callback_query.message.answer(
+            text=profile_message,
+            reply_markup=builder.as_markup(),
         )
 
-    await callback_query.answer()
+
+@router.callback_query(F.data == "view_tariffs")
+async def view_tariffs_handler(callback_query: types.CallbackQuery):
+    builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+
+    await callback_query.message.answer(
+        "<b>🚀 Доступные тарифы VPN:</b>\n\n"
+        + "\n".join(
+            [
+                f"{months} {'месяц' if months == '1' else 'месяца' if int(months) in [2, 3, 4] else 'месяцев'}: "
+                f"{RENEWAL_PLANS[months]['price']} "
+                f"{'💳' if months == '1' else '🌟' if months == '3' else '🔥' if months == '6' else '🚀'} рублей"
+                for months in sorted(RENEWAL_PLANS.keys(), key=int)
+            ]
+        ),
+        reply_markup=builder.as_markup(),
+    )
 
 
 @router.callback_query(F.data == "invite")
 async def invite_handler(callback_query: types.CallbackQuery):
-    chat_id = callback_query.from_user.id
+    chat_id = callback_query.message.chat.id
     referral_link = get_referral_link(chat_id)
 
     referral_stats = await get_referral_stats(chat_id)
 
     invite_message = invite_message_send(referral_link, referral_stats)
 
-    image_path = os.path.join(os.path.dirname(__file__), "pic_invite.jpg")
+    image_path = os.path.join("img", "pic_invite.jpg")
 
     builder = InlineKeyboardBuilder()
-    builder.row(
-        InlineKeyboardButton(text="⬅️ Вернуться в профиль", callback_data="view_profile")
-    )
-
-    try:
-        await callback_query.message.delete()
-    except Exception as e:
-        logger.error(f"Ошибка при удалении сообщения: {e}")
-
-    try:
-        if os.path.isfile(image_path):
-            with open(image_path, "rb") as image_file:
-                await bot.send_photo(
-                    chat_id=chat_id,
-                    photo=BufferedInputFile(
-                        image_file.read(), filename="pic_invite.jpg"
-                    ),
-                    caption=invite_message,
-                    parse_mode="HTML",
-                    reply_markup=builder.as_markup(),
-                )
-        else:
-            await bot.send_message(
-                chat_id=chat_id,
-                text=invite_message,
-                parse_mode="HTML",
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
+    if os.path.isfile(image_path):
+        with open(image_path, "rb") as image_file:
+            await callback_query.message.answer_photo(
+                photo=BufferedInputFile(image_file.read(), filename="pic_invite.jpg"),
+                caption=invite_message,
                 reply_markup=builder.as_markup(),
             )
-    except Exception as e:
-        await bot.send_message(
-            chat_id=chat_id,
-            text=f"❗️ Не удалось отправить сообщение. Техническая ошибка: {e}",
-            parse_mode="HTML",
+    else:
+        await callback_query.message.answer(
+            text=invite_message,
             reply_markup=builder.as_markup(),
         )
-
-    await callback_query.answer()
-
-
-@router.callback_query(F.data == "view_profile")
-async def view_profile_handler(callback_query: types.CallbackQuery, state: FSMContext):
-    await state.clear()
-    await process_callback_view_profile(callback_query, state)

handlers/start.py

@@ -1,118 +1,93 @@
 import os
+from typing import Any
 
 from aiogram import F, Router
 from aiogram.filters import Command
+from aiogram.fsm.context import FSMContext
 from aiogram.types import BufferedInputFile, CallbackQuery, InlineKeyboardButton, Message
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from bot import bot
 from config import CHANNEL_URL, CONNECT_ANDROID, CONNECT_IOS, DOWNLOAD_ANDROID, DOWNLOAD_IOS, SUPPORT_CHAT_URL
-from database import add_connection, add_referral, check_connection_exists, get_trial
+from database import add_connection, add_referral, check_connection_exists, get_trial, use_trial
 from handlers.keys.trial_key import create_trial_key
 from handlers.texts import INSTRUCTIONS_TRIAL, WELCOME_TEXT, get_about_vpn
-from logger import logger
 
 router = Router()
 
 
-async def send_welcome_message(chat_id: int, trial_status: int):
-    image_path = os.path.join(os.path.dirname(__file__), "pic.jpg")
+@router.callback_query(F.data == "start")
+async def handle_start_callback_query(callback_query: CallbackQuery, state: FSMContext, session: Any, admin: bool):
+    await start_command(callback_query.message, state, session, admin)
+
+
+@router.message(Command("start"))
+async def start_command(message: Message, state: FSMContext, session: Any, admin: bool):
+    await state.clear()
+    if message.text:
+        try:
+            referrer_tg_id = int(message.text.split("referral_")[1])
+            await add_referral(message.chat.id, referrer_tg_id, session)
+        except (ValueError, IndexError):
+            pass
+        connection_exists = await check_connection_exists(message.chat.id)
+        if not connection_exists:
+            await add_connection(tg_id=message.chat.id, session=session)
+    trial_status = await get_trial(message.chat.id, session)
+    image_path = os.path.join("img", "pic.jpg")
 
     builder = InlineKeyboardBuilder()
     if trial_status == 0:
-        builder.row(
-            InlineKeyboardButton(text="🔗 Подключить VPN", callback_data="connect_vpn")
-        )
-    builder.row(
-        InlineKeyboardButton(text="👤 Личный кабинет", callback_data="view_profile")
-    )
+        builder.row(InlineKeyboardButton(text="🔗 Подключить VPN", callback_data="connect_vpn"))
+    builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
     builder.row(
         InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL),
     )
     builder.row(
         InlineKeyboardButton(text="📢 Официальный канал", url=CHANNEL_URL),
     )
+    if admin:
+        builder.row(InlineKeyboardButton(text="🔧 Администратор", callback_data="admin"))
     builder.row(InlineKeyboardButton(text="🌐 О нашем VPN", callback_data="about_vpn"))
 
     if os.path.isfile(image_path):
         with open(image_path, "rb") as image_from_buffer:
-            await bot.send_photo(
-                chat_id=chat_id,
+            await message.answer_photo(
                 photo=BufferedInputFile(image_from_buffer.read(), filename="pic.jpg"),
                 caption=WELCOME_TEXT,
-                parse_mode="HTML",
                 reply_markup=builder.as_markup(),
             )
     else:
-        await bot.send_message(
-            chat_id=chat_id,
+        await message.answer(
             text=WELCOME_TEXT,
-            parse_mode="HTML",
             reply_markup=builder.as_markup(),
         )
 
 
-@router.message(Command("start"))
-async def start_command(message: Message):
-    logger.info(f"Received start command with text: {message.text}")
-    if "referral_" in message.text:
-        referrer_tg_id = int(message.text.split("referral_")[1])
-        logger.info(f"Referral ID: {referrer_tg_id}")
-        if not await check_connection_exists(message.from_user.id):
-            await add_connection(message.from_user.id)
-            await add_referral(message.from_user.id, referrer_tg_id)
-            await message.answer("Вас пригласил друг, добро пожаловать!")
-        else:
-            await message.answer("Вы уже зарегистрированы в системе!")
-
-    trial_status = await get_trial(message.from_user.id)
-    await send_welcome_message(message.chat.id, trial_status)
-
-
 @router.callback_query(F.data == "connect_vpn")
-async def handle_connect_vpn(callback_query: CallbackQuery, session):
-    await callback_query.message.delete()
-    user_id = callback_query.from_user.id
+async def handle_connect_vpn(callback_query: CallbackQuery, session: Any):
+    user_id = callback_query.message.chat.id
 
-    trial_key_info = await create_trial_key(user_id)
+    trial_key_info = await create_trial_key(user_id, session)
 
     if "error" in trial_key_info:
         await callback_query.message.answer(trial_key_info["error"])
     else:
-        try:
-            result = await session.execute(
-                """
-                UPDATE connections SET trial = 1 WHERE tg_id = $1
-            """,
-                user_id,
-            )
-            logger.info(f"Rows updated: {result}")
-
-        except Exception as e:
-            logger.error(f"Ошибка при обновлении trial: {e}")
+        await use_trial(user_id, session)
 
         key_message = (
             f"🔑 <b>Ваш персональный ключ доступа:</b>\n"
-            f"<pre>{trial_key_info['key']}</pre>\n\n"
+            f"<code>{trial_key_info['key']}</code>\n\n"
             f"📋 <b>Быстрая инструкция по подключению:</b>\n{INSTRUCTIONS_TRIAL}"
         )
 
+        email = trial_key_info["email"]
+
         builder = InlineKeyboardBuilder()
+        builder.row(InlineKeyboardButton(text="💬 Поддержка", url=SUPPORT_CHAT_URL))
         builder.row(
-            InlineKeyboardButton(text="👤 Личный кабинет", callback_data="view_profile")
+            InlineKeyboardButton(text="🍏 Скачать для iOS", url=DOWNLOAD_IOS),
+            InlineKeyboardButton(text="🤖 Скачать для Android", url=DOWNLOAD_ANDROID),
         )
-
-        builder.row(
-            InlineKeyboardButton(
-                text="🍏 Скачать для iOS",
-                url=DOWNLOAD_IOS,
-            ),
-            InlineKeyboardButton(
-                text="🤖 Скачать для Android",
-                url=DOWNLOAD_ANDROID,
-            ),
-        )
-
         builder.row(
             InlineKeyboardButton(
                 text="🍏 Подключить на iOS",
@@ -123,35 +98,22 @@ async def handle_connect_vpn(callback_query: CallbackQuery, session):
                 url=f'{CONNECT_ANDROID}{trial_key_info["key"]}',
             ),
         )
+        builder.row(InlineKeyboardButton(text="💻 Windows/Linux", callback_data=f"connect_pc|{email}"))
+        builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
 
-        await callback_query.message.answer(
-            key_message, parse_mode="HTML", reply_markup=builder.as_markup()
-        )
-
-    await callback_query.answer()
+        await callback_query.message.answer(key_message, reply_markup=builder.as_markup())
 
 
 @router.callback_query(F.data == "about_vpn")
 async def handle_about_vpn(callback_query: CallbackQuery):
-    await callback_query.message.delete()
-
-    about_vpn_message = get_about_vpn("3.1.0_Stable")
-
     builder = InlineKeyboardBuilder()
+    builder.row(InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate"))
     builder.row(
-        InlineKeyboardButton(text="💰 Поддержать проект", callback_data="donate")
+        InlineKeyboardButton(text="📞 Техническая поддержка", url=SUPPORT_CHAT_URL),
     )
-    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="back_to_menu"))
-
-    await callback_query.message.answer(
-        about_vpn_message, parse_mode="HTML", reply_markup=builder.as_markup()
+    builder.row(
+        InlineKeyboardButton(text="📢 Официальный канал", url=CHANNEL_URL),
     )
-    await callback_query.answer()
+    builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="start"))
 
-
-@router.callback_query(F.data == "back_to_menu")
-async def handle_back_to_menu(callback_query: CallbackQuery):
-    await callback_query.message.delete()
-    trial_status = await get_trial(callback_query.from_user.id)
-    await send_welcome_message(callback_query.from_user.id, trial_status)
-    await callback_query.answer()
+    await callback_query.message.answer(get_about_vpn("3.2.2-Release"), reply_markup=builder.as_markup())

handlers/utils.py

@@ -1,79 +1,88 @@
 import random
 import re
+from typing import Optional
 
 import asyncpg
 
 from bot import bot
-from config import CLUSTERS, DATABASE_URL
+from config import DATABASE_URL
+from database import get_servers_from_db
 from logger import logger
 
 
 def sanitize_key_name(key_name: str) -> str:
+    """
+    Очищает название ключа, оставляя только допустимые символы.
+
+    Args:
+        key_name (str): Исходное название ключа.
+
+    Returns:
+        str: Очищенное название ключа в нижнем регистре.
+    """
     return re.sub(r"[^a-z0-9@._-]", "", key_name.lower())
 
 
-def generate_random_email():
-    """Генерирует случайный набор символов."""
-    random_string = "".join(random.choices("abcdefghijklmnopqrstuvwxyz0123456789", k=6))
-    return random_string
-
-
-async def get_least_loaded_cluster():
+def generate_random_email(length: int = 6) -> str:
     """
-    Функция для получения кластера с наименьшей загрузкой (по количеству ключей).
-    Возвращает идентификатор кластера с наименьшей загрузкой или первый кластер из конфигурации,
-    если загруженность не определяется. В случае отсутствия кластеров с номером, возвращает 'cluster1'.
+    Генерирует случайный email с заданной длиной.
+
+    Args:
+        length (int, optional): Длина случайной строки. По умолчанию 6.
+
+    Returns:
+        str: Сгенерированная случайная строка.
     """
-    cluster_loads = {}
+    return "".join(random.choices("abcdefghijklmnopqrstuvwxyz0123456789", k=length))
 
-    conn = await asyncpg.connect(DATABASE_URL)
-    try:
-        keys = await conn.fetch("SELECT * FROM keys")
-        for key in keys:
-            cluster_id = key["server_id"]
 
-            if re.match(r"^cluster\d+$", cluster_id):
-                if cluster_id not in cluster_loads:
-                    cluster_loads[cluster_id] = 0
-                cluster_loads[cluster_id] += 1
-    finally:
-        await conn.close()
+async def get_least_loaded_cluster() -> str:
+    """
+    Определяет кластер с наименьшей загрузкой.
 
-    logger.info(f"Cluster loads: {cluster_loads}")
+    Returns:
+        str: Идентификатор наименее загруженного кластера.
+    """
+    servers = await get_servers_from_db()
+
+    cluster_loads: dict[str, int] = {cluster_id: 0 for cluster_id in servers.keys()}
+
+    async with asyncpg.create_pool(DATABASE_URL) as pool:
+        async with pool.acquire() as conn:
+            keys = await conn.fetch("SELECT server_id FROM keys")
+            for key in keys:
+                cluster_id = key["server_id"]
+                if cluster_id in cluster_loads:
+                    cluster_loads[cluster_id] += 1
+
+    logger.info(f"Cluster loads after database query: {cluster_loads}")
 
     if not cluster_loads:
-        available_clusters = [
-            cluster_id
-            for cluster_id in CLUSTERS.keys()
-            if re.match(r"^cluster\d+$", cluster_id)
-        ]
+        logger.warning("No clusters found in database or configuration.")
+        return "cluster1"
 
-        logger.info(f"Available clusters from config: {available_clusters}")
-
-        if available_clusters:
-            logger.info(
-                f"Returning the first available cluster: {available_clusters[0]}"
-            )
-            return available_clusters[0]
-        else:
-            logger.warning("No valid clusters found in config, returning 'cluster1'.")
-            return "cluster1"
-
-    least_loaded_cluster = min(cluster_loads, key=cluster_loads.get)
+    least_loaded_cluster = min(cluster_loads, key=lambda k: (cluster_loads[k], k))
 
     logger.info(f"Least loaded cluster selected: {least_loaded_cluster}")
 
     return least_loaded_cluster
 
 
-async def handle_error(tg_id, callback_query, message):
+async def handle_error(tg_id: int, callback_query: Optional[object] = None, message: str = "") -> None:
+    """
+    Обрабатывает ошибку, отправляя сообщение пользователю.
+
+    Args:
+        tg_id (int): Идентификатор пользователя в Telegram.
+        callback_query (Optional[object], optional): Объект запроса обратного вызова. По умолчанию None.
+        message (str, optional): Текст сообщения об ошибке. По умолчанию пустая строка.
+    """
     try:
-        try:
-            await bot.delete_message(
-                chat_id=tg_id, message_id=callback_query.message.message_id
-            )
-        except Exception:
-            pass
+        if callback_query and hasattr(callback_query, "message"):
+            try:
+                await bot.delete_message(chat_id=tg_id, message_id=callback_query.message.message_id)
+            except Exception as delete_error:
+                logger.warning(f"Не удалось удалить сообщение: {delete_error}")
 
         await bot.send_message(tg_id, message, parse_mode="HTML")
 

main.py

@@ -6,15 +6,28 @@ from aiohttp import web
 
 from backup import backup_database
 from bot import bot, dp, router
-from config import CRYPTO_BOT_ENABLE, DEV_MODE, FREEKASSA_ENABLE, ROBOKASSA_ENABLE, SUB_PATH, WEBAPP_HOST, WEBAPP_PORT, WEBHOOK_PATH, WEBHOOK_URL, YOOKASSA_ENABLE
+from config import (
+    CRYPTO_BOT_ENABLE,
+    DEV_MODE,
+    FREEKASSA_ENABLE,
+    LEGACY_ENABLE,
+    ROBOKASSA_ENABLE,
+    SUB_PATH,
+    WEBAPP_HOST,
+    WEBAPP_PORT,
+    WEBHOOK_PATH,
+    WEBHOOK_URL,
+    YOOKASSA_ENABLE,
+)
 from database import init_db
-from handlers.keys.subscriptions import handle_subscription
+from handlers.keys.subscriptions import handle_new_subscription, handle_old_subscription
 from handlers.notifications import notify_expiring_keys
 from handlers.payments.cryprobot_pay import cryptobot_webhook
 from handlers.payments.freekassa_pay import freekassa_webhook
 from handlers.payments.robokassa_pay import robokassa_webhook
 from handlers.payments.yookassa_pay import yookassa_webhook
 from logger import logger
+from servers import sync_servers_with_db
 
 
 async def periodic_notifications():
@@ -43,25 +56,27 @@ async def on_shutdown(app):
     try:
         await asyncio.gather(*asyncio.all_tasks(), return_exceptions=True)
     except Exception as e:
-        logger.error(f"Error during shutdown: {e}")
+        logger.error(f"Ошибка при завершении работы: {e}")
 
 
 async def shutdown_site(site):
-    logger.info("Остановка сайта...")
+    logger.info("Остановка сайт...")
     await site.stop()
-    logger.info("Сервер остановлен.")
+    logger.info("Сервер сайт.")
 
 
 async def main():
     dp.include_router(router)
+    await sync_servers_with_db()
 
     if DEV_MODE:
-        # Запуск в режиме полинга для разработки
+        logger.info("Запуск в режиме разработки...")
         await bot.delete_webhook()
         await init_db()
+        asyncio.create_task(periodic_notifications())
         await dp.start_polling(bot)
     else:
-        # Стандартный режим вебхука
+        logger.info("Запуск в production режиме...")
         app = web.Application()
         app.on_startup.append(on_startup)
         app.on_shutdown.append(on_shutdown)
@@ -73,7 +88,10 @@ async def main():
             app.router.add_post("/cryptobot/webhook", cryptobot_webhook)
         if ROBOKASSA_ENABLE:
             app.router.add_post("/robokassa/webhook", robokassa_webhook)
-        app.router.add_get(f"{SUB_PATH}{{email}}", handle_subscription)
+        if LEGACY_ENABLE:
+            app.router.add_get(f"{SUB_PATH}{{email}}", handle_old_subscription)
+
+        app.router.add_get(f"{SUB_PATH}{{email}}/{{tg_id}}", handle_new_subscription)
 
         SimpleRequestHandler(dispatcher=dp, bot=bot).register(app, path=WEBHOOK_PATH)
         setup_application(app, dp, bot=bot)
@@ -83,20 +101,21 @@ async def main():
         site = web.TCPSite(runner, host=WEBAPP_HOST, port=WEBAPP_PORT)
         await site.start()
 
-        logger.info(f"Webhook URL: {WEBHOOK_URL}")
+        logger.info(f"URL вебхука: {WEBHOOK_URL}")
 
         loop = asyncio.get_event_loop()
         for sig in (signal.SIGINT, signal.SIGTERM):
-            loop.add_signal_handler(
-                sig, lambda: asyncio.create_task(shutdown_site(site))
-            )
+            loop.add_signal_handler(sig, lambda: asyncio.create_task(shutdown_site(site)))
 
         try:
             await asyncio.Event().wait()
         finally:
             pending = asyncio.all_tasks()
             for task in pending:
-                task.cancel()
+                try:
+                    task.cancel()
+                except Exception as e:
+                    logger.error(e)
             await asyncio.gather(*pending, return_exceptions=True)
 
 

middlewares/admin.py

@@ -0,0 +1,26 @@
+from typing import Any, Awaitable, Callable, Dict, Union
+
+from aiogram import BaseMiddleware
+from aiogram.types import TelegramObject
+
+from config import ADMIN_ID
+
+
+class AdminMiddleware(BaseMiddleware):
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: Dict[str, Any],
+    ) -> Any:
+        data["admin"] = self._check_admin_access(event)
+        return await handler(event, data)
+
+    def _check_admin_access(self, event: TelegramObject) -> bool:
+        try:
+            admin_ids: Union[int, list[int]] = ADMIN_ID
+            if isinstance(admin_ids, list):
+                return event.from_user.id in admin_ids
+            return event.from_user.id == admin_ids
+        except Exception:
+            return False

middlewares/database.py

@@ -1,8 +1,8 @@
 from typing import Any, Awaitable, Callable, Dict
 
-import asyncpg
 from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject
+import asyncpg
 
 from config import DATABASE_URL
 
@@ -14,9 +14,9 @@ class DatabaseMiddleware(BaseMiddleware):
         event: TelegramObject,
         data: Dict[str, Any],
     ) -> Any:
-        session = await asyncpg.connect(DATABASE_URL)
-        data["session"] = session
+        conn = await asyncpg.connect(DATABASE_URL)
         try:
+            data["session"] = conn
             return await handler(event, data)
         finally:
-            await session.close()
+            await conn.close()

middlewares/delete.py

@@ -0,0 +1,25 @@
+from typing import Any, Awaitable, Callable, Dict
+
+from aiogram import BaseMiddleware
+from aiogram.types import CallbackQuery, Message, TelegramObject
+
+
+class DeleteMessageMiddleware(BaseMiddleware):
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: Dict[str, Any],
+    ) -> Any:
+        if isinstance(event, (Message, CallbackQuery)):
+            if isinstance(event, Message):
+                if not event.text == "/start":
+                    try:
+                        await event.bot.delete_message(event.chat.id, event.message_id - 1)
+                    except Exception:
+                        pass
+                    await event.delete()
+            elif isinstance(event, CallbackQuery):
+                await event.answer()
+                await event.message.delete()
+        return await handler(event, data)

middlewares/logging.py

@@ -1,4 +1,4 @@
-from typing import Any, Awaitable, Callable, Dict
+from typing import Any, Awaitable, Callable, Dict, Optional
 
 from aiogram import BaseMiddleware
 from aiogram.types import CallbackQuery, Message, TelegramObject
@@ -13,23 +13,30 @@ class LoggingMiddleware(BaseMiddleware):
         event: TelegramObject,
         data: Dict[str, Any],
     ) -> Any:
+        user_info = self._extract_user_info(event)
+
+        logger.info(
+            f"Активность пользователя - "
+            f"ID пользователя: {user_info['user_id']}, "
+            f"Имя пользователя: {user_info['username']}, "
+            f"Действие: {user_info['action']}"
+        )
+        return await handler(event, data)
+
+    def _extract_user_info(self, event: TelegramObject) -> Dict[str, Optional[str]]:
         user_id = None
         username = None
         action = None
 
         if isinstance(event, Message):
-            user_id = event.from_user.id
-            username = event.from_user.username
+            user = event.from_user
+            user_id = user.id
+            username = user.username
             action = f"Сообщение: {event.text}"
         elif isinstance(event, CallbackQuery):
-            user_id = event.from_user.id
-            username = event.from_user.username
+            user = event.from_user
+            user_id = user.id
+            username = user.username
             action = f"Обратный вызов: {event.data}"
 
-        logger.info(
-            f"Активность пользователя - "
-            f"ID пользователя: {user_id}, "
-            f"Имя пользователя: {username}, "
-            f"Действие: {action}"
-        )
-        return await handler(event, data)
+        return {"user_id": user_id, "username": username, "action": action}

middlewares/user.py

@@ -0,0 +1,28 @@
+from typing import Any, Awaitable, Callable, Dict
+
+from aiogram import BaseMiddleware
+from aiogram.types import TelegramObject, User
+
+from database import upsert_user
+
+
+class UserMiddleware(BaseMiddleware):
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: Dict[str, Any],
+    ) -> Any:
+        if user := data.get("event_from_user"):
+            await self._process_user(user)
+        return await handler(event, data)
+
+    async def _process_user(self, user: User) -> None:
+        await upsert_user(
+            tg_id=user.id,
+            username=user.username,
+            first_name=user.first_name,
+            last_name=user.last_name,
+            language_code=user.language_code,
+            is_bot=user.is_bot,
+        )

models.py

@@ -1,70 +0,0 @@
-from sqlalchemy import BigInteger, Boolean, Column, Float, ForeignKey, Text
-from sqlalchemy.orm import declarative_base, relationship
-
-Base = declarative_base()
-
-
-class Connection(Base):
-    """
-    Модель для таблицы connections
-    """
-
-    __tablename__ = "connections"
-
-    tg_id = Column(BigInteger, primary_key=True, nullable=False)
-    balance = Column(Float, nullable=False, default=0.0)
-    trial = Column(BigInteger, nullable=False, default=0)
-
-    # Связь с ключами и рефералами
-    keys = relationship("Key", back_populates="connection")
-    referrals_received = relationship(
-        "Referral", foreign_keys="Referral.referred_tg_id", back_populates="referred"
-    )
-    referrals_sent = relationship(
-        "Referral", foreign_keys="Referral.referrer_tg_id", back_populates="referrer"
-    )
-
-
-class Key(Base):
-    """
-    Модель для таблицы keys
-    """
-
-    __tablename__ = "keys"
-
-    tg_id = Column(
-        BigInteger, ForeignKey("connections.tg_id"), primary_key=True, nullable=False
-    )
-    client_id = Column(Text, primary_key=True, nullable=False)
-    email = Column(Text, nullable=False)
-    created_at = Column(BigInteger, nullable=False)
-    expiry_time = Column(BigInteger, nullable=False)
-    key = Column(Text, nullable=False)
-    server_id = Column(Text, nullable=False, default="server1")
-    notified = Column(Boolean, nullable=False, default=False)
-    notified_24h = Column(Boolean, nullable=False, default=False)
-
-    # Связь с подключением
-    connection = relationship("Connection", back_populates="keys")
-
-
-class Referral(Base):
-    """
-    Модель для таблицы referrals
-    """
-
-    __tablename__ = "referrals"
-
-    referred_tg_id = Column(
-        BigInteger, ForeignKey("connections.tg_id"), primary_key=True, nullable=False
-    )
-    referrer_tg_id = Column(BigInteger, ForeignKey("connections.tg_id"), nullable=False)
-    reward_issued = Column(Boolean, default=False)
-
-    # Связи с подключениями
-    referred = relationship(
-        "Connection", foreign_keys=[referred_tg_id], back_populates="referrals_received"
-    )
-    referrer = relationship(
-        "Connection", foreign_keys=[referrer_tg_id], back_populates="referrals_sent"
-    )

pyproject.toml

@@ -0,0 +1,27 @@
+[tool.black]
+line-length = 120 # Совпадает с flake8
+target-version = ['py39','py310','py311'] # Укажите версию Python вашего проекта
+skip-string-normalization = true # Отключает нормализацию кавычек
+include = '\.pyi?$' # Включает Python-файлы
+exclude = '''
+/(
+    \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+)/
+''' # Исключает системные папки
+
+[tool.isort]
+profile = "black" # Устанавливает совместимость с black
+line_length = 120
+multi_line_output = 3 # Формат многострочных импортов
+include_trailing_comma = true # Совместимость с black
+force_sort_within_sections = true # Сортировка внутри секций
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+skip_gitignore = true # Учитывать .gitignore

requirements.txt

@@ -28,4 +28,9 @@ yookassa==3.3.0
 loguru
 aiocryptopay
 py3xui
-sqlalchemy
+sqlalchemy
+robokassa
+flake8
+black
+isort
+pylint

scripts/node.sh

@@ -1,164 +0,0 @@
-#!/bin/bash
-
-# Цвета для вывода
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-echo -e "${BLUE}3x-ui Installation Script by izzzzzi${NC}"
-echo "----------------------------------------"
-
-# Запрос данных у пользователя
-read -p "Enter your domain (e.g., example.com): " DOMAIN
-read -p "Enter desired admin panel port (default: 2053): " PANEL_PORT
-read -p "Enter desired sub panel port (default: 2054): " SUB_PANEL_PORT
-
-# Использование значения по умолчанию для порта, если не указано
-PANEL_PORT=${PANEL_PORT:-2053}
-SUB_PANEL_PORT=${SUB_PANEL_PORT:-2054}
-
-# Создание необходимых директорий
-echo -e "${GREEN}Creating directories...${NC}"
-mkdir -p nginx/conf.d db cert
-
-# Установка certbot
-echo -e "${GREEN}Installing certbot...${NC}"
-apt-get update
-apt-get install certbot -y
-
-# Остановка nginx если он запущен
-echo -e "${GREEN}Stopping nginx if running...${NC}"
-docker-compose down 2>/dev/null
-systemctl stop nginx 2>/dev/null
-
-# Получение сертификата
-echo -e "${GREEN}Obtaining SSL certificate...${NC}"
-certbot certonly --standalone --agree-tos --register-unsafely-without-email -d $DOMAIN
-
-# Проверка успешности получения сертификата
-if [ ! -d "/etc/letsencrypt/live/$DOMAIN" ]; then
-    echo "Failed to obtain SSL certificate. Please check your domain settings."
-    exit 1
-fi
-
-# Тестирование автообновления
-echo -e "${GREEN}Testing certificate renewal...${NC}"
-certbot renew --dry-run
-
-# Создание docker-compose.yml
-echo -e "${GREEN}Creating docker-compose.yml...${NC}"
-cat > docker-compose.yml << EOL
-version: "3"
-
-services:
-  nginx:
-    image: nginx:alpine
-    container_name: nginx
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - ./nginx/conf.d:/etc/nginx/conf.d
-      - /etc/letsencrypt:/etc/letsencrypt
-      - /var/lib/letsencrypt:/var/lib/letsencrypt
-    networks:
-      - proxy-network
-    restart: unless-stopped
-    depends_on:
-      - 3x-ui
-
-  3x-ui:
-    image: ghcr.io/mhsanaei/3x-ui:latest
-    container_name: 3x-ui
-    hostname: ${DOMAIN}
-    volumes:
-      - \$PWD/db/:/etc/x-ui/
-      - \$PWD/cert/:/root/cert/
-      - /etc/letsencrypt:/etc/letsencrypt:ro
-    environment:
-      XRAY_VMESS_AEAD_FORCED: "false"
-    tty: true
-    networks:
-      - proxy-network
-    restart: unless-stopped
-
-networks:
-  proxy-network:
-    driver: bridge
-EOL
-
-# Создание конфигурации Nginx
-echo -e "${GREEN}Creating Nginx configuration...${NC}"
-cat > nginx/conf.d/default.conf << EOL
-server {
-    listen 80;
-    server_name ${DOMAIN};
-    
-    location / {
-        return 301 https://\$host\$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl;
-    server_name ${DOMAIN};
-
-    ssl_certificate /etc/letsencrypt/live/${DOMAIN}/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/${DOMAIN}/privkey.pem;
-    
-    ssl_protocols TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers off;
-    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-
-    location / {
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header Range \$http_range;
-        proxy_set_header If-Range \$http_if_range; 
-        proxy_redirect off;
-        proxy_pass http://3x-ui:${PANEL_PORT};
-    }
-
-    location /sub {
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto \$scheme;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header Range \$http_range;
-        proxy_set_header If-Range \$http_if_range; 
-        proxy_redirect off;
-        proxy_pass http://3x-ui:${SUB_PANEL_PORT};
-    }
-}
-EOL
-
-# Проверка наличия Docker и Docker Compose
-if ! command -v docker &> /dev/null || ! command -v docker-compose &> /dev/null; then
-    echo -e "${GREEN}Installing Docker and Docker Compose...${NC}"
-    curl -fsSL https://get.docker.com | sh
-    curl -L "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-    chmod +x /usr/local/bin/docker-compose
-fi
-
-# Настройка автообновления сертификатов
-echo -e "${GREEN}Setting up certificate auto-renewal...${NC}"
-cat > /etc/cron.d/certbot-renew << EOL
-0 */12 * * * root certbot renew --quiet --deploy-hook "docker-compose -f $(pwd)/docker-compose.yml restart nginx"
-EOL
-
-# Запуск сервисов
-echo -e "${GREEN}Starting all services...${NC}"
-docker-compose up -d
-
-echo -e "${GREEN}Installation completed!${NC}"
-echo -e "${BLUE}You can access your 3x-ui panel at: https://${DOMAIN}${NC}"
-echo -e "${YELLOW}Important: Default access to 3x-ui panel - ${NC}"
-echo -e "${YELLOW}Login: admin${NC}"
-echo -e "${YELLOW}Password: admin${NC}"
-echo -e "${YELLOW}For security, it is recommended to change the password at: https://${DOMAIN}/panel/settings${NC}"
-echo "Please wait a few minutes for all services to start properly."
-echo "Default credentials can be found in the 3x-ui documentation."
-
-EOL

scripts/postgres.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-
-# Цвета для вывода
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-RED='\033[0;31m'
-NC='\033[0m' # No Color
-
-echo -e "${BLUE}PostgreSQL Installation and Setup Script by izzzzzi${NC}"
-echo "----------------------------------------"
-
-# Запрос данных у пользователя
-read -p "Enter PostgreSQL port (default: 5432): " DB_PORT
-read -p "Enter database name: " DB_NAME
-read -p "Enter database user: " DB_USER
-read -s -p "Enter database password: " DB_PASS
-echo
-read -s -p "Confirm database password: " DB_PASS_CONFIRM
-echo
-
-# Проверка паролей
-if [ "$DB_PASS" != "$DB_PASS_CONFIRM" ]; then
-    echo -e "${RED}Passwords do not match!${NC}"
-    exit 1
-fi
-
-# Использование значения по умолчанию для порта
-DB_PORT=${DB_PORT:-5432}
-
-# Установка PostgreSQL
-echo -e "${GREEN}Installing PostgreSQL...${NC}"
-apt-get update
-apt-get install -y postgresql postgresql-contrib
-
-# Остановка PostgreSQL для изменения конфигурации
-systemctl stop postgresql
-
-# Настройка PostgreSQL для внешних подключений
-echo -e "${GREEN}Configuring PostgreSQL...${NC}"
-
-# Настройка postgresql.conf
-PG_VERSION=$(ls /etc/postgresql/)
-PG_CONF="/etc/postgresql/$PG_VERSION/main/postgresql.conf"
-PG_HBA="/etc/postgresql/$PG_VERSION/main/pg_hba.conf"
-
-# Backup конфигурационных файлов
-cp $PG_CONF "${PG_CONF}.backup"
-cp $PG_HBA "${PG_HBA}.backup"
-
-# Изменение postgresql.conf
-sed -i "s/#listen_addresses = 'localhost'/listen_addresses = '*'/" $PG_CONF
-sed -i "s/#port = 5432/port = $DB_PORT/" $PG_CONF
-
-# Изменение pg_hba.conf
-cat > $PG_HBA << EOL
-# TYPE  DATABASE        USER            ADDRESS                 METHOD
-local   all            postgres                                peer
-local   all            all                                     peer
-host    all            all             127.0.0.1/32            md5
-host    all            all             ::1/128                 md5
-host    all            all             0.0.0.0/0               md5
-EOL
-
-# Запуск PostgreSQL
-systemctl start postgresql
-systemctl enable postgresql
-
-# Создание пользователя и базы данных
-echo -e "${GREEN}Creating database and user...${NC}"
-sudo -u postgres psql << EOF
-CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';
-CREATE DATABASE $DB_NAME OWNER $DB_USER;
-ALTER USER $DB_USER WITH SUPERUSER;
-EOF
-
-# Настройка файрвола
-echo -e "${GREEN}Configuring firewall...${NC}"
-if command -v ufw >/dev/null; then
-    ufw allow $DB_PORT/tcp
-    ufw status
-fi
-
-# Проверка статуса PostgreSQL
-systemctl status postgresql --no-pager
-
-echo -e "${GREEN}Installation completed!${NC}"
-echo -e "${BLUE}PostgreSQL is running on port: ${DB_PORT}${NC}"
-echo -e "${BLUE}Database name: ${DB_NAME}${NC}"
-echo -e "${BLUE}Database user: ${DB_USER}${NC}"
-echo "You can now connect to your database using:"
-echo "psql -h localhost -p $DB_PORT -U $DB_USER -d $DB_NAME"
-echo
-echo "For remote connections use:"
-echo "psql -h YOUR_SERVER_IP -p $DB_PORT -U $DB_USER -d $DB_NAME"
-echo
-echo -e "${RED}Important: Make sure to save these credentials in a secure place!${NC}"
-
-# Проверка подключения
-echo -e "${GREEN}Testing connection...${NC}"
-PGPASSWORD=$DB_PASS psql -h localhost -p $DB_PORT -U $DB_USER -d $DB_NAME -c "\conninfo"
-
-# Добавление информации о создании бэкапов
-echo
-echo "To create a backup, use:"
-echo "pg_dump -h localhost -p $DB_PORT -U $DB_USER -d $DB_NAME > backup.sql"
-echo
-echo "To restore from backup, use:"
-echo "psql -h localhost -p $DB_PORT -U $DB_USER -d $DB_NAME < backup.sql"

servers.py

@@ -0,0 +1,57 @@
+import asyncpg
+
+from config import DATABASE_URL
+from logger import logger
+
+try:
+    from config import CLUSTERS
+except ImportError:
+    CLUSTERS = None
+    logger.warning("Переменная CLUSTERS не найдена в конфигурации. Добавьте сервера через админ-панель!")
+
+
+async def sync_servers_with_db():
+    """
+    Синхронизирует сервера из конфигурации CLUSTERS с базой данных.
+    Если CLUSTERS не найден, синхронизация не будет выполнена.
+    """
+    if CLUSTERS is None:
+        logger.info("Конфигурация CLUSTERS не найдена. Синхронизация не будет выполнена.")
+        return
+
+    try:
+        conn = await asyncpg.connect(DATABASE_URL)
+        logger.info("Подключение к базе данных для синхронизации серверов успешно.")
+
+        for cluster_name, servers in CLUSTERS.items():
+            for server_key, server_info in servers.items():
+                exists = await conn.fetchval(
+                    """
+                    SELECT 1 FROM servers
+                    WHERE cluster_name = $1 AND server_name = $2
+                    """,
+                    cluster_name,
+                    server_info["name"],
+                )
+
+                if not exists:
+                    await conn.execute(
+                        """
+                        INSERT INTO servers (cluster_name, server_name, api_url, subscription_url, inbound_id)
+                        VALUES ($1, $2, $3, $4, $5)
+                        """,
+                        cluster_name,
+                        server_info["name"],
+                        server_info["API_URL"],
+                        server_info["SUBSCRIPTION"],
+                        server_info["INBOUND_ID"],
+                    )
+                    logger.info(f"Сервер {server_info['name']} из кластера {cluster_name} добавлен в базу данных.")
+                else:
+                    logger.info(f"Сервер {server_info['name']} из кластера {cluster_name} уже существует.")
+
+    except Exception as e:
+        logger.error(f"Ошибка при синхронизации серверов: {e}")
+    finally:
+        if 'conn' in locals():
+            await conn.close()