Update Dockerfile

Личный кабинет в миниапке

.github/workflows/docker-hub.yml

@@ -36,15 +36,15 @@ jobs:
           TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
           echo "🏷️ Собираем релизную версию: $VERSION"
         elif [[ $GITHUB_REF == refs/heads/main ]]; then
-          VERSION="v2.4.6-$(git rev-parse --short HEAD)"
+          VERSION="v2.4.8-$(git rev-parse --short HEAD)"
           TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
           echo "🚀 Собираем версию из main: $VERSION"
         elif [[ $GITHUB_REF == refs/heads/dev ]]; then
-          VERSION="v2.4.6-dev-$(git rev-parse --short HEAD)"
+          VERSION="v2.4.8-dev-$(git rev-parse --short HEAD)"
           TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:dev,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
           echo "🧪 Собираем dev версию: $VERSION"
         else
-          VERSION="v2.4.6-pr-$(git rev-parse --short HEAD)"
+          VERSION="v2.4.8-pr-$(git rev-parse --short HEAD)"
           TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)"
           echo "🔀 Собираем PR версию: $VERSION"
         fi

.github/workflows/docker-registry.yml

@@ -49,13 +49,13 @@ jobs:
             VERSION=${GITHUB_REF#refs/tags/}
             echo "🏷️ Building release version: $VERSION"
           elif [[ $GITHUB_REF == refs/heads/main ]]; then
-            VERSION="v2.4.6-$(git rev-parse --short HEAD)"
+            VERSION="v2.4.8-$(git rev-parse --short HEAD)"
             echo "🚀 Building main version: $VERSION"
           elif [[ $GITHUB_REF == refs/heads/dev ]]; then
-            VERSION="v2.4.6-dev-$(git rev-parse --short HEAD)"
+            VERSION="v2.4.8-dev-$(git rev-parse --short HEAD)"
             echo "🧪 Building dev version: $VERSION"
           else
-            VERSION="v2.4.6-pr-$(git rev-parse --short HEAD)"
+            VERSION="v2.4.8-pr-$(git rev-parse --short HEAD)"
             echo "🔀 Building PR version: $VERSION"
           fi
           echo "version=$VERSION" >> $GITHUB_OUTPUT

Dockerfile

@@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
 
 FROM python:3.13-slim
 
-ARG VERSION="v2.4.6"
+ARG VERSION="v2.4.8"
 ARG BUILD_DATE
 ARG VCS_REF
 

README.md

@@ -35,7 +35,7 @@
 
 ### ⚡ **Полная автоматизация VPN бизнеса**
 - 🎯 **Готовое решение** - разверни за 5 минут, начни продавать сегодня
-- 💰 **Многоканальные платежи** - Telegram Stars + Tribute + CryptoBot + ЮKassa + MulenPay + PayPalych + P2P
+- 💰 **Многоканальные платежи** - Telegram Stars + Tribute + CryptoBot + YooKassa + MulenPay + PayPalych (СБП)
 - 🔄 **Автоматизация 99%** - от регистрации до продления подписок
 - 📊 **Детальная аналитика** - полная картина вашего бизнеса
 - 💬 **Уведомления в топики** об: Активация триала 💎 Покупка подписки 🔄 Конверсия из триала в платную ⏰ Продление подписки 💰 Пополнение баланса 🚧 Включении тех работ ♻️ Появлении новой версии бота
@@ -952,105 +952,111 @@ WEBHOOK_PATH=/webhook
 
 ### 👤 **Для пользователей**
 
+🧭 **Онбординг и доступ**
+- 🌐 Выбор языка интерфейса, динамическая локализация и настройка кнопки меню.
+- 📜 Принятие правил, оферты и политики конфиденциальности прямо в боте.
+- 📡 Проверка подписки на обязательный канал, deeplink-инвайты и UTM-кампании.
+- 👤 Сбор контактных данных с антиспам-защитой и быстрым восстановлением доступа.
+
 🛒 **Умная покупка подписок**
-- 📅 Гибкие периоды (14-360 дней)
-- 📊 Выбор трафика или фиксированный лимит
-- 🌍 Автоматический выбор серверов (для одного сквада) или ручной выбор из множества
-- 📱 Настройка количества устройств и серверов прямо при оформлении
-- 🧾 Понятный калькулятор стоимости с учетом всех опций
+- 📅 Гибкие периоды (14–360 дней) и скидки за длительные подписки.
+- 📊 Выбор трафика: фиксированный лимит, квоты или безлимит.
+- 🌍 Автоматический выбор сквада или мультивыбор из десятков серверов.
+- 📱 Настройка количества устройств, стран и доп. услуг прямо в чек-ауте.
+- 🧾 Динамический калькулятор стоимости, черновики и возвращение к незавершённым заказам.
 
 🧪 **Тестовая подписка**
-- Настраиваемый триал-период
-- Уведомления об истечении и сценарий мягкой конверсии в платную подписку
-- Приветственное сообщение с предложением активации триала (с возможностью отключения)
-- Поддержка рекламных кампаний с автоматической выдачей бонусных подписок
+- Гибко настраиваемый триал и welcome-цепочка.
+- Уведомления об истечении и автоконверсия в платный тариф.
+- Автовыдача бонусов за участие в кампаниях и инвайт-линках.
+- Контроль за обязательной подпиской на канал даже в режиме триала.
 
-💰 **Удобные платежи**
-- ⭐ Telegram Stars
-- 💳 Tribute
-- 💳 YooKassa (включая СБП и онлайн-чек)
-- 💳 MulenPay
-- 💳 PayPalych (Pal24)
-- 💰 CryptoBot (мультивалюта и срок жизни инвойсов)
-- 🎁 Реферальные и промо-бонусы
-- Детальная история транзакций и чеков
+💰 **Платежи и баланс**
+- ⭐ Telegram Stars, 💳 Tribute, 💳 YooKassa (СБП + онлайн-чек), 💳 MulenPay, 🏦 PayPalych (СБП), 💰 CryptoBot.
+- 📥 Автогенерация счетов, контроль статусов через вебхуки и уведомления.
+- 💼 История операций с фильтрами, квитанциями и выгрузкой чеков.
+- 🔄 Автоплатёж с настройкой дня списания и уведомлениями об ошибках.
+- 🎁 Реферальные, промо- и кэшбэк-бонусы автоматически начисляются на баланс.
 
 📱 **Управление подписками**
-- 📈 Статистика использования в реальном времени (трафик, устройства, серверы)
-- 🔄 Автопродление с баланса с настройкой дней и мгновенными уведомлениями
-- 🔄 Управление трафиком и лимитами без участия оператора
-- 🌍 Переключение серверов Remnawave на лету
-- 📱 Управление устройствами + сброс HWID
-- 🧩 Смена языка и персональных настроек
+- 📈 Реальный трафик, устройства и география серверов прямо в диалоге.
+- 🌍 Переключение серверов, стран и лимитов без помощи оператора.
+- 📱 Сброс HWID, повторная выдача конфигов и инструкции подключения.
+- 🧩 Смена языка, промогруппы и персональных параметров.
+- 🧾 Просмотр активных услуг, статуса оплаты и сроков действия.
 
-🎁 **Бонусная система**
-- 🎫 Промокоды на деньги/дни/длинный триал
-- 👥 Защищенная реферальная программа с комиссиями и антифродом
-- 📊 Детальная статистика рефералов и кампаний
-- 📨 Персональные рассылки и уведомления о новых бонусах
+🛟 **Поддержка и самообслуживание**
+- 🎫 Тикеты с приоритетами, вложениями и уведомлениями об ответе.
+- 📚 FAQ, правила, оферта и политика доступны из меню.
+- 💬 Быстрые ссылки на живую поддержку или кастомные каналы связи.
+
+🧩 **Бонусы и рефералы**
+- 🎫 Промокоды на деньги, дни, устройства, страны и расширенные триалы.
+- 👥 Реферальная программа с комиссиями, бонусами и антифрод-фильтрами.
+- 🧾 Подробная аналитика доходов, конверсии и активности приглашённых.
+- 🔗 Генерация реферальных ссылок и QR-кодов в один тап.
+
+🪪 **Mini App и инструкции**
+- 📱 Telegram WebApp с обзором подписки, конфигами и кнопкой «Подключить».
+- 📥 Библиотека загрузочных ссылок для клиентов Happ и кастомных гайдов.
+- 🛰️ Web API для получения статуса подписки в мини-приложениях и внешних витринах.
 
 </td>
 <td width="50%" valign="top">
 
 ### ⚙️ **Для администраторов**
 
-📊 **Мощная аналитика**
-- 👥 Детальная статистика пользователей и подписок
-- 💰 Анализ платежей по источникам (Stars, YooKassa, Tribute, MulenPay, PayPalych, CryptoBot)
-- 🖥️ Мониторинг серверов Remnawave и статуса сквадов
-- 📈 Финансовые отчеты, конверсии и эффективность рекламных кампаний
+📊 **Аналитика и отчётность**
+- 📈 Дашборды по пользователям, подпискам, трафику и удержанию.
+- 💰 Детализация платежей по источникам (Stars, YooKassa, Tribute, MulenPay, PayPalych, CryptoBot).
+- 🧮 Продажи по тарифам, устройствам, странам и промогруппам.
+- 📣 Эффективность кампаний, промокодов, UTM-источников и реферальных потоков.
 
 👥 **Управление пользователями**
-- 🔍 Поиск и редактирование профилей
-- 💰 Управление балансами и ручные начисления
-- 📱 Изменение лимита устройств (1-X)
-- 📊 Настройка лимитов трафика (0-10000 ГБ) и подключенных сквадов
-- 🌍 Мультивыбор серверов и мгновенная синхронизация с панелью
-- 🔄 Сброс HWID устройств и обновление конфигураций
-- 👥 Детальная реферальная статистика в профиле пользователя
-- 🔄 Изменение типа подписки триал/платная и ручное продление
-- 🚫 Блокировка/разблокировка/удаление аккаунтов
+- 🔍 Поиск, фильтры и детальные карточки с историей операций.
+- 💰 Ручное изменение баланса, компенсации и корректировки.
+- 📱 Изменение лимитов устройств, трафика, стран и подключенных сквадов.
+- 🔄 Сброс HWID, перегенерация подписки и синхронизация с Remnawave.
+- 🎯 Назначение промогрупп, тарифов и ручных продлений/обновлений.
+- 🚫 Блокировки с таймером, полное удаление и аудит действий персонала.
 
-🎯 **Маркетинг и продажи**
-- 🎫 Гибкая промо-система (деньги/дни/длинный триал)
-- 📣 Рекламные кампании с автоматическими бонусами за регистрацию
-- 📊 Детальная статистика использования промокодов и кампаний
-- 📨 Рассылки по сегментам с фильтрами по активности, подпискам и языкам
+🎯 **Продажи, маркетинг и удержание**
+- 🎫 Промокоды (разовые/многоразовые), бонусные предложения и бесплатные пакеты.
+- 💳 Промогруппы со скидками на серверы, трафик, устройства и допуслуги.
+- 📣 Кампании с deeplink-ссылками, UTM и автопродвижением триалов.
+- 📨 Рассылки по сегментам, кастомные кнопки и медиа, отмена «в полёте».
+- 🔘 Настройка кнопок главного меню, приветственных экранов и мини-приложений.
 
-🖥️ **Умный мониторинг**
-- 💚 Контроль доступности Remnawave панели в реальном времени
-- 🔄 Автоматическая синхронизация данных и реконнект при ошибках
-- 🌐 Управление сквадами с актуальным статусом и массовыми действиями
-- 🚧 Автоматический режим тех. работ с уведомлениями пользователей
-- 📋 Логи и диагностика, включая журнал сбоев и действий бота
-- 📦 Проверка обновлений проекта и уведомления о новых релизах
+🛟 **Поддержка и модерация**
+- 🎫 Центр тикетов с приоритетами, статусами и перепиской.
+- 🧑‍⚖️ Разграничение ролей (админы, модераторы), журнал аудита действий.
+- ⏱️ SLA таймеры, автоматические напоминания и уведомления в канал.
+- 🚫 Массовые блокировки нарушителей и автоматическое снятие блокировок.
+- 🧾 История диалогов, прикреплённые файлы и быстрые ответы.
 
-📨 **Коммуникации и поддержка**
-- 📢 Рассылки по сегментам и мгновенные оповещения
-- 🔔 Автоуведомления о продлении, задолженностях и автоплатежах
-- 💬 Система поддержки с HTML разметкой и история обращений
-- 📝 Настройка правил сервиса, FAQ и приветственных экранов
-- 🧪 Настраиваемое приветственное сообщение с предложением активации триала
+🔔 **Уведомления и коммуникации**
+- 📢 Топики для событий (покупки, триалы, техработы, ошибки интеграций).
+- 🔔 Настройка пользовательских и админских уведомлений, расписаний и каналов.
+- 📨 Шаблоны правил, оферты, FAQ, приветствий и страницы поддержки.
+- 💬 Автоматические сообщения о задолженностях, автоплатежах и продлениях.
 
-📨 **Уведомления в закрытый канал**
-- 🎯 Активация триала, продления и конверсии в платную подписку
-- 💎 Покупка подписки и пополнение баланса
-- 🔄 Изменения параметров подписки пользователем
-- 🚧 Потеря соединения с Remnawave и включение техработ
-- 🗄️ Авто- и ручные бекапы/восстановления с отправкой файлов
-- ♻️ Выхлоп новых версий бота и результаты автоплатежей
+🧰 **Обслуживание и DevOps**
+- 🛠️ `install_bot.sh`: управление контейнерами, логами, обновлениями, прокси и резервными копиями.
+- 🚧 Ручной и авто-режим техработ с кастомными сообщениями.
+- 🗒️ Просмотр системных логов, health-check, мониторинг Remnawave и серверов.
+- ♻️ Проверка обновлений репозитория, уведомления о новых версиях и плавный деплой.
 
 🗄️ **Бекапы и восстановление**
-- Ручной запуск бекапа с выбором содержимого (включая логи)
-- Автоматические бекапы по расписанию и управление retention-политикой
-- Восстановление из бекапа без остановки сервиса
-- Отправка копии бекапа в выделенный чат/топик и ведение метаданных
+- 🗓️ Планировщик авто-бекапов, гибкая политика хранения и компрессия.
+- 📦 Ручные бекапы с выбором содержимого (БД, конфиги, логи).
+- 📤 Отправка архивов в выделенный чат/топик, журнал попыток и статусов.
+- 🔁 Восстановление из бекапа без остановки бота, проверка целостности.
 
-💳 **Автоплатежи и биллинг**
-- Настройки автоплатежа на уровне пользователя (вкл/выкл, дни до списания)
-- Принудительная проверка готовности автосписаний
-- Уведомления об успешных и неудачных автоплатежах с подсказками действий
-- Настройка минимального баланса и логирование всех списаний
+💳 **Биллинг и автоплатежи**
+- ⚙️ Глобальные настройки автосписаний, минимального баланса и напоминаний.
+- 🧪 Тестовые платежи для каждого провайдера прямо из админки.
+- 🪝 Управление вебхуками Tribute, YooKassa, CryptoBot, MulenPay и PayPalych.
+- 🧾 Экспорт транзакций, сверка с платёжками и интеграция с бухгалтерией.
 
 </td>
 </tr>
@@ -1065,6 +1071,16 @@ WEBHOOK_PATH=/webhook
 - 📦 **Интеграция с Remnawave API** — автоматическое создание пользователей, управление сквадами и синхронизация подписок.
 - 🧾 **История операций** — хранение транзакций, уведомлений, рассылок, кампаний и бекапов для аудита.
 
+### 🌐 Веб-API, мини-приложение и интеграции
+
+- ⚙️ **FastAPI Web API** (`app/webapi`) с эндпоинтами для управления токенами, конфигурациями, рассылками, кампаниями, промогруппами, статистикой, подписками, транзакциями, тикетами и бекапами.
+- 🔑 **Управление API-ключами** — выпуск, отзыв, реактивация и аудит токенов прямо из админки.
+- 🛡️ **Гибкая авторизация** — API-key, Bearer, Basic Auth и cookie eGames для совместимости с внешними панелями.
+- 🛰️ **Mini App** — статический фронтенд в `miniapp/` и proxied эндпоинты `/miniapp/*` для отображения статуса подписки внутри Telegram.
+- 🧭 **App Config** — централизованная раздача ссылок на клиенты и инструкции (`app-config.json`, `miniapp/app-config.json`).
+- 🪝 **Платёжные вебхуки** — встроенные Flask-серверы для Tribute, YooKassa, CryptoBot, MulenPay и PayPalych (Pal24) с health-check и логированием.
+- 📡 **Мониторинг серверов** — REST-эндпоинты для просмотра нод Remnawave, статистики нагрузки и управления сквадами из внешних систем.
+
 ### 🧭 Навигация по проекту
 
 - `app/bot.py` — точка входа бота и регистрация middlewares/handlers.
@@ -1350,121 +1366,6 @@ ADMIN_NOTIFICATIONS_TOPIC_ID=123             # ID топика (опционал
 - **🔗 SQLAlchemy ORM** - безопасная работа с БД
 - **🚀 aiogram 3** - современная Telegram Bot API
 
-### 📁 Структура проекта
-
-```
-bedolaga_bot/
-├── 🎯 main.py                    # Точка входа
-├── 📦 requirements.txt           # Зависимости
-├── ⚙️ .env.example               # Конфиг
-├── ⚙️ app-config.json            # Информация для гайда подключения
-│
-├── 📱 app/
-│   ├── 🤖 bot.py                 # Инициализация бота
-│   ├── ⚙️ config.py              # Настройки
-│   ├── 🎛️ states.py              # FSM состояния
-│   │
-│   ├── 🎮 handlers/              # Обработчики событий
-│   │   ├── 🏠 start.py           # Регистрация и старт
-│   │   ├── 🛒 subscription.py    # Подписки
-│   │   ├── 💰 balance.py         # Баланс и платежи
-│   │   ├── 🎁 promocode.py       # Промокоды
-│   │   ├── 👥 referral.py        # Реферальная система
-│   │   ├── 🌟 stars_payment.py   # Start платежи
-│   │   ├── common.py         
-│   │   ├── 💬 support.py         # Техподдержка
-│   │   └── 👑 admin/             # Админ панель
-│   │       ├── 📊 statistics.py  # Статистика
-│   │       ├── 🗄️ backup.py      # Бекапы
-│   │       ├── 👥 users.py       # Управление юзерами
-│   │       ├── 🎫 promocodes.py  # Управление промокодами
-│   │       ├── 🚧 maintenance.py # Тех работы
-│   │       ├── 📨 messages.py    # Рассылки
-│   │       ├── 📨 user_messages.py # Рандомные сообщения в меню
-│   │       ├── 📨 welcome_text.py  # Приветственное сообщение 
-│   │       ├── ⚙️ main.py        # Админское меню
-│   │       ├── 📖 rules.py       # Правила
-│   │       ├── 🙋 referrals.py   # Правила
-│   │       ├── 🌎 servers.py     # Сервера
-│   │       ├── 📱 subscriptions.py  # Подписки
-│   │       ├── 🔍 monitoring.py  # Мониторинг
-│   │       └── 🔗 remnawave.py   # Система Remnawave
-│   │
-│   ├── 🗄️ database/                  # База данных
-│   │   ├── 📊 models.py              # Модели SQLAlchemy
-│   │   ├── 🔗 database.py            # Подключение к БД
-│   │   ├── 🔄 universal_migration.py # Миграции
-│   │   └── 📝 crud/                  # CRUD операции
-│   │       ├── 👤 user.py            # Операции с пользователями
-│   │       ├── 📋 subscription.py    # Операции с подписками
-│   │       ├── 💰 transaction.py     # Операции с транзакциями
-│   │       ├── 📜 rules.py           # Правила сервиса
-│   │       ├── 📜 subscription_conversion.py # Правила сервиса
-│   │       ├── 💳 yookassa.py        # YooKassa операции
-│   │       ├── 📨 welcome_text.py    # Приветственное сообщение 
-│   │       ├── 💳 cryptobot.py       # CryptoBot операции
-│   │       ├── 🌐 server_squad.py    # Серверы и сквады
-│   │       ├── 🎁 promocode.py       # Промокоды
-│   │       └── 👥 referral.py        # Партнерка
-│   │
-│   ├── 🔧 services/                   # Бизнес-логика
-│   │   ├── 👤 user_service.py         # Сервис пользователей
-│   │   ├── 📋 subscription_service.py # Сервис подписок
-│   │   ├── 💰 payment_service.py      # Платежи
-│   │   ├── 🗄️ backup_service.py       # Бекапы
-│   │   ├── 🎁 promocode_service.py    # Промокоды
-│   │   ├── 🚧 maintenance_service.py  # Промокоды
-│   │   ├── 👥 referral_service.py     # Партнерка
-│   │   ├── 💬 admin_notification_service.py     # Уведомления для администраторов в чаты
-│   │   ├── 🔍 monitoring_service.py   # Мониторинг
-│   │   ├── ♻️ version_service.py      # Проверка версий бота
-│   │   ├── 🎖️ tribute_service.py      # Tribute платежи
-│   │   ├── 💳 yookassa_service.py     # YooKassa платежи
-│   │   └── 🌐 remnawave_service.py    # Интеграция с Remnawave
-│   │
-│   ├── 🛠️ utils/                     # Утилиты
-│   │   ├── 🎨 decorators.py          # Декораторы
-│   │   ├── 📝 formatters.py          # Форматирование данных
-│   │   ├── ✅ validators.py          # Валидация
-│   │   ├── ✅ subscription_utils.py  # Проверка подписок
-│   │   ├── 📄 pagination.py          # Пагинация
-│   │   ├── 📄 pricing_utils.py       # Цены
-│   │   ├── 📄 message_patch.py
-│   │   ├── 📄 photo_message.py
-│   │   ├── ‼️ global_error.py        # Обработка ошибок
-│   │   ├── 👤 user_utils.py          # Утилиты для пользователей
-│   │   ├── 🫰 currency_converter.py  # Курсы для CryptoBota
-│   │   └── ⚡ cache.py                # Кеширование
-│   │
-│   ├── 🛡️ middlewares/                # Middleware
-│   │   ├── 🔐 auth.py                 # Авторизация
-│   │   ├── 📋 logging.py              # Логирование
-│   │   ├── 🚧 maintenance.py          # тех работы
-│   │   ├── 🔐 subscription_checker.py # тех работы
-│   │   ├── 🔐 channel_checker.py
-│   │   └── ⏱️ throttling.py           # Ограничение запросов
-│   │
-│   ├── 🌐 localization/          # Локализация
-│   │   ├── 📝 texts.py           # Тексты интерфейса
-│   │   └── 🗣️ languages/
-│   │
-│   ├── ⌨️ keyboards/             # Клавиатуры
-│   │   ├── 🔗 inline.py          # Inline клавиатуры
-│   │   ├── 💬 reply.py           # Reply клавиатуры
-│   │   └── 👑 admin.py           # Админские клавиатуры
-│   │
-│   └── 🔌 external/               # Внешние API
-│       ├── 🌐 remnawave_api.py    # Remnawave API
-│       ├── ⭐ telegram_stars.py   # Telegram Stars
-│       ├── 💳 yookassa_webhook.py # YooKassa webhook
-│       ├── 🌐 webhook_server.py   # Webhook сервер
-│       ├── 💳 cryptobot.py        # CryptoBot Api
-│       └── 🎖️ tribute.py          # Tribute платежи
-│
-├── 🔄 migrations/                # Миграции БД
-└── 📋 logs/                      # Логи системы
-```
-
 ---
 
 ## 🐛 Устранение неполадок
@@ -1708,62 +1609,146 @@ REMNAWAVE_SECRET_KEY=XXXXXXX:DDDDDDDD
 
 <tr>
 <td>🥇</td>
+<td><strong>@SmartSystemCompany</strong></td>
+<td>₽8,500</td>
+<td>За щедрую поддержку и вклад в развитие</td>
+</tr>
+
+<tr>
+<td>🥈</td>
 <td><strong>@pilot_737800</strong></td>
-<td>₽4,750</td>
+<td>₽7,750</td>
 <td>За веру в проект с самого начала</td>
 </tr>
 
 <tr>
 <td>🥈</td>
-<td><strong>@Legacyyy777</strong></td>
-<td>₽2,600</td>
-<td>За ценные предложения по улучшению</td>
+<td><strong>@psych0O</strong></td>
+<td>$60</td>
+<td>За щедрую поддержку и вклад в развитие</td>
 </tr>
 
 <tr>
 <td>🥉</td>
-<td><strong>Илья (@ispanec_nn)</strong></td>
-<td>$30</td>
-<td>За активное тестирование и фидбек</td>
+<td><strong>@Vldmrmtn</strong></td>
+<td>₽5,000</td>
+<td>За значительную поддержку проекта</td>
 </tr>
 
 <tr>
 <td>4</td>
+<td><strong>@k0tbtc</strong></td>
+<td>₽3,000</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>5</td>
+<td><strong>@Legacyyy777</strong></td>
+<td>₽2,900</td>
+<td>За ценные предложения по улучшению</td>
+</tr>
+
+<tr>
+<td>6</td>
+<td><strong>@sklvg</strong></td>
+<td>₽3,000</td>
+<td>За международную поддержку</td>
+</tr>
+
+<tr>
+<td>7</td>
+<td><strong>@bolgov0zero</strong></td>
+<td>₽2,000</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>8</td>
+<td><strong>@i_burjuy</strong></td>
+<td>₽1,300</td>
+<td>За активное участие в проекте</td>
+</tr>
+
+<tr>
+<td>9</td>
+<td><strong>@kr33njee</strong></td>
+<td>₽1,550</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>10</td>
+<td><strong>@Nav1_0</strong></td>
+<td>₽2,000</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>11</td>
+<td><strong>@vitos_7771997</strong></td>
+<td>₽1,500</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>12</td>
+<td><strong>@haxonate</strong></td>
+<td>₽1,500</td>
+<td>За поддержку и доверие</td>
+</tr>
+
+<tr>
+<td>13</td>
 <td><strong>@fso404</strong></td>
 <td>₽1,000</td>
 <td>За поддержку и доверие</td>
 </tr>
 
 <tr>
-<td>5</td>
+<td>14</td>
 <td><strong>@edward_forix</strong></td>
 <td>₽1,000</td>
 <td>За поддержку и доверие</td>
 </tr>
 
 <tr>
-<td>5</td>
-<td><strong>@Nav1_0</strong></td>
-<td>₽1,000</td>
-<td>За поддержку и доверие</td>
+<td>15</td>
+<td><strong>@Илья (@ispanec_nn)</strong></td>
+<td>$30</td>
+<td>За активное тестирование и фидбек</td>
 </tr>
 
 <tr>
-<td>6</td>
-<td><strong>@kr33njee</strong></td>
-<td>₽800</td>
-<td>За поддержку и доверие</td>
+<td>16</td>
+<td><strong>@DonMatteoRU</strong></td>
+<td>₽500</td>
+<td>За участие в развитии</td>
 </tr>
 
 <tr>
-<td>7</td>
-<td><strong>@SmartSystemCompany</strong></td>
-<td>₽600</td>
-<td>За поддержку и доверие</td>
+<td>17</td>
+<td><strong>@pedzeo</strong></td>
+<td>₽500</td>
+<td>За участие в развитии</td>
 </tr>
 
 <tr>
-<td>8</td>
+<td>18</td>
+<td><strong>@suzumuj</strong></td>
+<td>₽400</td>
+<td>За участие в развитии</td>
+</tr>
+
+<tr>
+<td>19</td>
+<td><strong>@andrey_93rus</strong></td>
+<td>₽300</td>
+<td>За участие в развитии</td>
+</tr>
+
+<tr>
+<td>20</td>
 <td><strong>@PhiLin58</strong></td>
 <td>₽300</td>
 <td>За участие в развитии</td>

app/bot.py

@@ -10,7 +10,8 @@ from app.middlewares.auth import AuthMiddleware
 from app.middlewares.logging import LoggingMiddleware
 from app.middlewares.throttling import ThrottlingMiddleware
 from app.middlewares.subscription_checker import SubscriptionStatusMiddleware
-from app.middlewares.maintenance import MaintenanceMiddleware  
+from app.middlewares.maintenance import MaintenanceMiddleware
+from app.middlewares.display_name_restriction import DisplayNameRestrictionMiddleware
 from app.services.maintenance_service import maintenance_service
 from app.utils.cache import cache 
 
@@ -102,6 +103,10 @@ async def setup_bot() -> tuple[Bot, Dispatcher]:
     dp.callback_query.middleware(LoggingMiddleware())
     dp.message.middleware(MaintenanceMiddleware())
     dp.callback_query.middleware(MaintenanceMiddleware())
+    display_name_middleware = DisplayNameRestrictionMiddleware()
+    dp.message.middleware(display_name_middleware)
+    dp.callback_query.middleware(display_name_middleware)
+    dp.pre_checkout_query.middleware(display_name_middleware)
     dp.message.middleware(ThrottlingMiddleware())
     dp.callback_query.middleware(ThrottlingMiddleware())
 

app/config.py

@@ -12,9 +12,16 @@ from pydantic import field_validator, Field
 from pathlib import Path
 
 
+DEFAULT_DISPLAY_NAME_BANNED_KEYWORDS = [
+    "tme",
+    "joingroup",
+]
+
+
 class Settings(BaseSettings):
-    
+
     BOT_TOKEN: str
+    BOT_USERNAME: Optional[str] = None
     ADMIN_IDS: str = ""
     SUPPORT_USERNAME: str = "@support"
     SUPPORT_MENU_ENABLED: bool = True
@@ -197,6 +204,10 @@ class Settings(BaseSettings):
     MULENPAY_DESCRIPTION: str = "Пополнение баланса"
     MULENPAY_LANGUAGE: str = "ru"
     MULENPAY_VAT_CODE: int = 0
+
+    DISPLAY_NAME_BANNED_KEYWORDS: str = "\n".join(
+        DEFAULT_DISPLAY_NAME_BANNED_KEYWORDS
+    )
     MULENPAY_PAYMENT_SUBJECT: int = 4
     MULENPAY_PAYMENT_MODE: int = 4
     MULENPAY_MIN_AMOUNT_KOPEKS: int = 10000
@@ -454,6 +465,29 @@ class Settings(BaseSettings):
 
         description = re.sub(r'\s+', ' ', description).strip()
         return description
+
+    def get_display_name_banned_keywords(self) -> List[str]:
+        raw_value = self.DISPLAY_NAME_BANNED_KEYWORDS
+        if raw_value is None:
+            return []
+
+        if isinstance(raw_value, str):
+            candidates = re.split(r"[\n,]+", raw_value)
+        else:
+            candidates = list(raw_value)
+
+        unique: List[str] = []
+        seen: set[str] = set()
+        for candidate in candidates:
+            normalized = str(candidate).strip().lower()
+            if not normalized:
+                continue
+            if normalized in seen:
+                continue
+            seen.add(normalized)
+            unique.append(normalized)
+
+        return unique
     
     def get_autopay_warning_days(self) -> List[int]:
         try:
@@ -490,8 +524,14 @@ class Settings(BaseSettings):
         return bool(getattr(self, "LANGUAGE_SELECTION_ENABLED", True))
 
     def format_price(self, price_kopeks: int) -> str:
-        rubles = price_kopeks // 100
-        return f"{rubles} ₽"
+        sign = "-" if price_kopeks < 0 else ""
+        rubles, kopeks = divmod(abs(price_kopeks), 100)
+
+        if kopeks:
+            value = f"{sign}{rubles}.{kopeks:02d}".rstrip("0").rstrip(".")
+            return f"{value} ₽"
+
+        return f"{sign}{rubles} ₽"
 
     def get_reports_chat_id(self) -> Optional[str]:
         if self.ADMIN_REPORTS_CHAT_ID:
@@ -527,7 +567,14 @@ class Settings(BaseSettings):
     
     def get_trial_warning_hours(self) -> int:
         return self.TRIAL_WARNING_HOURS
-    
+
+    def get_bot_username(self) -> Optional[str]:
+        username = getattr(self, "BOT_USERNAME", None)
+        if not username:
+            return None
+        normalized = str(username).strip().lstrip("@")
+        return normalized or None
+
     def is_notifications_enabled(self) -> bool:
         return self.ENABLE_NOTIFICATIONS
     
@@ -837,14 +884,42 @@ class Settings(BaseSettings):
         return (self.BACKUP_SEND_ENABLED and
                 self.get_backup_send_chat_id() is not None)
 
+    def get_referred_user_reward_kopeks(self) -> int:
+        """Return the referred user reward normalized to kopeks.
+
+        Historically the value was stored in kopeks, however some
+        installations provide it in rubles. To keep backward compatibility we
+        treat any value greater than or equal to one thousand as already being
+        in kopeks (≥ 10 ₽). Smaller positive values are assumed to be provided
+        in rubles and therefore converted to kopeks.
+        """
+
+        raw_value = getattr(self, "REFERRED_USER_REWARD", 0)
+
+        try:
+            value = int(raw_value)
+        except (TypeError, ValueError):
+            return 0
+
+        if value <= 0:
+            return 0
+
+        if value >= 1000:
+            return value
+
+        return value * 100
+
     def get_referral_settings(self) -> Dict:
+        referred_reward_kopeks = self.get_referred_user_reward_kopeks()
+
         return {
             "minimum_topup_kopeks": self.REFERRAL_MINIMUM_TOPUP_KOPEKS,
             "first_topup_bonus_kopeks": self.REFERRAL_FIRST_TOPUP_BONUS_KOPEKS,
             "inviter_bonus_kopeks": self.REFERRAL_INVITER_BONUS_KOPEKS,
             "commission_percent": self.REFERRAL_COMMISSION_PERCENT,
             "notifications_enabled": self.REFERRAL_NOTIFICATIONS_ENABLED,
-            "referred_user_reward": self.REFERRED_USER_REWARD
+            "referred_user_reward": referred_reward_kopeks,
+            "referred_user_reward_kopeks": referred_reward_kopeks,
         }
     
     def is_referral_notifications_enabled(self) -> bool:

app/database/crud/discount_offer.py

@@ -110,6 +110,31 @@ async def list_discount_offers(
     return result.scalars().all()
 
 
+async def list_active_discount_offers_for_user(
+    db: AsyncSession,
+    user_id: int,
+) -> List[DiscountOffer]:
+    """Return active (not yet claimed) offers for a user."""
+
+    now = datetime.utcnow()
+    stmt = (
+        select(DiscountOffer)
+        .options(
+            selectinload(DiscountOffer.user),
+            selectinload(DiscountOffer.subscription),
+        )
+        .where(
+            DiscountOffer.user_id == user_id,
+            DiscountOffer.is_active == True,  # noqa: E712
+            DiscountOffer.expires_at > now,
+        )
+        .order_by(DiscountOffer.expires_at.asc())
+    )
+
+    result = await db.execute(stmt)
+    return result.scalars().all()
+
+
 async def count_discount_offers(
     db: AsyncSession,
     *,

app/database/crud/server_squad.py

@@ -17,7 +17,14 @@ from sqlalchemy import (
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
-from app.database.models import PromoGroup, ServerSquad, SubscriptionServer, Subscription, User
+from app.database.models import (
+    PromoGroup,
+    ServerSquad,
+    SubscriptionServer,
+    Subscription,
+    SubscriptionStatus,
+    User,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -495,10 +502,10 @@ def _extract_country_code(original_name: str) -> Optional[str]:
 
 
 async def get_server_statistics(db: AsyncSession) -> dict:
-    
+
     total_result = await db.execute(select(func.count(ServerSquad.id)))
     total_servers = total_result.scalar()
-    
+
     available_result = await db.execute(
         select(func.count(ServerSquad.id))
         .where(ServerSquad.is_available == True)
@@ -537,6 +544,25 @@ async def get_server_statistics(db: AsyncSession) -> dict:
         'total_revenue_rubles': total_revenue_kopeks / 100
     }
 
+
+async def count_active_users_for_squad(db: AsyncSession, squad_uuid: str) -> int:
+    """Возвращает количество активных подписок, подключенных к указанному скваду."""
+
+    result = await db.execute(
+        select(func.count(Subscription.id)).where(
+            Subscription.status.in_(
+                [
+                    SubscriptionStatus.ACTIVE.value,
+                    SubscriptionStatus.TRIAL.value,
+                ]
+            ),
+            cast(Subscription.connected_squads, String).like(f'%"{squad_uuid}"%'),
+        )
+    )
+
+    return result.scalar() or 0
+
+
 async def add_user_to_servers(
     db: AsyncSession,
     server_squad_ids: List[int]

app/database/crud/user.py

@@ -39,6 +39,7 @@ async def get_user_by_id(db: AsyncSession, user_id: int) -> Optional[User]:
         .options(
             selectinload(User.subscription),
             selectinload(User.promo_group),
+            selectinload(User.referrer),
         )
         .where(User.id == user_id)
     )
@@ -56,6 +57,7 @@ async def get_user_by_telegram_id(db: AsyncSession, telegram_id: int) -> Optiona
         .options(
             selectinload(User.subscription),
             selectinload(User.promo_group),
+            selectinload(User.referrer),
         )
         .where(User.telegram_id == telegram_id)
     )

app/external/telegram_stars.py

@@ -1,4 +1,5 @@
 import logging
+from decimal import Decimal, ROUND_HALF_UP
 from typing import Optional, Dict, Any
 from aiogram import Bot
 from aiogram.types import LabeledPrice, InlineKeyboardMarkup, InlineKeyboardButton
@@ -18,8 +19,9 @@ class TelegramStarsService:
         return settings.rubles_to_stars(rubles)
     
     @staticmethod
-    def calculate_rubles_from_stars(stars: int) -> float:
-        return settings.stars_to_rubles(stars)
+    def calculate_rubles_from_stars(stars: int) -> Decimal:
+        rate = Decimal(str(settings.get_stars_rate()))
+        return (Decimal(stars) * rate).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
     
     async def create_invoice(
         self,
@@ -31,10 +33,10 @@ class TelegramStarsService:
         start_parameter: Optional[str] = None
     ) -> Optional[str]:
         try:
-            amount_rubles = amount_kopeks / 100
-            stars_amount = self.calculate_stars_from_rubles(amount_rubles)
+            amount_rubles = Decimal(amount_kopeks) / Decimal(100)
+            stars_amount = self.calculate_stars_from_rubles(float(amount_rubles))
             stars_rate = settings.get_stars_rate()
-            
+
             invoice_link = await self.bot.create_invoice_link(
                 title=title,
                 description=description,
@@ -46,7 +48,7 @@ class TelegramStarsService:
             )
             
             logger.info(
-                f"Создан Stars invoice на {stars_amount} звезд (~{int(amount_rubles)}₽) "
+                f"Создан Stars invoice на {stars_amount} звезд (~{settings.format_price(amount_kopeks)}) "
                 f"для {chat_id}, курс: {stars_rate}₽/⭐"
             )
             return invoice_link
@@ -65,8 +67,8 @@ class TelegramStarsService:
         keyboard: Optional[InlineKeyboardMarkup] = None
     ) -> Optional[Dict[str, Any]]:
         try:
-            amount_rubles = amount_kopeks / 100
-            stars_amount = self.calculate_stars_from_rubles(amount_rubles)
+            amount_rubles = Decimal(amount_kopeks) / Decimal(100)
+            stars_amount = self.calculate_stars_from_rubles(float(amount_rubles))
             stars_rate = settings.get_stars_rate()
             
             message = await self.bot.send_invoice(
@@ -82,12 +84,12 @@ class TelegramStarsService:
             
             logger.info(
                 f"Отправлен Stars invoice {message.message_id} на {stars_amount} звезд "
-                f"(~{int(amount_rubles)}₽), курс: {stars_rate}₽/⭐"
+                f"(~{settings.format_price(amount_kopeks)}), курс: {stars_rate}₽/⭐"
             )
             return {
                 "message_id": message.message_id,
                 "stars_amount": stars_amount,
-                "rubles_amount": amount_rubles,
+                "rubles_amount": float(amount_rubles),
                 "payload": payload
             }
             

app/handlers/admin/bot_configuration.py

@@ -279,7 +279,7 @@ def _get_group_status(group_key: str) -> Tuple[str, str]:
             settings.REFERRAL_COMMISSION_PERCENT
             or settings.REFERRAL_FIRST_TOPUP_BONUS_KOPEKS
             or settings.REFERRAL_INVITER_BONUS_KOPEKS
-            or settings.REFERRED_USER_REWARD
+            or settings.get_referred_user_reward_kopeks()
         )
         return ("🟢", "Программа активна") if active else ("⚪", "Бонусы не заданы")
 

app/handlers/admin/referrals.py

@@ -68,7 +68,7 @@ async def show_referral_statistics(
 - Минимальное пополнение: {settings.format_price(settings.REFERRAL_MINIMUM_TOPUP_KOPEKS)}
 - Бонус за первое пополнение: {settings.format_price(settings.REFERRAL_FIRST_TOPUP_BONUS_KOPEKS)}
 - Бонус пригласившему: {settings.format_price(settings.REFERRAL_INVITER_BONUS_KOPEKS)}
-- Бонус новому пользователю: {settings.format_price(settings.REFERRED_USER_REWARD)}
+- Бонус новому пользователю: {settings.format_price(settings.get_referred_user_reward_kopeks())}
 - Комиссия с покупок: {settings.REFERRAL_COMMISSION_PERCENT}%
 - Уведомления: {'✅ Включены' if settings.REFERRAL_NOTIFICATIONS_ENABLED else '❌ Отключены'}
 
@@ -105,7 +105,7 @@ async def show_referral_statistics(
 - Минимальное пополнение: {settings.format_price(settings.REFERRAL_MINIMUM_TOPUP_KOPEKS)}
 - Бонус за первое пополнение: {settings.format_price(settings.REFERRAL_FIRST_TOPUP_BONUS_KOPEKS)}
 - Бонус пригласившему: {settings.format_price(settings.REFERRAL_INVITER_BONUS_KOPEKS)}
-- Бонус новому пользователю: {settings.format_price(settings.REFERRED_USER_REWARD)}
+- Бонус новому пользователю: {settings.format_price(settings.get_referred_user_reward_kopeks())}
 - Комиссия с покупок: {settings.REFERRAL_COMMISSION_PERCENT}%
 
 <i>🕐 Время: {current_time}</i>
@@ -190,7 +190,7 @@ async def show_referral_settings(
 • Минимальная сумма пополнения для участия: {settings.format_price(settings.REFERRAL_MINIMUM_TOPUP_KOPEKS)}
 • Бонус за первое пополнение реферала: {settings.format_price(settings.REFERRAL_FIRST_TOPUP_BONUS_KOPEKS)}
 • Бонус пригласившему за первое пополнение: {settings.format_price(settings.REFERRAL_INVITER_BONUS_KOPEKS)}
-• Бонус новому пользователю при регистрации: {settings.format_price(settings.REFERRED_USER_REWARD)}
+• Бонус новому пользователю при регистрации: {settings.format_price(settings.get_referred_user_reward_kopeks())}
 
 <b>Комиссионные:</b>
 • Процент с каждой покупки реферала: {settings.REFERRAL_COMMISSION_PERCENT}%

app/handlers/admin/remnawave.py

@@ -1,18 +1,24 @@
 import logging
+import math
 from aiogram import Dispatcher, types, F
 from aiogram.fsm.context import FSMContext
-from app.states import SquadRenameStates, SquadCreateStates
+from app.states import SquadRenameStates, SquadCreateStates, SquadMigrationStates
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.config import settings
 from app.database.models import User
+from app.database.crud.server_squad import (
+    count_active_users_for_squad,
+    get_all_server_squads,
+    get_server_squad_by_uuid,
+)
 from app.keyboards.admin import (
    get_admin_remnawave_keyboard, get_sync_options_keyboard,
    get_node_management_keyboard, get_confirmation_keyboard,
    get_squad_management_keyboard, get_squad_edit_keyboard
 )
 from app.localization.texts import get_texts
-from app.services.remnawave_service import RemnaWaveService
+from app.services.remnawave_service import RemnaWaveService, RemnaWaveConfigurationError
 from app.utils.decorators import admin_required, error_handler
 from app.utils.formatters import format_bytes, format_datetime
 
@@ -21,6 +27,769 @@ logger = logging.getLogger(__name__)
 squad_inbound_selections = {}
 squad_create_data = {}
 
+MIGRATION_PAGE_SIZE = 8
+
+
+def _format_migration_server_label(texts, server) -> str:
+    status = (
+        texts.t("ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE", "✅ Доступен")
+        if getattr(server, "is_available", True)
+        else texts.t("ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE", "🚫 Недоступен")
+    )
+    return texts.t(
+        "ADMIN_SQUAD_MIGRATION_SERVER_LABEL",
+        "{name} — 👥 {users} ({status})",
+    ).format(name=server.display_name, users=server.current_users, status=status)
+
+
+def _build_migration_keyboard(
+    texts,
+    squads,
+    page: int,
+    total_pages: int,
+    stage: str,
+    *,
+    exclude_uuid: str = None,
+):
+    prefix = "admin_migration_source" if stage == "source" else "admin_migration_target"
+    rows = []
+    has_items = False
+
+    button_template = texts.t(
+        "ADMIN_SQUAD_MIGRATION_SQUAD_BUTTON",
+        "🌍 {name} — 👥 {users} ({status})",
+    )
+
+    for squad in squads:
+        if exclude_uuid and squad.squad_uuid == exclude_uuid:
+            continue
+
+        has_items = True
+        status = (
+            texts.t("ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE_SHORT", "✅")
+            if getattr(squad, "is_available", True)
+            else texts.t("ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE_SHORT", "🚫")
+        )
+        rows.append(
+            [
+                types.InlineKeyboardButton(
+                    text=button_template.format(
+                        name=squad.display_name,
+                        users=squad.current_users,
+                        status=status,
+                    ),
+                    callback_data=f"{prefix}_{squad.squad_uuid}",
+                )
+            ]
+        )
+
+    if total_pages > 1:
+        nav_buttons = []
+        if page > 1:
+            nav_buttons.append(
+                types.InlineKeyboardButton(
+                    text="⬅️",
+                    callback_data=f"{prefix}_page_{page - 1}",
+                )
+            )
+        nav_buttons.append(
+            types.InlineKeyboardButton(
+                text=texts.t(
+                    "ADMIN_SQUAD_MIGRATION_PAGE",
+                    "Стр. {page}/{pages}",
+                ).format(page=page, pages=total_pages),
+                callback_data="admin_migration_page_info",
+            )
+        )
+        if page < total_pages:
+            nav_buttons.append(
+                types.InlineKeyboardButton(
+                    text="➡️",
+                    callback_data=f"{prefix}_page_{page + 1}",
+                )
+            )
+        rows.append(nav_buttons)
+
+    rows.append(
+        [
+            types.InlineKeyboardButton(
+                text=texts.CANCEL,
+                callback_data="admin_migration_cancel",
+            )
+        ]
+    )
+
+    return types.InlineKeyboardMarkup(inline_keyboard=rows), has_items
+
+
+async def _fetch_migration_page(
+    db: AsyncSession,
+    page: int,
+):
+    squads, total = await get_all_server_squads(
+        db,
+        page=max(1, page),
+        limit=MIGRATION_PAGE_SIZE,
+    )
+    total_pages = max(1, math.ceil(total / MIGRATION_PAGE_SIZE))
+
+    if page < 1:
+        page = 1
+    if page > total_pages:
+        page = total_pages
+        squads, total = await get_all_server_squads(
+            db,
+            page=page,
+            limit=MIGRATION_PAGE_SIZE,
+        )
+        total_pages = max(1, math.ceil(total / MIGRATION_PAGE_SIZE))
+
+    return squads, page, total_pages
+
+
+@admin_required
+@error_handler
+async def show_squad_migration_menu(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    texts = get_texts(db_user.language)
+
+    await state.clear()
+
+    squads, page, total_pages = await _fetch_migration_page(db, page=1)
+    keyboard, has_items = _build_migration_keyboard(
+        texts,
+        squads,
+        page,
+        total_pages,
+        "source",
+    )
+
+    message = (
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>")
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECT_SOURCE",
+            "Выберите сквад, из которого нужно переехать:",
+        )
+    )
+
+    if not has_items:
+        message += (
+            "\n\n"
+            + texts.t(
+                "ADMIN_SQUAD_MIGRATION_NO_OPTIONS",
+                "Нет доступных сквадов. Добавьте новые или отмените операцию.",
+            )
+        )
+
+    await state.set_state(SquadMigrationStates.selecting_source)
+
+    await callback.message.edit_text(
+        message,
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def paginate_migration_source(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    if await state.get_state() != SquadMigrationStates.selecting_source:
+        await callback.answer()
+        return
+
+    try:
+        page = int(callback.data.split("_page_")[-1])
+    except (ValueError, IndexError):
+        await callback.answer()
+        return
+
+    squads, page, total_pages = await _fetch_migration_page(db, page=page)
+    texts = get_texts(db_user.language)
+    keyboard, has_items = _build_migration_keyboard(
+        texts,
+        squads,
+        page,
+        total_pages,
+        "source",
+    )
+
+    message = (
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>")
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECT_SOURCE",
+            "Выберите сквад, из которого нужно переехать:",
+        )
+    )
+
+    if not has_items:
+        message += (
+            "\n\n"
+            + texts.t(
+                "ADMIN_SQUAD_MIGRATION_NO_OPTIONS",
+                "Нет доступных сквадов. Добавьте новые или отмените операцию.",
+            )
+        )
+
+    await callback.message.edit_text(
+        message,
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def handle_migration_source_selection(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    if await state.get_state() != SquadMigrationStates.selecting_source:
+        await callback.answer()
+        return
+
+    if "_page_" in callback.data:
+        await callback.answer()
+        return
+
+    source_uuid = callback.data.replace("admin_migration_source_", "", 1)
+
+    texts = get_texts(db_user.language)
+    server = await get_server_squad_by_uuid(db, source_uuid)
+
+    if not server:
+        await callback.answer(
+            texts.t(
+                "ADMIN_SQUAD_MIGRATION_SQUAD_NOT_FOUND",
+                "Сквад не найден или недоступен.",
+            ),
+            show_alert=True,
+        )
+        return
+
+    await state.update_data(
+        source_uuid=server.squad_uuid,
+        source_display=_format_migration_server_label(texts, server),
+    )
+
+    squads, page, total_pages = await _fetch_migration_page(db, page=1)
+    keyboard, has_items = _build_migration_keyboard(
+        texts,
+        squads,
+        page,
+        total_pages,
+        "target",
+        exclude_uuid=server.squad_uuid,
+    )
+
+    message = (
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>")
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECTED_SOURCE",
+            "Источник: {source}",
+        ).format(source=_format_migration_server_label(texts, server))
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECT_TARGET",
+            "Выберите сквад, в который нужно переехать:",
+        )
+    )
+
+    if not has_items:
+        message += (
+            "\n\n"
+            + texts.t(
+                "ADMIN_SQUAD_MIGRATION_TARGET_EMPTY",
+                "Нет других сквадов для переезда. Отмените операцию или создайте новые сквады.",
+            )
+        )
+
+    await state.set_state(SquadMigrationStates.selecting_target)
+
+    await callback.message.edit_text(
+        message,
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def paginate_migration_target(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    if await state.get_state() != SquadMigrationStates.selecting_target:
+        await callback.answer()
+        return
+
+    try:
+        page = int(callback.data.split("_page_")[-1])
+    except (ValueError, IndexError):
+        await callback.answer()
+        return
+
+    data = await state.get_data()
+    source_uuid = data.get("source_uuid")
+    if not source_uuid:
+        await callback.answer()
+        return
+
+    texts = get_texts(db_user.language)
+
+    squads, page, total_pages = await _fetch_migration_page(db, page=page)
+    keyboard, has_items = _build_migration_keyboard(
+        texts,
+        squads,
+        page,
+        total_pages,
+        "target",
+        exclude_uuid=source_uuid,
+    )
+
+    source_display = data.get("source_display") or source_uuid
+
+    message = (
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>")
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECTED_SOURCE",
+            "Источник: {source}",
+        ).format(source=source_display)
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECT_TARGET",
+            "Выберите сквад, в который нужно переехать:",
+        )
+    )
+
+    if not has_items:
+        message += (
+            "\n\n"
+            + texts.t(
+                "ADMIN_SQUAD_MIGRATION_TARGET_EMPTY",
+                "Нет других сквадов для переезда. Отмените операцию или создайте новые сквады.",
+            )
+        )
+
+    await callback.message.edit_text(
+        message,
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def handle_migration_target_selection(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    current_state = await state.get_state()
+    if current_state != SquadMigrationStates.selecting_target:
+        await callback.answer()
+        return
+
+    if "_page_" in callback.data:
+        await callback.answer()
+        return
+
+    data = await state.get_data()
+    source_uuid = data.get("source_uuid")
+
+    if not source_uuid:
+        await callback.answer()
+        return
+
+    target_uuid = callback.data.replace("admin_migration_target_", "", 1)
+
+    texts = get_texts(db_user.language)
+
+    if target_uuid == source_uuid:
+        await callback.answer(
+            texts.t(
+                "ADMIN_SQUAD_MIGRATION_SAME_SQUAD",
+                "Нельзя выбрать тот же сквад.",
+            ),
+            show_alert=True,
+        )
+        return
+
+    target_server = await get_server_squad_by_uuid(db, target_uuid)
+    if not target_server:
+        await callback.answer(
+            texts.t(
+                "ADMIN_SQUAD_MIGRATION_SQUAD_NOT_FOUND",
+                "Сквад не найден или недоступен.",
+            ),
+            show_alert=True,
+        )
+        return
+
+    source_display = data.get("source_display") or source_uuid
+
+    users_to_move = await count_active_users_for_squad(db, source_uuid)
+
+    await state.update_data(
+        target_uuid=target_server.squad_uuid,
+        target_display=_format_migration_server_label(texts, target_server),
+        migration_count=users_to_move,
+    )
+
+    await state.set_state(SquadMigrationStates.confirming)
+
+    message_lines = [
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>"),
+        "",
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_CONFIRM_DETAILS",
+            "Проверьте параметры переезда:",
+        ),
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_CONFIRM_SOURCE",
+            "• Из: {source}",
+        ).format(source=source_display),
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_CONFIRM_TARGET",
+            "• В: {target}",
+        ).format(target=_format_migration_server_label(texts, target_server)),
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_CONFIRM_COUNT",
+            "• Пользователей к переносу: {count}",
+        ).format(count=users_to_move),
+        "",
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_CONFIRM_PROMPT",
+            "Подтвердите выполнение операции.",
+        ),
+    ]
+
+    keyboard = types.InlineKeyboardMarkup(
+        inline_keyboard=[
+            [
+                types.InlineKeyboardButton(
+                    text=texts.t(
+                        "ADMIN_SQUAD_MIGRATION_CONFIRM_BUTTON",
+                        "✅ Подтвердить",
+                    ),
+                    callback_data="admin_migration_confirm",
+                )
+            ],
+            [
+                types.InlineKeyboardButton(
+                    text=texts.t(
+                        "ADMIN_SQUAD_MIGRATION_CHANGE_TARGET",
+                        "🔄 Изменить сервер назначения",
+                    ),
+                    callback_data="admin_migration_change_target",
+                )
+            ],
+            [
+                types.InlineKeyboardButton(
+                    text=texts.CANCEL,
+                    callback_data="admin_migration_cancel",
+                )
+            ],
+        ]
+    )
+
+    await callback.message.edit_text(
+        "\n".join(message_lines),
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def change_migration_target(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    data = await state.get_data()
+    source_uuid = data.get("source_uuid")
+
+    if not source_uuid:
+        await callback.answer()
+        return
+
+    await state.set_state(SquadMigrationStates.selecting_target)
+
+    texts = get_texts(db_user.language)
+    squads, page, total_pages = await _fetch_migration_page(db, page=1)
+    keyboard, has_items = _build_migration_keyboard(
+        texts,
+        squads,
+        page,
+        total_pages,
+        "target",
+        exclude_uuid=source_uuid,
+    )
+
+    source_display = data.get("source_display") or source_uuid
+
+    message = (
+        texts.t("ADMIN_SQUAD_MIGRATION_TITLE", "🚚 <b>Переезд сквадов</b>")
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECTED_SOURCE",
+            "Источник: {source}",
+        ).format(source=source_display)
+        + "\n\n"
+        + texts.t(
+            "ADMIN_SQUAD_MIGRATION_SELECT_TARGET",
+            "Выберите сквад, в который нужно переехать:",
+        )
+    )
+
+    if not has_items:
+        message += (
+            "\n\n"
+            + texts.t(
+                "ADMIN_SQUAD_MIGRATION_TARGET_EMPTY",
+                "Нет других сквадов для переезда. Отмените операцию или создайте новые сквады.",
+            )
+        )
+
+    await callback.message.edit_text(
+        message,
+        reply_markup=keyboard,
+        disable_web_page_preview=True,
+    )
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def confirm_squad_migration(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    current_state = await state.get_state()
+    if current_state != SquadMigrationStates.confirming:
+        await callback.answer()
+        return
+
+    data = await state.get_data()
+    source_uuid = data.get("source_uuid")
+    target_uuid = data.get("target_uuid")
+
+    if not source_uuid or not target_uuid:
+        await callback.answer()
+        return
+
+    texts = get_texts(db_user.language)
+    remnawave_service = RemnaWaveService()
+
+    await callback.answer(texts.t("ADMIN_SQUAD_MIGRATION_IN_PROGRESS", "Запускаю переезд..."))
+
+    try:
+        result = await remnawave_service.migrate_squad_users(
+            db,
+            source_uuid=source_uuid,
+            target_uuid=target_uuid,
+        )
+    except RemnaWaveConfigurationError as error:
+        message = texts.t(
+            "ADMIN_SQUAD_MIGRATION_API_ERROR",
+            "❌ RemnaWave API не настроен: {error}",
+        ).format(error=str(error))
+        reply_markup = types.InlineKeyboardMarkup(
+            inline_keyboard=[
+                [
+                    types.InlineKeyboardButton(
+                        text=texts.t(
+                            "ADMIN_SQUAD_MIGRATION_BACK_BUTTON",
+                            "⬅️ В Remnawave",
+                        ),
+                        callback_data="admin_remnawave",
+                    )
+                ]
+            ]
+        )
+        await callback.message.edit_text(message, reply_markup=reply_markup)
+        await state.clear()
+        return
+
+    source_display = data.get("source_display") or source_uuid
+    target_display = data.get("target_display") or target_uuid
+
+    if not result.get("success"):
+        error_message = result.get("message") or ""
+        error_code = result.get("error") or "unexpected"
+        message = texts.t(
+            "ADMIN_SQUAD_MIGRATION_ERROR",
+            "❌ Не удалось выполнить переезд (код: {code}). {details}",
+        ).format(code=error_code, details=error_message)
+        reply_markup = types.InlineKeyboardMarkup(
+            inline_keyboard=[
+                [
+                    types.InlineKeyboardButton(
+                        text=texts.t(
+                            "ADMIN_SQUAD_MIGRATION_BACK_BUTTON",
+                            "⬅️ В Remnawave",
+                        ),
+                        callback_data="admin_remnawave",
+                    )
+                ],
+                [
+                    types.InlineKeyboardButton(
+                        text=texts.t(
+                            "ADMIN_SQUAD_MIGRATION_NEW_BUTTON",
+                            "🔁 Новый переезд",
+                        ),
+                        callback_data="admin_rw_migration",
+                    )
+                ],
+            ]
+        )
+        await callback.message.edit_text(message, reply_markup=reply_markup)
+        await state.clear()
+        return
+
+    message_lines = [
+        texts.t("ADMIN_SQUAD_MIGRATION_SUCCESS_TITLE", "✅ Переезд завершен"),
+        "",
+        texts.t("ADMIN_SQUAD_MIGRATION_CONFIRM_SOURCE", "• Из: {source}").format(
+            source=source_display
+        ),
+        texts.t("ADMIN_SQUAD_MIGRATION_CONFIRM_TARGET", "• В: {target}").format(
+            target=target_display
+        ),
+        "",
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_RESULT_TOTAL",
+            "Найдено подписок: {count}",
+        ).format(count=result.get("total", 0)),
+        texts.t(
+            "ADMIN_SQUAD_MIGRATION_RESULT_UPDATED",
+            "Перенесено: {count}",
+        ).format(count=result.get("updated", 0)),
+    ]
+
+    panel_updated = result.get("panel_updated", 0)
+    panel_failed = result.get("panel_failed", 0)
+
+    if panel_updated:
+        message_lines.append(
+            texts.t(
+                "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_UPDATED",
+                "Обновлено в панели: {count}",
+            ).format(count=panel_updated)
+        )
+    if panel_failed:
+        message_lines.append(
+            texts.t(
+                "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_FAILED",
+                "Не удалось обновить в панели: {count}",
+            ).format(count=panel_failed)
+        )
+
+    reply_markup = types.InlineKeyboardMarkup(
+        inline_keyboard=[
+            [
+                types.InlineKeyboardButton(
+                    text=texts.t(
+                        "ADMIN_SQUAD_MIGRATION_NEW_BUTTON",
+                        "🔁 Новый переезд",
+                    ),
+                    callback_data="admin_rw_migration",
+                )
+            ],
+            [
+                types.InlineKeyboardButton(
+                    text=texts.t(
+                        "ADMIN_SQUAD_MIGRATION_BACK_BUTTON",
+                        "⬅️ В Remnawave",
+                    ),
+                    callback_data="admin_remnawave",
+                )
+            ],
+        ]
+    )
+
+    await callback.message.edit_text(
+        "\n".join(message_lines),
+        reply_markup=reply_markup,
+        disable_web_page_preview=True,
+    )
+    await state.clear()
+
+
+@admin_required
+@error_handler
+async def cancel_squad_migration(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    texts = get_texts(db_user.language)
+    await state.clear()
+
+    message = texts.t(
+        "ADMIN_SQUAD_MIGRATION_CANCELLED",
+        "❌ Переезд отменен.",
+    )
+
+    reply_markup = types.InlineKeyboardMarkup(
+        inline_keyboard=[
+            [
+                types.InlineKeyboardButton(
+                    text=texts.t(
+                        "ADMIN_SQUAD_MIGRATION_BACK_BUTTON",
+                        "⬅️ В Remnawave",
+                    ),
+                    callback_data="admin_remnawave",
+                )
+            ]
+        ]
+    )
+
+    await callback.message.edit_text(message, reply_markup=reply_markup)
+    await callback.answer()
+
+
+@admin_required
+@error_handler
+async def handle_migration_page_info(
+    callback: types.CallbackQuery,
+    db_user: User,
+    db: AsyncSession,
+    state: FSMContext,
+):
+    texts = get_texts(db_user.language)
+    await callback.answer(
+        texts.t("ADMIN_SQUAD_MIGRATION_PAGE_HINT", "Это текущая страница."),
+        show_alert=False,
+    )
+
 @admin_required
 @error_handler
 async def show_remnawave_menu(
@@ -1920,6 +2689,15 @@ def register_handlers(dp: Dispatcher):
     dp.callback_query.register(restart_all_nodes, F.data == "admin_restart_all_nodes")
     dp.callback_query.register(show_sync_options, F.data == "admin_rw_sync")
     dp.callback_query.register(sync_all_users, F.data == "sync_all_users")
+    dp.callback_query.register(show_squad_migration_menu, F.data == "admin_rw_migration")
+    dp.callback_query.register(paginate_migration_source, F.data.startswith("admin_migration_source_page_"))
+    dp.callback_query.register(handle_migration_source_selection, F.data.startswith("admin_migration_source_"))
+    dp.callback_query.register(paginate_migration_target, F.data.startswith("admin_migration_target_page_"))
+    dp.callback_query.register(handle_migration_target_selection, F.data.startswith("admin_migration_target_"))
+    dp.callback_query.register(change_migration_target, F.data == "admin_migration_change_target")
+    dp.callback_query.register(confirm_squad_migration, F.data == "admin_migration_confirm")
+    dp.callback_query.register(cancel_squad_migration, F.data == "admin_migration_cancel")
+    dp.callback_query.register(handle_migration_page_info, F.data == "admin_migration_page_info")
     dp.callback_query.register(show_squads_management, F.data == "admin_rw_squads")
     dp.callback_query.register(show_squad_details, F.data.startswith("admin_squad_manage_"))
     dp.callback_query.register(manage_squad_action, F.data.startswith("squad_add_users_"))

app/handlers/admin/tickets.py

@@ -371,7 +371,7 @@ async def handle_admin_ticket_reply(
             return
 
         # Обычный режим ответа админа
-        ticket = await TicketCRUD.get_ticket_by_id(db, ticket_id, load_messages=False)
+        ticket = await TicketCRUD.get_ticket_by_id(db, ticket_id, load_messages=False, load_user=True)
         if not ticket:
             texts = get_texts(db_user.language)
             await message.answer(
@@ -859,52 +859,71 @@ async def notify_user_about_ticket_reply(bot: Bot, ticket: Ticket, reply_text: s
         except Exception:
             pass
         from app.localization.texts import get_texts
-        
-        # Получаем тикет с пользователем
-        ticket_with_user = await TicketCRUD.get_ticket_by_id(db, ticket.id, load_user=True)
-        if not ticket_with_user or not ticket_with_user.user:
+
+        # Обеспечим наличие данных пользователя в объекте тикета
+        ticket_with_user = ticket
+        if not getattr(ticket_with_user, "user", None):
+            ticket_with_user = await TicketCRUD.get_ticket_by_id(db, ticket.id, load_user=True)
+
+        user = getattr(ticket_with_user, "user", None)
+        if not user:
             logger.error(f"User not found for ticket #{ticket.id}")
             return
-        
-        texts = get_texts(ticket_with_user.user.language)
-        
+
+        if not getattr(user, "telegram_id", None):
+            logger.error(
+                "Cannot notify ticket #%s user without telegram_id (username=%s)",
+                ticket.id,
+                getattr(user, "username", None),
+            )
+            return
+
+        chat_id = int(user.telegram_id)
+        texts = get_texts(user.language)
+
         # Формируем уведомление
         base_text = texts.t(
-            "TICKET_REPLY_NOTIFICATION", 
+            "TICKET_REPLY_NOTIFICATION",
             "🎫 Получен ответ по тикету #{ticket_id}\n\n{reply_preview}\n\nНажмите кнопку ниже, чтобы перейти к тикету:"
         ).format(
             ticket_id=ticket.id,
             reply_preview=reply_text[:100] + "..." if len(reply_text) > 100 else reply_text
         )
+        keyboard = types.InlineKeyboardMarkup(inline_keyboard=[
+            [types.InlineKeyboardButton(text=texts.t("VIEW_TICKET", "👁️ Посмотреть тикет"), callback_data=f"view_ticket_{ticket.id}")],
+            [types.InlineKeyboardButton(text=texts.t("CLOSE_NOTIFICATION", "❌ Закрыть уведомление"), callback_data=f"close_ticket_notification_{ticket.id}")]
+        ])
+
         # Если было фото в последнем ответе админа — отправим как фото
         last_message = await TicketMessageCRUD.get_last_message(db, ticket.id)
         if last_message and last_message.has_media and last_message.media_type == "photo" and last_message.is_from_admin:
             caption = base_text
             try:
                 await bot.send_photo(
-                    chat_id=ticket_with_user.user.telegram_id,
+                    chat_id=chat_id,
                     photo=last_message.media_file_id,
                     caption=caption,
-                    reply_markup=types.InlineKeyboardMarkup(inline_keyboard=[
-                        [types.InlineKeyboardButton(text=texts.t("VIEW_TICKET", "👁️ Посмотреть тикет"), callback_data=f"view_ticket_{ticket.id}")],
-                        [types.InlineKeyboardButton(text=texts.t("CLOSE_NOTIFICATION", "❌ Закрыть уведомление"), callback_data=f"close_ticket_notification_{ticket.id}")]
-                    ])
+                    reply_markup=keyboard,
                 )
                 return
+            except TelegramBadRequest as photo_error:
+                logger.error(
+                    "Не удалось отправить фото-уведомление пользователю %s для тикета %s: %s",
+                    chat_id,
+                    ticket.id,
+                    photo_error,
+                )
             except Exception as e:
                 logger.error(f"Не удалось отправить фото-уведомление: {e}")
         # Фоллбек: текстовое уведомление
         await bot.send_message(
-            chat_id=ticket_with_user.user.telegram_id,
+            chat_id=chat_id,
             text=base_text,
-            reply_markup=types.InlineKeyboardMarkup(inline_keyboard=[
-                [types.InlineKeyboardButton(text=texts.t("VIEW_TICKET", "👁️ Посмотреть тикет"), callback_data=f"view_ticket_{ticket.id}")],
-                [types.InlineKeyboardButton(text=texts.t("CLOSE_NOTIFICATION", "❌ Закрыть уведомление"), callback_data=f"close_ticket_notification_{ticket.id}")]
-            ])
+            reply_markup=keyboard,
         )
-        
-        logger.info(f"Ticket #{ticket.id} reply notification sent to user {ticket_with_user.user.telegram_id}")
-        
+
+        logger.info(f"Ticket #{ticket.id} reply notification sent to user {chat_id}")
+
     except Exception as e:
         logger.error(f"Error notifying user about ticket reply: {e}")
 

app/handlers/balance.py

@@ -569,10 +569,33 @@ async def process_topup_amount(
     state: FSMContext
 ):
     texts = get_texts(db_user.language)
-    
+
     try:
-        amount_rubles = float(message.text.replace(',', '.'))
-        
+        if not message.text:
+            if message.successful_payment:
+                logger.info(
+                    "Получено сообщение об успешном платеже без текста, "
+                    "обработчик суммы пополнения завершает работу"
+                )
+                await state.clear()
+                return
+
+            await message.answer(
+                texts.INVALID_AMOUNT,
+                reply_markup=get_back_keyboard(db_user.language)
+            )
+            return
+
+        amount_text = message.text.strip()
+        if not amount_text:
+            await message.answer(
+                texts.INVALID_AMOUNT,
+                reply_markup=get_back_keyboard(db_user.language)
+            )
+            return
+
+        amount_rubles = float(amount_text.replace(',', '.'))
+
         if amount_rubles < 1:
             await message.answer("Минимальная сумма пополнения: 1 ₽")
             return

app/handlers/stars_payments.py

@@ -1,7 +1,9 @@
 import logging
+from decimal import Decimal, ROUND_HALF_UP
 from aiogram import Dispatcher, types, F
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.config import settings
 from app.database.models import User
 from app.services.payment_service import PaymentService
 from app.external.telegram_stars import TelegramStarsService
@@ -114,6 +116,8 @@ async def handle_successful_payment(
         
         if success:
             rubles_amount = TelegramStarsService.calculate_rubles_from_stars(payment.total_amount)
+            amount_kopeks = int((rubles_amount * Decimal(100)).to_integral_value(rounding=ROUND_HALF_UP))
+            amount_text = settings.format_price(amount_kopeks).replace(" ₽", "")
 
             keyboard = await payment_service.build_topup_success_keyboard(user)
 
@@ -129,7 +133,7 @@ async def handle_successful_payment(
                     "Спасибо за пополнение! 🚀",
                 ).format(
                     stars_spent=payment.total_amount,
-                    amount=int(rubles_amount),
+                    amount=amount_text,
                     transaction_id=transaction_id_short,
                 ),
                 parse_mode="HTML",
@@ -137,8 +141,10 @@ async def handle_successful_payment(
             )
 
             logger.info(
-                f"✅ Stars платеж успешно обработан: "
-                f"пользователь {user.id}, {payment.total_amount} звезд → {int(rubles_amount)}₽"
+                "✅ Stars платеж успешно обработан: пользователь %s, %s звезд → %s",
+                user.id,
+                payment.total_amount,
+                settings.format_price(amount_kopeks),
             )
         else:
             logger.error(f"Ошибка обработки Stars платежа для пользователя {user.id}")

app/keyboards/admin.py

@@ -674,6 +674,12 @@ def get_admin_remnawave_keyboard(language: str = "ru") -> InlineKeyboardMarkup:
                 callback_data="admin_rw_squads"
             )
         ],
+        [
+            InlineKeyboardButton(
+                text=_t(texts, "ADMIN_REMNAWAVE_MIGRATION", "🚚 Переезд"),
+                callback_data="admin_rw_migration"
+            )
+        ],
         [
             InlineKeyboardButton(
                 text=_t(texts, "ADMIN_REMNAWAVE_TRAFFIC", "📈 Трафик"),

app/localization/locales/en.json

@@ -5,6 +5,7 @@
   "COUNTRY_MANAGEMENT_NONE": "No countries connected",
   "PAID_FEATURE_ONLY": "⚠ This feature is available only for paid subscriptions",
   "PAID_FEATURE_ONLY_SHORT": "⚠ Paid subscriptions only",
+  "SUSPICIOUS_DISPLAY_NAME_BLOCKED": "🚫 We detected that your display name looks like a link or an official account. Please change your Telegram name and try again.",
   "COUNTRY_NOT_AVAILABLE_PROMOGROUP": "❌ This server is not available for your promo group",
   "COUNTRY_CHANGES_NOT_FOUND": "⚠️ No changes detected",
   "COUNTRY_CHANGES_SUCCESS_HEADER": "✅ <b>Countries updated!</b>\n\n",

app/localization/locales/ru.json

@@ -6,6 +6,7 @@
   "COUNTRY_MANAGEMENT_NONE": "Нет подключенных стран",
   "PAID_FEATURE_ONLY": "⚠ Эта функция доступна только для платных подписок",
   "PAID_FEATURE_ONLY_SHORT": "⚠ Только для платных подписок",
+  "SUSPICIOUS_DISPLAY_NAME_BLOCKED": "🚫 Мы обнаружили, что ваше отображаемое имя похоже на ссылку или служебный аккаунт. Пожалуйста, измените имя в профиле Telegram и повторите попытку.",
   "COUNTRY_NOT_AVAILABLE_PROMOGROUP": "❌ Сервер недоступен для вашей промогруппы",
   "COUNTRY_CHANGES_NOT_FOUND": "⚠️ Изменения не обнаружены",
   "COUNTRY_CHANGES_SUCCESS_HEADER": "✅ <b>Страны успешно обновлены!</b>\n\n",

app/middlewares/display_name_restriction.py

@@ -0,0 +1,159 @@
+import logging
+import re
+from typing import Any, Awaitable, Callable, Dict
+
+from aiogram import BaseMiddleware
+from aiogram.types import (
+    CallbackQuery,
+    Message,
+    PreCheckoutQuery,
+    TelegramObject,
+    User as TgUser,
+)
+
+from app.config import settings
+from app.localization.texts import get_texts
+
+logger = logging.getLogger(__name__)
+
+
+ZERO_WIDTH_PATTERN = re.compile(r"[\u200B-\u200D\uFEFF]")
+
+LINK_PATTERNS = [
+    re.compile(pattern, re.IGNORECASE)
+    for pattern in (
+        r"t\.me/\+",
+        r"joinchat",
+        r"https?://",
+        r"www\.",
+        r"tg://",
+        r"telegram\.me",
+        r"t\.me",
+    )
+]
+
+DOMAIN_OBFUSCATION_PATTERN = re.compile(
+    r"(?<![0-9a-zа-яё])(?:t|т)[\s\W_]*?(?:m|м)(?:e|е)",
+    re.IGNORECASE,
+)
+
+CHAR_TRANSLATION = str.maketrans({
+    "а": "a",
+    "е": "e",
+    "о": "o",
+    "р": "p",
+    "с": "c",
+    "х": "x",
+    "у": "y",
+    "к": "k",
+    "т": "t",
+    "г": "g",
+    "м": "m",
+    "н": "n",
+    "л": "l",
+    "і": "i",
+    "ї": "i",
+    "ё": "e",
+    "ь": "",
+    "ъ": "",
+    "ў": "u",
+    "＠": "@",
+})
+
+COLLAPSE_PATTERN = re.compile(r"[\s\._\-/\\|,:;•·﹒․⋅··`~'\"!?()\[\]{}<>+=]+")
+
+class DisplayNameRestrictionMiddleware(BaseMiddleware):
+    """Blocks users whose display name imitates links or official accounts."""
+
+    async def __call__(
+        self,
+        handler: Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]],
+        event: TelegramObject,
+        data: Dict[str, Any],
+    ) -> Any:
+        user: TgUser | None = None
+
+        if isinstance(event, (Message, CallbackQuery, PreCheckoutQuery)):
+            user = event.from_user
+
+        if not user or user.is_bot:
+            return await handler(event, data)
+
+        display_name = self._build_display_name(user)
+        username = user.username or ""
+
+        display_suspicious = self._is_suspicious(display_name)
+        username_suspicious = self._is_suspicious(username)
+
+        if display_suspicious or username_suspicious:
+            suspicious_value = display_name if display_suspicious else username
+            language = self._resolve_language(user, data)
+            texts = get_texts(language)
+            warning = texts.get(
+                "SUSPICIOUS_DISPLAY_NAME_BLOCKED",
+                "🚫 Ваше отображаемое имя похоже на ссылку или служебный аккаунт. "
+                "Пожалуйста, измените имя и попробуйте снова.",
+            )
+
+            logger.warning(
+                "🚫 DisplayNameRestriction: user %s blocked due to suspicious name '%s'",
+                user.id,
+                suspicious_value,
+            )
+
+            if isinstance(event, Message):
+                await event.answer(warning)
+            elif isinstance(event, CallbackQuery):
+                await event.answer(warning, show_alert=True)
+            elif isinstance(event, PreCheckoutQuery):
+                await event.answer(ok=False, error_message=warning)
+            return None
+
+        return await handler(event, data)
+
+    @staticmethod
+    def _build_display_name(user: TgUser) -> str:
+        parts = [user.first_name or "", user.last_name or ""]
+        return " ".join(part for part in parts if part).strip()
+
+    @staticmethod
+    def _resolve_language(user: TgUser, data: Dict[str, Any]) -> str:
+        db_user = data.get("db_user")
+        if db_user and getattr(db_user, "language", None):
+            return db_user.language
+        language_code = getattr(user, "language_code", None)
+        return language_code or settings.DEFAULT_LANGUAGE
+
+    def _is_suspicious(self, value: str) -> bool:
+        if not value:
+            return False
+
+        cleaned = ZERO_WIDTH_PATTERN.sub("", value)
+        lower_value = cleaned.lower()
+
+        if "@" in cleaned or "＠" in cleaned:
+            return True
+
+        if any(pattern.search(lower_value) for pattern in LINK_PATTERNS):
+            return True
+
+        if DOMAIN_OBFUSCATION_PATTERN.search(lower_value):
+            return True
+
+        normalized = self._normalize_text(lower_value)
+        collapsed = COLLAPSE_PATTERN.sub("", normalized)
+
+        if "tme" in collapsed:
+            return True
+
+        banned_keywords = settings.get_display_name_banned_keywords()
+
+        return any(
+            keyword in normalized or keyword in collapsed
+            for keyword in banned_keywords
+        )
+
+    @staticmethod
+    def _normalize_text(value: str) -> str:
+        return value.translate(CHAR_TRANSLATION)
+

app/services/admin_notification_service.py

@@ -3,7 +3,6 @@ from typing import Optional, Dict, Any, List
 from datetime import datetime
 from aiogram import Bot, types
 from aiogram.exceptions import TelegramBadRequest, TelegramForbiddenError
-from sqlalchemy import select, func
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.config import settings
@@ -345,35 +344,22 @@ class AdminNotificationService:
     
     async def send_balance_topup_notification(
         self,
-        db: AsyncSession,
         user: User,
         transaction: Transaction,
-        old_balance: int
+        old_balance: int,
+        *,
+        topup_status: str,
+        referrer_info: str,
+        subscription: Subscription | None,
+        promo_group: PromoGroup | None,
     ) -> bool:
         if not self._is_enabled():
             return False
 
         try:
-            deposit_count_result = await db.execute(
-                select(func.count())
-                .select_from(Transaction)
-                .where(
-                    Transaction.user_id == user.id,
-                    Transaction.type == TransactionType.DEPOSIT.value,
-                    Transaction.is_completed.is_(True)
-                )
-            )
-            deposit_count = deposit_count_result.scalar_one() or 0
-            topup_status = "🆕 Первое пополнение" if deposit_count <= 1 else "🔄 Пополнение"
             payment_method = self._get_payment_method_display(transaction.payment_method)
             balance_change = user.balance_kopeks - old_balance
-            referrer_info = await self._get_referrer_info(db, user.referred_by_id)
-            subscription_result = await db.execute(
-                select(Subscription).where(Subscription.user_id == user.id)
-            )
-            subscription = subscription_result.scalar_one_or_none()
             subscription_status = self._get_subscription_status(subscription)
-            promo_group = await self._get_user_promo_group(db, user)
             promo_block = self._format_promo_group_block(promo_group)
 
             message = f"""💰 <b>ПОПОЛНЕНИЕ БАЛАНСА</b>

app/services/payment_service.py

@@ -2,7 +2,7 @@ import logging
 import hashlib
 import hmac
 import uuid
-from decimal import Decimal, InvalidOperation
+from decimal import Decimal, InvalidOperation, ROUND_HALF_UP, ROUND_FLOOR
 from typing import Optional, Dict, Any
 from datetime import datetime
 from aiogram import Bot
@@ -24,6 +24,7 @@ from app.external.cryptobot import CryptoBotService
 from app.utils.currency_converter import currency_converter
 from app.database.database import get_db
 from app.localization.texts import get_texts
+from app.utils.user_utils import format_referrer_info
 from app.services.subscription_checkout_service import (
     has_subscription_checkout_draft,
     should_offer_checkout_resume,
@@ -106,16 +107,32 @@ class PaymentService:
         self,
         amount_kopeks: int,
         description: str,
-        payload: Optional[str] = None
+        payload: Optional[str] = None,
+        *,
+        stars_amount: Optional[int] = None,
     ) -> str:
-        
+
         if not self.bot or not self.stars_service:
             raise ValueError("Bot instance required for Stars payments")
-        
+
         try:
-            amount_rubles = amount_kopeks / 100
-            stars_amount = TelegramStarsService.calculate_stars_from_rubles(amount_rubles)
-            
+            amount_rubles = Decimal(amount_kopeks) / Decimal(100)
+
+            if stars_amount is None:
+                rate = Decimal(str(settings.get_stars_rate()))
+                if rate <= 0:
+                    raise ValueError("Stars rate must be positive")
+
+                normalized_stars = (amount_rubles / rate).to_integral_value(
+                    rounding=ROUND_FLOOR
+                )
+                stars_amount = int(normalized_stars)
+                if stars_amount <= 0:
+                    stars_amount = 1
+
+            if stars_amount <= 0:
+                raise ValueError("Stars amount must be positive")
+
             invoice_link = await self.bot.create_invoice_link(
                 title="Пополнение баланса VPN",
                 description=f"{description} (≈{stars_amount} ⭐)",
@@ -125,7 +142,11 @@ class PaymentService:
                 prices=[LabeledPrice(label="Пополнение", amount=stars_amount)]
             )
             
-            logger.info(f"Создан Stars invoice на {stars_amount} звезд (~{int(amount_rubles)}₽)")
+            logger.info(
+                "Создан Stars invoice на %s звезд (~%s)",
+                stars_amount,
+                settings.format_price(amount_kopeks),
+            )
             return invoice_link
             
         except Exception as e:
@@ -142,7 +163,7 @@ class PaymentService:
     ) -> bool:
         try:
             rubles_amount = TelegramStarsService.calculate_rubles_from_stars(stars_amount)
-            amount_kopeks = int(rubles_amount * 100)
+            amount_kopeks = int((rubles_amount * Decimal(100)).to_integral_value(rounding=ROUND_HALF_UP))
             
             transaction = await create_transaction(
                 db=db,
@@ -158,16 +179,21 @@ class PaymentService:
             user = await get_user_by_id(db, user_id)
             if user:
                 old_balance = user.balance_kopeks
-                
+                was_first_topup = not user.has_made_first_topup
+
                 user.balance_kopeks += amount_kopeks
                 user.updated_at = datetime.utcnow()
-                
+
+                promo_group = getattr(user, "promo_group", None)
+                subscription = getattr(user, "subscription", None)
+                referrer_info = format_referrer_info(user)
+                topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
                 await db.commit()
-                await db.refresh(user)
-                
-                logger.info(f"💰 Баланс пользователя {user.telegram_id} изменен: {old_balance} → {user.balance_kopeks} (изменение: +{amount_kopeks})")
-                
-                description_for_referral = f"Пополнение Stars: {int(rubles_amount)}₽ ({stars_amount} ⭐)"
+
+                description_for_referral = (
+                    f"Пополнение Stars: {settings.format_price(amount_kopeks)} ({stars_amount} ⭐)"
+                )
                 logger.info(f"🔍 Проверка реферальной логики для описания: '{description_for_referral}'")
                 
                 if any(word in description_for_referral.lower() for word in ["пополнение", "stars", "yookassa", "topup"]) and not any(word in description_for_referral.lower() for word in ["комиссия", "бонус"]):
@@ -179,13 +205,27 @@ class PaymentService:
                         logger.error(f"Ошибка обработки реферального пополнения: {e}")
                 else:
                     logger.info(f"❌ Описание '{description_for_referral}' не подходит для реферальной логики")
-                
+
+                if was_first_topup and not user.has_made_first_topup:
+                    user.has_made_first_topup = True
+                    await db.commit()
+
+                await db.refresh(user)
+
+                logger.info(f"💰 Баланс пользователя {user.telegram_id} изменен: {old_balance} → {user.balance_kopeks} (изменение: +{amount_kopeks})")
+
                 if self.bot:
                     try:
                         from app.services.admin_notification_service import AdminNotificationService
                         notification_service = AdminNotificationService(self.bot)
                         await notification_service.send_balance_topup_notification(
-                            db, user, transaction, old_balance
+                            user,
+                            transaction,
+                            old_balance,
+                            topup_status=topup_status,
+                            referrer_info=referrer_info,
+                            subscription=subscription,
+                            promo_group=promo_group,
                         )
                     except Exception as e:
                         logger.error(f"Ошибка отправки уведомления о пополнении Stars: {e}")
@@ -206,14 +246,18 @@ class PaymentService:
                             reply_markup=keyboard,
                         )
                         logger.info(
-                            f"✅ Отправлено уведомление пользователю {user.telegram_id} о пополнении на {int(rubles_amount)}₽"
+                            "✅ Отправлено уведомление пользователю %s о пополнении на %s",
+                            user.telegram_id,
+                            settings.format_price(amount_kopeks),
                         )
                     except Exception as e:
                         logger.error(f"Ошибка отправки уведомления о пополнении Stars: {e}")
                 
                 logger.info(
-                    f"✅ Обработан Stars платеж: пользователь {user_id}, "
-                    f"{stars_amount} звезд → {int(rubles_amount)}₽"
+                    "✅ Обработан Stars платеж: пользователь %s, %s звезд → %s",
+                    user_id,
+                    stars_amount,
+                    settings.format_price(amount_kopeks),
                 )
                 return True
             else:
@@ -449,25 +493,42 @@ class PaymentService:
                 user = await get_user_by_id(db, updated_payment.user_id)
                 if user:
                     old_balance = user.balance_kopeks
-                    
+                    was_first_topup = not user.has_made_first_topup
+
                     user.balance_kopeks += updated_payment.amount_kopeks
                     user.updated_at = datetime.utcnow()
-                    
+
+                    promo_group = getattr(user, "promo_group", None)
+                    subscription = getattr(user, "subscription", None)
+                    referrer_info = format_referrer_info(user)
+                    topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
                     await db.commit()
-                    await db.refresh(user)
-                    
+
                     try:
                         from app.services.referral_service import process_referral_topup
                         await process_referral_topup(db, user.id, updated_payment.amount_kopeks, self.bot)
                     except Exception as e:
                         logger.error(f"Ошибка обработки реферального пополнения YooKassa: {e}")
-                    
+
+                    if was_first_topup and not user.has_made_first_topup:
+                        user.has_made_first_topup = True
+                        await db.commit()
+
+                    await db.refresh(user)
+
                     if self.bot:
                         try:
                             from app.services.admin_notification_service import AdminNotificationService
                             notification_service = AdminNotificationService(self.bot)
                             await notification_service.send_balance_topup_notification(
-                                db, user, transaction, old_balance
+                                user,
+                                transaction,
+                                old_balance,
+                                topup_status=topup_status,
+                                referrer_info=referrer_info,
+                                subscription=subscription,
+                                promo_group=promo_group,
                             )
                         except Exception as e:
                             logger.error(f"Ошибка отправки уведомления о пополнении YooKassa: {e}")
@@ -818,6 +879,7 @@ class PaymentService:
         language: str,
         ttl_seconds: Optional[int] = None,
         payer_email: Optional[str] = None,
+        payment_method: Optional[str] = None,
     ) -> Optional[Dict[str, Any]]:
 
         if not self.pal24_service or not self.pal24_service.is_configured:
@@ -848,6 +910,8 @@ class PaymentService:
             "language": language,
         }
 
+        normalized_payment_method = (payment_method or "SBP").upper()
+
         try:
             response = await self.pal24_service.create_bill(
                 amount_kopeks=amount_kopeks,
@@ -857,7 +921,7 @@ class PaymentService:
                 ttl_seconds=ttl_seconds,
                 custom_payload=custom_payload,
                 payer_email=payer_email,
-                payment_method="SBP",
+                payment_method=normalized_payment_method,
             )
         except Pal24APIError as error:
             logger.error("Ошибка Pal24 API при создании счета: %s", error)
@@ -952,6 +1016,7 @@ class PaymentService:
             "sbp_url": transfer_url or primary_link,
             "card_url": card_url,
             "transfer_url": transfer_url,
+            "payment_method": normalized_payment_method,
         }
 
         logger.info(
@@ -1045,11 +1110,17 @@ class PaymentService:
                     return False
 
                 old_balance = user.balance_kopeks
+                was_first_topup = not user.has_made_first_topup
+
                 user.balance_kopeks += payment.amount_kopeks
                 user.updated_at = datetime.utcnow()
 
+                promo_group = getattr(user, "promo_group", None)
+                subscription = getattr(user, "subscription", None)
+                referrer_info = format_referrer_info(user)
+                topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
                 await db.commit()
-                await db.refresh(user)
 
                 try:
                     from app.services.referral_service import process_referral_topup
@@ -1061,6 +1132,12 @@ class PaymentService:
                         referral_error,
                     )
 
+                if was_first_topup and not user.has_made_first_topup:
+                    user.has_made_first_topup = True
+                    await db.commit()
+
+                await db.refresh(user)
+
                 await update_mulenpay_payment_status(
                     db,
                     payment=payment,
@@ -1077,10 +1154,13 @@ class PaymentService:
 
                         notification_service = AdminNotificationService(self.bot)
                         await notification_service.send_balance_topup_notification(
-                            db,
                             user,
                             transaction,
                             old_balance,
+                            topup_status=topup_status,
+                            referrer_info=referrer_info,
+                            subscription=subscription,
+                            promo_group=promo_group,
                         )
                     except Exception as notify_error:
                         logger.error(
@@ -1238,10 +1318,17 @@ class PaymentService:
             await link_pal24_payment_to_transaction(db, payment, transaction.id)
 
             old_balance = user.balance_kopeks
+            was_first_topup = not user.has_made_first_topup
+
             user.balance_kopeks += payment.amount_kopeks
             user.updated_at = datetime.utcnow()
+
+            promo_group = getattr(user, "promo_group", None)
+            subscription = getattr(user, "subscription", None)
+            referrer_info = format_referrer_info(user)
+            topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
             await db.commit()
-            await db.refresh(user)
 
             try:
                 from app.services.referral_service import process_referral_topup
@@ -1250,16 +1337,25 @@ class PaymentService:
             except Exception as referral_error:
                 logger.error("Ошибка обработки реферального пополнения Pal24: %s", referral_error)
 
+            if was_first_topup and not user.has_made_first_topup:
+                user.has_made_first_topup = True
+                await db.commit()
+
+            await db.refresh(user)
+
             if self.bot:
                 try:
                     from app.services.admin_notification_service import AdminNotificationService
 
                     notification_service = AdminNotificationService(self.bot)
                     await notification_service.send_balance_topup_notification(
-                        db,
                         user,
                         transaction,
                         old_balance,
+                        topup_status=topup_status,
+                        referrer_info=referrer_info,
+                        subscription=subscription,
+                        promo_group=promo_group,
                     )
                 except Exception as notify_error:
                     logger.error("Ошибка отправки админ уведомления Pal24: %s", notify_error)
@@ -1494,25 +1590,42 @@ class PaymentService:
                 user = await get_user_by_id(db, updated_payment.user_id)
                 if user:
                     old_balance = user.balance_kopeks
-                    
+                    was_first_topup = not user.has_made_first_topup
+
                     user.balance_kopeks += amount_kopeks
                     user.updated_at = datetime.utcnow()
-                    
+
+                    promo_group = getattr(user, "promo_group", None)
+                    subscription = getattr(user, "subscription", None)
+                    referrer_info = format_referrer_info(user)
+                    topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
                     await db.commit()
-                    await db.refresh(user)
-                    
+
                     try:
                         from app.services.referral_service import process_referral_topup
                         await process_referral_topup(db, user.id, amount_kopeks, self.bot)
                     except Exception as e:
                         logger.error(f"Ошибка обработки реферального пополнения CryptoBot: {e}")
-                    
+
+                    if was_first_topup and not user.has_made_first_topup:
+                        user.has_made_first_topup = True
+                        await db.commit()
+
+                    await db.refresh(user)
+
                     if self.bot:
                         try:
                             from app.services.admin_notification_service import AdminNotificationService
                             notification_service = AdminNotificationService(self.bot)
                             await notification_service.send_balance_topup_notification(
-                                db, user, transaction, old_balance
+                                user,
+                                transaction,
+                                old_balance,
+                                topup_status=topup_status,
+                                referrer_info=referrer_info,
+                                subscription=subscription,
+                                promo_group=promo_group,
                             )
                         except Exception as e:
                             logger.error(f"Ошибка отправки уведомления о пополнении CryptoBot: {e}")

app/services/remnawave_service.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import re
-from contextlib import asynccontextmanager
+from contextlib import AsyncExitStack, asynccontextmanager
 from datetime import datetime, timedelta
 from typing import Any, Dict, List, Optional
 
@@ -12,7 +12,8 @@ from app.external.remnawave_api import (
     RemnaWaveAPI, RemnaWaveUser, RemnaWaveInternalSquad,
     RemnaWaveNode, UserStatus, TrafficLimitStrategy, RemnaWaveAPIError
 )
-from sqlalchemy import delete
+from sqlalchemy import and_, cast, delete, func, select, update, String
+from sqlalchemy.orm import selectinload
 from sqlalchemy.ext.asyncio import AsyncSession
 from app.database.crud.user import get_users_list, get_user_by_telegram_id, update_user
 from app.database.crud.subscription import (
@@ -20,9 +21,16 @@ from app.database.crud.subscription import (
     update_subscription_usage,
     decrement_subscription_server_counts,
 )
+from app.database.crud.server_squad import get_server_squad_by_uuid
 from app.database.models import (
-    User, SubscriptionServer, Transaction, ReferralEarning, 
-    PromoCodeUse, SubscriptionStatus
+    User,
+    Subscription,
+    SubscriptionServer,
+    Transaction,
+    ReferralEarning,
+    PromoCodeUse,
+    SubscriptionStatus,
+    ServerSquad,
 )
 
 logger = logging.getLogger(__name__)
@@ -481,16 +489,237 @@ class RemnaWaveService:
         try:
             async with self.get_api_client() as api:
                 result = await api.delete_internal_squad(uuid)
-                
+
                 if result:
                     logger.info(f"✅ Удален сквад {uuid}")
-                
+
                 return result
-                
+
         except Exception as e:
             logger.error(f"Ошибка удаления сквада {uuid}: {e}")
             return False
-    
+
+    async def migrate_squad_users(
+        self,
+        db: AsyncSession,
+        source_uuid: str,
+        target_uuid: str,
+    ) -> Dict[str, Any]:
+        """Переносит активных подписок с одного сквада на другой."""
+
+        if source_uuid == target_uuid:
+            return {
+                "success": False,
+                "error": "same_squad",
+                "message": "Источник и назначение совпадают",
+            }
+
+        source_uuid = source_uuid.strip()
+        target_uuid = target_uuid.strip()
+
+        source_server = await get_server_squad_by_uuid(db, source_uuid)
+        target_server = await get_server_squad_by_uuid(db, target_uuid)
+
+        if not source_server or not target_server:
+            return {
+                "success": False,
+                "error": "not_found",
+                "message": "Сквады не найдены",
+            }
+
+        subscription_query = (
+            select(Subscription)
+            .options(selectinload(Subscription.user))
+            .where(
+                Subscription.status.in_(
+                    [
+                        SubscriptionStatus.ACTIVE.value,
+                        SubscriptionStatus.TRIAL.value,
+                    ]
+                ),
+                cast(Subscription.connected_squads, String).like(
+                    f'%"{source_uuid}"%'
+                ),
+            )
+        )
+
+        result = await db.execute(subscription_query)
+        subscriptions = result.scalars().unique().all()
+
+        total_candidates = len(subscriptions)
+        if not subscriptions:
+            logger.info(
+                "🚚 Переезд сквада %s → %s: подходящих подписок не найдено",
+                source_uuid,
+                target_uuid,
+            )
+            return {
+                "success": True,
+                "total": 0,
+                "updated": 0,
+                "panel_updated": 0,
+                "panel_failed": 0,
+            }
+
+        exit_stack = AsyncExitStack()
+        panel_updated = 0
+        panel_failed = 0
+        updated_subscriptions = 0
+        source_decrement = 0
+        target_increment = 0
+
+        try:
+            needs_panel_update = any(
+                subscription.user and subscription.user.remnawave_uuid
+                for subscription in subscriptions
+            )
+
+            api = None
+            if needs_panel_update:
+                api = await exit_stack.enter_async_context(self.get_api_client())
+
+            for subscription in subscriptions:
+                current_squads = list(subscription.connected_squads or [])
+                if source_uuid not in current_squads:
+                    continue
+
+                had_target_before = target_uuid in current_squads
+                new_squads = [
+                    squad_uuid for squad_uuid in current_squads if squad_uuid != source_uuid
+                ]
+                if not had_target_before:
+                    new_squads.append(target_uuid)
+
+                if subscription.user and subscription.user.remnawave_uuid:
+                    if api is None:
+                        panel_failed += 1
+                        logger.error(
+                            "❌ RemnaWave API недоступен для обновления пользователя %s",
+                            subscription.user.telegram_id,
+                        )
+                        continue
+
+                    try:
+                        await api.update_user(
+                            uuid=subscription.user.remnawave_uuid,
+                            active_internal_squads=new_squads,
+                        )
+                        panel_updated += 1
+                    except Exception as error:
+                        panel_failed += 1
+                        logger.error(
+                            "❌ Ошибка обновления сквадов пользователя %s: %s",
+                            subscription.user.telegram_id,
+                            error,
+                        )
+                        continue
+
+                subscription.connected_squads = new_squads
+                subscription.updated_at = datetime.utcnow()
+
+                source_decrement += 1
+                if not had_target_before:
+                    target_increment += 1
+
+                updated_subscriptions += 1
+
+                link_result = await db.execute(
+                    select(SubscriptionServer)
+                    .where(
+                        and_(
+                            SubscriptionServer.subscription_id == subscription.id,
+                            SubscriptionServer.server_squad_id == source_server.id,
+                        )
+                    )
+                    .limit(1)
+                )
+                link = link_result.scalars().first()
+
+                if link:
+                    if had_target_before:
+                        await db.execute(
+                            delete(SubscriptionServer).where(
+                                and_(
+                                    SubscriptionServer.subscription_id
+                                    == subscription.id,
+                                    SubscriptionServer.server_squad_id
+                                    == source_server.id,
+                                )
+                            )
+                        )
+                    else:
+                        link.server_squad_id = target_server.id
+                elif not had_target_before:
+                    db.add(
+                        SubscriptionServer(
+                            subscription_id=subscription.id,
+                            server_squad_id=target_server.id,
+                            paid_price_kopeks=0,
+                        )
+                    )
+
+            if updated_subscriptions:
+                if source_decrement:
+                    await db.execute(
+                        update(ServerSquad)
+                        .where(ServerSquad.id == source_server.id)
+                        .values(
+                            current_users=func.greatest(
+                                ServerSquad.current_users - source_decrement,
+                                0,
+                            )
+                        )
+                    )
+                if target_increment:
+                    await db.execute(
+                        update(ServerSquad)
+                        .where(ServerSquad.id == target_server.id)
+                        .values(
+                            current_users=ServerSquad.current_users + target_increment
+                        )
+                    )
+
+                await db.commit()
+            else:
+                await db.rollback()
+
+            logger.info(
+                "🚚 Завершен переезд сквада %s → %s: обновлено %s подписок (%s не обновлены в панели)",
+                source_uuid,
+                target_uuid,
+                updated_subscriptions,
+                panel_failed,
+            )
+
+            return {
+                "success": True,
+                "total": total_candidates,
+                "updated": updated_subscriptions,
+                "panel_updated": panel_updated,
+                "panel_failed": panel_failed,
+                "source_removed": source_decrement,
+                "target_added": target_increment,
+            }
+
+        except RemnaWaveConfigurationError:
+            await db.rollback()
+            raise
+        except Exception as error:
+            await db.rollback()
+            logger.error(
+                "❌ Ошибка переезда сквада %s → %s: %s",
+                source_uuid,
+                target_uuid,
+                error,
+            )
+            return {
+                "success": False,
+                "error": "unexpected",
+                "message": str(error),
+            }
+        finally:
+            await exit_stack.aclose()
+
     async def sync_users_from_panel(self, db: AsyncSession, sync_type: str = "all") -> Dict[str, int]:
         try:
             stats = {"created": 0, "updated": 0, "errors": 0, "deleted": 0}

app/services/system_settings_service.py

@@ -112,6 +112,7 @@ class BotConfigurationService:
         "WEBHOOK": "🌐 Webhook",
         "LOG": "📝 Логирование",
         "DEBUG": "🧪 Режим разработки",
+        "MODERATION": "🛡️ Модерация и фильтры",
     }
 
     CATEGORY_DESCRIPTIONS: Dict[str, str] = {
@@ -160,6 +161,7 @@ class BotConfigurationService:
         "WEBHOOK": "Пути и секреты вебхуков.",
         "LOG": "Уровни логирования и ротация.",
         "DEBUG": "Отладочные функции и безопасный режим.",
+        "MODERATION": "Настройки фильтров отображаемых имен и защиты от фишинга.",
     }
 
     CATEGORY_KEY_OVERRIDES: Dict[str, str] = {
@@ -280,6 +282,7 @@ class BotConfigurationService:
         "LOG_": "LOG",
         "WEB_API_": "WEB_API",
         "DEBUG": "DEBUG",
+        "DISPLAY_NAME_": "MODERATION",
     }
 
     CHOICES: Dict[str, List[ChoiceOption]] = {
@@ -398,6 +401,13 @@ class BotConfigurationService:
             "warning": "Не забудьте отключить после завершения работ, иначе бот останется недоступен.",
             "dependencies": "MAINTENANCE_MESSAGE, MAINTENANCE_CHECK_INTERVAL",
         },
+        "DISPLAY_NAME_BANNED_KEYWORDS": {
+            "description": "Список слов и фрагментов, при наличии которых в отображаемом имени пользователь будет заблокирован.",
+            "format": "Перечислите ключевые слова через запятую или с новой строки.",
+            "example": "support, security, служебн",
+            "warning": "Слишком агрессивные фильтры могут блокировать добросовестных пользователей.",
+            "dependencies": "Фильтр отображаемых имен",
+        },
         "REMNAWAVE_API_URL": {
             "description": "Базовый адрес панели RemnaWave, с которой синхронизируется бот.",
             "format": "Полный URL вида https://panel.example.com.",

app/services/tribute_service.py

@@ -11,9 +11,10 @@ from app.database.models import Transaction, TransactionType, PaymentMethod
 from app.database.crud.transaction import (
     create_transaction, get_transaction_by_external_id, complete_transaction
 )
-from app.database.crud.user import get_user_by_telegram_id, add_user_balance
+from app.database.crud.user import get_user_by_telegram_id
 from app.external.tribute import TributeService as TributeAPI
 from app.services.payment_service import PaymentService
+from app.utils.user_utils import format_referrer_info
 
 logger = logging.getLogger(__name__)
 
@@ -120,32 +121,52 @@ class TributeService:
                     amount_kopeks=amount_kopeks,
                     description=f"Пополнение через Tribute: {amount_kopeks/100}₽ (ID: {payment_id})"
                 )
-                
+
                 old_balance = user.balance_kopeks
+                was_first_topup = not user.has_made_first_topup
+
                 user.balance_kopeks += amount_kopeks
                 user.updated_at = datetime.utcnow()
-                
+
+                promo_group = getattr(user, "promo_group", None)
+                subscription = getattr(user, "subscription", None)
+                referrer_info = format_referrer_info(user)
+                topup_status = "🆕 Первое пополнение" if was_first_topup else "🔄 Пополнение"
+
                 await session.commit()
-                
-                logger.info(f"✅ Баланс пользователя {user_telegram_id} обновлен: {old_balance} -> {user.balance_kopeks} коп (+{amount_kopeks})")
-                logger.info(f"✅ Создана транзакция ID: {transaction.id}")
-                
+
                 try:
                     from app.services.referral_service import process_referral_topup
                     await process_referral_topup(session, user.id, amount_kopeks, self.bot)
                 except Exception as e:
                     logger.error(f"Ошибка обработки реферального пополнения Tribute: {e}")
-                    
-                if not user.has_made_first_topup:
+
+                if was_first_topup and not user.has_made_first_topup:
                     user.has_made_first_topup = True
+                    await session.commit()
+
+                await session.refresh(user)
+
+                logger.info(
+                    f"✅ Баланс пользователя {user_telegram_id} обновлен: {old_balance} -> {user.balance_kopeks} коп (+{amount_kopeks})"
+                )
+                logger.info(f"✅ Создана транзакция ID: {transaction.id}")
+
+                if was_first_topup:
                     logger.info(f"Отмечен первый топап для пользователя {user_telegram_id}")
-                
-                
+
+
                 try:
                     from app.services.admin_notification_service import AdminNotificationService
                     notification_service = AdminNotificationService(self.bot)
                     await notification_service.send_balance_topup_notification(
-                        session, user, transaction, old_balance
+                        user,
+                        transaction,
+                        old_balance,
+                        topup_status=topup_status,
+                        referrer_info=referrer_info,
+                        subscription=subscription,
+                        promo_group=promo_group,
                     )
                 except Exception as e:
                     logger.error(f"Ошибка отправки уведомления о Tribute пополнении: {e}")

app/states.py

@@ -166,6 +166,13 @@ class SquadCreateStates(StatesGroup):
 class SquadRenameStates(StatesGroup):
     waiting_for_new_name = State()
 
+
+class SquadMigrationStates(StatesGroup):
+    selecting_source = State()
+    selecting_target = State()
+    confirming = State()
+
+
 class AdminSubmenuStates(StatesGroup):
     in_users_submenu = State()
     in_promo_submenu = State()

app/utils/user_utils.py

@@ -12,6 +12,25 @@ from app.database.models import User, ReferralEarning, Transaction, TransactionT
 logger = logging.getLogger(__name__)
 
 
+def format_referrer_info(user: User) -> str:
+    """Return formatted referrer info for admin notifications."""
+
+    referred_by_id = getattr(user, "referred_by_id", None)
+
+    if not referred_by_id:
+        return "Нет"
+
+    referrer = getattr(user, "referrer", None)
+
+    if not referrer:
+        return f"ID {referred_by_id} (не найден)"
+
+    if referrer.username:
+        return f"@{referrer.username} (ID: {referred_by_id})"
+
+    return f"ID {referrer.telegram_id}"
+
+
 async def generate_unique_referral_code(db: AsyncSession, telegram_id: int) -> str:
     max_attempts = 10
     

app/webapi/routes/remnawave.py

@@ -6,6 +6,11 @@ from typing import Any, Dict, List, Optional, TYPE_CHECKING
 from fastapi import APIRouter, Depends, HTTPException, Query, Security, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.database.crud.server_squad import (
+    count_active_users_for_squad,
+    get_server_squad_by_uuid,
+)
+
 from ..dependencies import get_db_session, require_api_token
 from ..schemas.remnawave import (
     RemnaWaveConnectionStatus,
@@ -22,6 +27,10 @@ from ..schemas.remnawave import (
     RemnaWaveSquadActionRequest,
     RemnaWaveSquadCreateRequest,
     RemnaWaveSquadListResponse,
+    RemnaWaveSquadMigrationPreviewResponse,
+    RemnaWaveSquadMigrationRequest,
+    RemnaWaveSquadMigrationResponse,
+    RemnaWaveSquadMigrationStats,
     RemnaWaveSquadUpdateRequest,
     RemnaWaveStatusResponse,
     RemnaWaveSystemStatsResponse,
@@ -372,6 +381,30 @@ async def get_user_traffic(
     return RemnaWaveUserTrafficResponse(telegram_id=telegram_id, **stats)
 
 
+@router.get("/squads/{squad_uuid}/migration-preview", response_model=RemnaWaveSquadMigrationPreviewResponse)
+async def preview_squad_migration(
+    squad_uuid: str,
+    _: Any = Security(require_api_token),
+    db: AsyncSession = Depends(get_db_session),
+) -> RemnaWaveSquadMigrationPreviewResponse:
+    service = _get_service()
+    _ensure_service_configured(service)
+
+    squad = await get_server_squad_by_uuid(db, squad_uuid)
+    if not squad:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, "Сквад не найден")
+
+    users_to_migrate = await count_active_users_for_squad(db, squad_uuid)
+
+    return RemnaWaveSquadMigrationPreviewResponse(
+        squad_uuid=squad.squad_uuid,
+        squad_name=squad.display_name,
+        current_users=squad.current_users or 0,
+        max_users=squad.max_users,
+        users_to_migrate=users_to_migrate,
+    )
+
+
 @router.post("/sync/from-panel", response_model=RemnaWaveGenericSyncResponse)
 async def sync_from_panel(
     payload: RemnaWaveSyncFromPanelRequest,
@@ -454,3 +487,58 @@ async def get_sync_recommendations(
     data = await service.get_sync_recommendations(db)
     detail = "Рекомендации получены"
     return RemnaWaveGenericSyncResponse(success=True, detail=detail, data=data)
+
+
+@router.post("/squads/migrate", response_model=RemnaWaveSquadMigrationResponse)
+async def migrate_squad(
+    payload: RemnaWaveSquadMigrationRequest,
+    _: Any = Security(require_api_token),
+    db: AsyncSession = Depends(get_db_session),
+) -> RemnaWaveSquadMigrationResponse:
+    service = _get_service()
+    _ensure_service_configured(service)
+
+    source_uuid = payload.source_uuid.strip()
+    target_uuid = payload.target_uuid.strip()
+
+    if source_uuid == target_uuid:
+        raise HTTPException(status.HTTP_400_BAD_REQUEST, "Источник и назначение совпадают")
+
+    source = await get_server_squad_by_uuid(db, source_uuid)
+    if not source:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, "Сквад-источник не найден")
+
+    target = await get_server_squad_by_uuid(db, target_uuid)
+    if not target:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, "Сквад-назначение не найден")
+
+    try:
+        result = await service.migrate_squad_users(
+            db,
+            source_uuid=source.squad_uuid,
+            target_uuid=target.squad_uuid,
+        )
+    except RemnaWaveConfigurationError as exc:  # pragma: no cover - зависит от окружения
+        raise HTTPException(status.HTTP_503_SERVICE_UNAVAILABLE, str(exc)) from exc
+
+    if not result.get("success"):
+        detail = result.get("message") or "Не удалось выполнить переезд"
+        return RemnaWaveSquadMigrationResponse(
+            success=False,
+            detail=detail,
+            error=result.get("error"),
+        )
+
+    stats = RemnaWaveSquadMigrationStats(
+        source_uuid=source.squad_uuid,
+        target_uuid=target.squad_uuid,
+        total=result.get("total", 0),
+        updated=result.get("updated", 0),
+        panel_updated=result.get("panel_updated", 0),
+        panel_failed=result.get("panel_failed", 0),
+        source_removed=result.get("source_removed", 0),
+        target_added=result.get("target_added", 0),
+    )
+
+    detail = result.get("message") or "Переезд выполнен"
+    return RemnaWaveSquadMigrationResponse(success=True, detail=detail, data=stats)

app/webapi/schemas/miniapp.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import datetime
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict, model_validator
 
 
 class MiniAppBranding(BaseModel):
@@ -34,11 +34,34 @@ class MiniAppSubscriptionUser(BaseModel):
     traffic_limit_label: str
     lifetime_used_traffic_gb: float = 0.0
     has_active_subscription: bool = False
+    promo_offer_discount_percent: int = 0
+    promo_offer_discount_expires_at: Optional[datetime] = None
+    promo_offer_discount_source: Optional[str] = None
 
 
 class MiniAppPromoGroup(BaseModel):
     id: int
     name: str
+    server_discount_percent: int = 0
+    traffic_discount_percent: int = 0
+    device_discount_percent: int = 0
+    period_discounts: Dict[int, int] = Field(default_factory=dict)
+    apply_discounts_to_addons: bool = True
+
+
+class MiniAppAutoPromoGroupLevel(BaseModel):
+    id: int
+    name: str
+    threshold_kopeks: int
+    threshold_rubles: float
+    threshold_label: str
+    is_reached: bool = False
+    is_current: bool = False
+    server_discount_percent: int = 0
+    traffic_discount_percent: int = 0
+    device_discount_percent: int = 0
+    period_discounts: Dict[int, int] = Field(default_factory=dict)
+    apply_discounts_to_addons: bool = True
 
 
 class MiniAppConnectedServer(BaseModel):
@@ -47,6 +70,7 @@ class MiniAppConnectedServer(BaseModel):
 
 
 class MiniAppDevice(BaseModel):
+    hwid: Optional[str] = None
     platform: Optional[str] = None
     device_model: Optional[str] = None
     app_version: Optional[str] = None
@@ -54,6 +78,16 @@ class MiniAppDevice(BaseModel):
     last_ip: Optional[str] = None
 
 
+class MiniAppDeviceRemovalRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    hwid: str
+
+
+class MiniAppDeviceRemovalResponse(BaseModel):
+    success: bool = True
+    message: Optional[str] = None
+
+
 class MiniAppTransaction(BaseModel):
     id: int
     type: str
@@ -67,9 +101,329 @@ class MiniAppTransaction(BaseModel):
     completed_at: Optional[datetime] = None
 
 
+class MiniAppPromoOffer(BaseModel):
+    id: int
+    status: str
+    notification_type: Optional[str] = None
+    offer_type: Optional[str] = None
+    effect_type: Optional[str] = None
+    discount_percent: int = 0
+    bonus_amount_kopeks: int = 0
+    bonus_amount_label: Optional[str] = None
+    expires_at: Optional[datetime] = None
+    claimed_at: Optional[datetime] = None
+    is_active: bool = False
+    template_id: Optional[int] = None
+    template_name: Optional[str] = None
+    button_text: Optional[str] = None
+    title: Optional[str] = None
+    message_text: Optional[str] = None
+    icon: Optional[str] = None
+    test_squads: List[MiniAppConnectedServer] = Field(default_factory=list)
+    active_discount_expires_at: Optional[datetime] = None
+    active_discount_started_at: Optional[datetime] = None
+    active_discount_duration_seconds: Optional[int] = None
+
+
+class MiniAppPromoOfferClaimRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+
+
+class MiniAppPromoOfferClaimResponse(BaseModel):
+    success: bool = True
+    code: Optional[str] = None
+
+
+class MiniAppSubscriptionAutopay(BaseModel):
+    enabled: bool = False
+    autopay_enabled: Optional[bool] = None
+    autopay_enabled_at: Optional[datetime] = None
+    days_before: Optional[int] = None
+    autopay_days_before: Optional[int] = None
+    default_days_before: Optional[int] = None
+    autopay_days_options: List[int] = Field(default_factory=list)
+    days_options: List[int] = Field(default_factory=list)
+    options: List[int] = Field(default_factory=list)
+
+    model_config = ConfigDict(extra="allow")
+
+
+class MiniAppSubscriptionRenewalPeriod(BaseModel):
+    id: str
+    days: Optional[int] = None
+    months: Optional[int] = None
+    price_kopeks: Optional[int] = Field(default=None, alias="priceKopeks")
+    price_label: Optional[str] = Field(default=None, alias="priceLabel")
+    original_price_kopeks: Optional[int] = Field(default=None, alias="originalPriceKopeks")
+    original_price_label: Optional[str] = Field(default=None, alias="originalPriceLabel")
+    discount_percent: int = Field(default=0, alias="discountPercent")
+    price_per_month_kopeks: Optional[int] = Field(default=None, alias="pricePerMonthKopeks")
+    price_per_month_label: Optional[str] = Field(default=None, alias="pricePerMonthLabel")
+    is_recommended: bool = Field(default=False, alias="isRecommended")
+    description: Optional[str] = None
+    badge: Optional[str] = None
+    title: Optional[str] = None
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionRenewalOptionsRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionRenewalOptionsResponse(BaseModel):
+    success: bool = True
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    currency: str
+    balance_kopeks: Optional[int] = Field(default=None, alias="balanceKopeks")
+    balance_label: Optional[str] = Field(default=None, alias="balanceLabel")
+    promo_group: Optional[MiniAppPromoGroup] = Field(default=None, alias="promoGroup")
+    promo_offer: Optional[Dict[str, Any]] = Field(default=None, alias="promoOffer")
+    periods: List[MiniAppSubscriptionRenewalPeriod] = Field(default_factory=list)
+    default_period_id: Optional[str] = Field(default=None, alias="defaultPeriodId")
+    missing_amount_kopeks: Optional[int] = Field(default=None, alias="missingAmountKopeks")
+    status_message: Optional[str] = Field(default=None, alias="statusMessage")
+    autopay_enabled: bool = False
+    autopay_days_before: Optional[int] = None
+    autopay_days_options: List[int] = Field(default_factory=list)
+    autopay: Optional[MiniAppSubscriptionAutopay] = None
+    autopay_settings: Optional[MiniAppSubscriptionAutopay] = None
+
+    model_config = ConfigDict(populate_by_name=True, extra="allow")
+
+
+class MiniAppSubscriptionRenewalRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    period_id: Optional[str] = Field(default=None, alias="periodId")
+    period_days: Optional[int] = Field(default=None, alias="periodDays")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionRenewalResponse(BaseModel):
+    success: bool = True
+    message: Optional[str] = None
+    balance_kopeks: Optional[int] = Field(default=None, alias="balanceKopeks")
+    balance_label: Optional[str] = Field(default=None, alias="balanceLabel")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    renewed_until: Optional[datetime] = Field(default=None, alias="renewedUntil")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionAutopayRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    enabled: Optional[bool] = None
+    days_before: Optional[int] = Field(default=None, alias="daysBefore")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionAutopayResponse(BaseModel):
+    success: bool = True
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    autopay_enabled: bool = False
+    autopay_days_before: Optional[int] = None
+    autopay_days_options: List[int] = Field(default_factory=list)
+    autopay: Optional[MiniAppSubscriptionAutopay] = None
+    autopay_settings: Optional[MiniAppSubscriptionAutopay] = None
+
+    model_config = ConfigDict(populate_by_name=True, extra="allow")
+
+
+class MiniAppPromoCode(BaseModel):
+    code: str
+    type: Optional[str] = None
+    balance_bonus_kopeks: int = 0
+    subscription_days: int = 0
+    max_uses: Optional[int] = None
+    current_uses: Optional[int] = None
+    valid_until: Optional[datetime] = None
+
+
+class MiniAppPromoCodeActivationRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    code: str
+
+
+class MiniAppPromoCodeActivationResponse(BaseModel):
+    success: bool = True
+    description: Optional[str] = None
+    promocode: Optional[MiniAppPromoCode] = None
+
+
+class MiniAppFaqItem(BaseModel):
+    id: int
+    title: Optional[str] = None
+    content: Optional[str] = None
+    display_order: Optional[int] = None
+
+
+class MiniAppFaq(BaseModel):
+    requested_language: str
+    language: str
+    is_enabled: bool = True
+    total: int = 0
+    items: List[MiniAppFaqItem] = Field(default_factory=list)
+
+
+class MiniAppRichTextDocument(BaseModel):
+    requested_language: str
+    language: str
+    title: Optional[str] = None
+    is_enabled: bool = True
+    content: str = ""
+    created_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
+
+
+class MiniAppLegalDocuments(BaseModel):
+    public_offer: Optional[MiniAppRichTextDocument] = None
+    service_rules: Optional[MiniAppRichTextDocument] = None
+    privacy_policy: Optional[MiniAppRichTextDocument] = None
+
+
+class MiniAppReferralTerms(BaseModel):
+    minimum_topup_kopeks: int = 0
+    minimum_topup_label: Optional[str] = None
+    first_topup_bonus_kopeks: int = 0
+    first_topup_bonus_label: Optional[str] = None
+    inviter_bonus_kopeks: int = 0
+    inviter_bonus_label: Optional[str] = None
+    commission_percent: float = 0.0
+    referred_user_reward_kopeks: int = 0
+    referred_user_reward_label: Optional[str] = None
+
+
+class MiniAppReferralStats(BaseModel):
+    invited_count: int = 0
+    paid_referrals_count: int = 0
+    active_referrals_count: int = 0
+    total_earned_kopeks: int = 0
+    total_earned_label: Optional[str] = None
+    month_earned_kopeks: int = 0
+    month_earned_label: Optional[str] = None
+    conversion_rate: float = 0.0
+
+
+class MiniAppReferralRecentEarning(BaseModel):
+    amount_kopeks: int = 0
+    amount_label: Optional[str] = None
+    reason: Optional[str] = None
+    referral_name: Optional[str] = None
+    created_at: Optional[datetime] = None
+
+
+class MiniAppReferralItem(BaseModel):
+    id: int
+    telegram_id: Optional[int] = None
+    full_name: Optional[str] = None
+    username: Optional[str] = None
+    created_at: Optional[datetime] = None
+    last_activity: Optional[datetime] = None
+    has_made_first_topup: bool = False
+    balance_kopeks: int = 0
+    balance_label: Optional[str] = None
+    total_earned_kopeks: int = 0
+    total_earned_label: Optional[str] = None
+    topups_count: int = 0
+    days_since_registration: Optional[int] = None
+    days_since_activity: Optional[int] = None
+    status: Optional[str] = None
+
+
+class MiniAppReferralList(BaseModel):
+    total_count: int = 0
+    has_next: bool = False
+    has_prev: bool = False
+    current_page: int = 1
+    total_pages: int = 1
+    items: List[MiniAppReferralItem] = Field(default_factory=list)
+
+
+class MiniAppReferralInfo(BaseModel):
+    referral_code: Optional[str] = None
+    referral_link: Optional[str] = None
+    terms: Optional[MiniAppReferralTerms] = None
+    stats: Optional[MiniAppReferralStats] = None
+    recent_earnings: List[MiniAppReferralRecentEarning] = Field(default_factory=list)
+    referrals: Optional[MiniAppReferralList] = None
+
+
+class MiniAppPaymentMethodsRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+
+
+class MiniAppPaymentMethod(BaseModel):
+    id: str
+    icon: Optional[str] = None
+    requires_amount: bool = False
+    currency: str = "RUB"
+    min_amount_kopeks: Optional[int] = None
+    max_amount_kopeks: Optional[int] = None
+    amount_step_kopeks: Optional[int] = None
+
+
+class MiniAppPaymentMethodsResponse(BaseModel):
+    methods: List[MiniAppPaymentMethod] = Field(default_factory=list)
+
+
+class MiniAppPaymentCreateRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    method: str
+    amount_rubles: Optional[float] = Field(default=None, alias="amountRubles")
+    amount_kopeks: Optional[int] = Field(default=None, alias="amountKopeks")
+    payment_option: Optional[str] = Field(default=None, alias="option")
+
+
+class MiniAppPaymentCreateResponse(BaseModel):
+    success: bool = True
+    method: str
+    payment_url: Optional[str] = None
+    amount_kopeks: Optional[int] = None
+    extra: Dict[str, Any] = Field(default_factory=dict)
+
+
+class MiniAppPaymentStatusQuery(BaseModel):
+    method: str
+    local_payment_id: Optional[int] = Field(default=None, alias="localPaymentId")
+    invoice_id: Optional[str] = Field(default=None, alias="invoiceId")
+    payment_id: Optional[str] = Field(default=None, alias="paymentId")
+    payload: Optional[str] = None
+    amount_kopeks: Optional[int] = Field(default=None, alias="amountKopeks")
+    started_at: Optional[str] = Field(default=None, alias="startedAt")
+
+
+class MiniAppPaymentStatusRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    payments: List[MiniAppPaymentStatusQuery] = Field(default_factory=list)
+
+
+class MiniAppPaymentStatusResult(BaseModel):
+    method: str
+    status: str
+    is_paid: bool = False
+    amount_kopeks: Optional[int] = None
+    currency: Optional[str] = None
+    completed_at: Optional[datetime] = None
+    transaction_id: Optional[int] = None
+    external_id: Optional[str] = None
+    message: Optional[str] = None
+    extra: Dict[str, Any] = Field(default_factory=dict)
+
+
+class MiniAppPaymentStatusResponse(BaseModel):
+    results: List[MiniAppPaymentStatusResult] = Field(default_factory=list)
+
+
 class MiniAppSubscriptionResponse(BaseModel):
     success: bool = True
-    subscription_id: int
+    subscription_id: Optional[int] = None
     remnawave_short_uuid: Optional[str] = None
     user: MiniAppSubscriptionUser
     subscription_url: Optional[str] = None
@@ -89,8 +443,298 @@ class MiniAppSubscriptionResponse(BaseModel):
     balance_rubles: float = 0.0
     balance_currency: Optional[str] = None
     transactions: List[MiniAppTransaction] = Field(default_factory=list)
+    promo_offers: List[MiniAppPromoOffer] = Field(default_factory=list)
     promo_group: Optional[MiniAppPromoGroup] = None
+    auto_assign_promo_groups: List[MiniAppAutoPromoGroupLevel] = Field(default_factory=list)
+    total_spent_kopeks: int = 0
+    total_spent_rubles: float = 0.0
+    total_spent_label: Optional[str] = None
     subscription_type: str
     autopay_enabled: bool = False
+    autopay_days_before: Optional[int] = None
+    autopay_days_options: List[int] = Field(default_factory=list)
+    autopay: Optional[MiniAppSubscriptionAutopay] = None
+    autopay_settings: Optional[MiniAppSubscriptionAutopay] = None
     branding: Optional[MiniAppBranding] = None
+    faq: Optional[MiniAppFaq] = None
+    legal_documents: Optional[MiniAppLegalDocuments] = None
+    referral: Optional[MiniAppReferralInfo] = None
+    subscription_missing: bool = False
+    subscription_missing_reason: Optional[str] = None
+    trial_available: bool = False
+    trial_duration_days: Optional[int] = None
+    trial_status: Optional[str] = None
+
+    model_config = ConfigDict(extra="allow")
+
+
+class MiniAppSubscriptionServerOption(BaseModel):
+    uuid: str
+    name: Optional[str] = None
+    price_kopeks: Optional[int] = None
+    price_label: Optional[str] = None
+    discount_percent: Optional[int] = None
+    is_connected: bool = False
+    is_available: bool = True
+    disabled_reason: Optional[str] = None
+
+
+class MiniAppSubscriptionTrafficOption(BaseModel):
+    value: Optional[int] = None
+    label: Optional[str] = None
+    price_kopeks: Optional[int] = None
+    price_label: Optional[str] = None
+    is_current: bool = False
+    is_available: bool = True
+    description: Optional[str] = None
+
+
+class MiniAppSubscriptionDeviceOption(BaseModel):
+    value: int
+    label: Optional[str] = None
+    price_kopeks: Optional[int] = None
+    price_label: Optional[str] = None
+
+
+class MiniAppSubscriptionCurrentSettings(BaseModel):
+    servers: List[MiniAppConnectedServer] = Field(default_factory=list)
+    traffic_limit_gb: Optional[int] = None
+    traffic_limit_label: Optional[str] = None
+    device_limit: int = 0
+
+
+class MiniAppSubscriptionServersSettings(BaseModel):
+    available: List[MiniAppSubscriptionServerOption] = Field(default_factory=list)
+    min: int = 0
+    max: int = 0
+    can_update: bool = True
+    hint: Optional[str] = None
+
+
+class MiniAppSubscriptionTrafficSettings(BaseModel):
+    options: List[MiniAppSubscriptionTrafficOption] = Field(default_factory=list)
+    can_update: bool = True
+    current_value: Optional[int] = None
+
+
+class MiniAppSubscriptionDevicesSettings(BaseModel):
+    options: List[MiniAppSubscriptionDeviceOption] = Field(default_factory=list)
+    can_update: bool = True
+    min: int = 0
+    max: int = 0
+    step: int = 1
+    current: int = 0
+    price_kopeks: Optional[int] = None
+    price_label: Optional[str] = None
+
+
+class MiniAppSubscriptionBillingContext(BaseModel):
+    months_remaining: int = 1
+    period_hint_days: Optional[int] = None
+    renews_at: Optional[datetime] = None
+
+
+class MiniAppSubscriptionSettings(BaseModel):
+    subscription_id: int
+    currency: str = "RUB"
+    current: MiniAppSubscriptionCurrentSettings
+    servers: MiniAppSubscriptionServersSettings
+    traffic: MiniAppSubscriptionTrafficSettings
+    devices: MiniAppSubscriptionDevicesSettings
+    billing: Optional[MiniAppSubscriptionBillingContext] = None
+
+
+class MiniAppSubscriptionSettingsResponse(BaseModel):
+    success: bool = True
+    settings: MiniAppSubscriptionSettings
+
+
+class MiniAppSubscriptionSettingsRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = None
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _populate_aliases(cls, values: Any) -> Any:
+        if isinstance(values, dict):
+            if "subscriptionId" in values and "subscription_id" not in values:
+                values["subscription_id"] = values["subscriptionId"]
+        return values
+
+
+class MiniAppSubscriptionServersUpdateRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = None
+    servers: Optional[List[str]] = None
+    squads: Optional[List[str]] = None
+    server_uuids: Optional[List[str]] = None
+    squad_uuids: Optional[List[str]] = None
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _populate_aliases(cls, values: Any) -> Any:
+        if isinstance(values, dict):
+            alias_map = {
+                "subscriptionId": "subscription_id",
+                "serverUuids": "server_uuids",
+                "squadUuids": "squad_uuids",
+            }
+            for alias, target in alias_map.items():
+                if alias in values and target not in values:
+                    values[target] = values[alias]
+        return values
+
+
+class MiniAppSubscriptionTrafficUpdateRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = None
+    traffic: Optional[int] = None
+    traffic_gb: Optional[int] = None
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _populate_aliases(cls, values: Any) -> Any:
+        if isinstance(values, dict):
+            alias_map = {
+                "subscriptionId": "subscription_id",
+                "trafficGb": "traffic_gb",
+            }
+            for alias, target in alias_map.items():
+                if alias in values and target not in values:
+                    values[target] = values[alias]
+        return values
+
+
+class MiniAppSubscriptionDevicesUpdateRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = None
+    devices: Optional[int] = None
+    device_limit: Optional[int] = None
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _populate_aliases(cls, values: Any) -> Any:
+        if isinstance(values, dict):
+            alias_map = {
+                "subscriptionId": "subscription_id",
+                "deviceLimit": "device_limit",
+            }
+            for alias, target in alias_map.items():
+                if alias in values and target not in values:
+                    values[target] = values[alias]
+        return values
+
+
+class MiniAppSubscriptionUpdateResponse(BaseModel):
+    success: bool = True
+    message: Optional[str] = None
+
+
+class MiniAppSubscriptionPurchaseOptionsRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionPurchaseOptionsResponse(BaseModel):
+    success: bool = True
+    currency: str
+    balance_kopeks: Optional[int] = Field(default=None, alias="balanceKopeks")
+    balance_label: Optional[str] = Field(default=None, alias="balanceLabel")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    data: Dict[str, Any] = Field(default_factory=dict)
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionPurchasePreviewRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    selection: Optional[Dict[str, Any]] = None
+    period_id: Optional[str] = Field(default=None, alias="periodId")
+    period_days: Optional[int] = Field(default=None, alias="periodDays")
+    period: Optional[str] = None
+    traffic_value: Optional[int] = Field(default=None, alias="trafficValue")
+    traffic: Optional[int] = None
+    traffic_gb: Optional[int] = Field(default=None, alias="trafficGb")
+    servers: Optional[List[str]] = None
+    countries: Optional[List[str]] = None
+    server_uuids: Optional[List[str]] = Field(default=None, alias="serverUuids")
+    devices: Optional[int] = None
+    device_limit: Optional[int] = Field(default=None, alias="deviceLimit")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _merge_selection(cls, values: Any) -> Any:
+        if not isinstance(values, dict):
+            return values
+        selection = values.get("selection")
+        if isinstance(selection, dict):
+            merged = {**selection, **values}
+        else:
+            merged = dict(values)
+        aliases = {
+            "period_id": ("periodId", "period", "code"),
+            "period_days": ("periodDays",),
+            "traffic_value": ("trafficValue", "traffic", "trafficGb"),
+            "servers": ("countries", "server_uuids", "serverUuids"),
+            "devices": ("deviceLimit",),
+        }
+        for target, sources in aliases.items():
+            if merged.get(target) is not None:
+                continue
+            for source in sources:
+                if source in merged and merged[source] is not None:
+                    merged[target] = merged[source]
+                    break
+        return merged
+
+
+class MiniAppSubscriptionPurchasePreviewResponse(BaseModel):
+    success: bool = True
+    preview: Dict[str, Any] = Field(default_factory=dict)
+    balance_kopeks: Optional[int] = Field(default=None, alias="balanceKopeks")
+    balance_label: Optional[str] = Field(default=None, alias="balanceLabel")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionPurchaseRequest(MiniAppSubscriptionPurchasePreviewRequest):
+    pass
+
+
+class MiniAppSubscriptionPurchaseResponse(BaseModel):
+    success: bool = True
+    message: Optional[str] = None
+    balance_kopeks: Optional[int] = Field(default=None, alias="balanceKopeks")
+    balance_label: Optional[str] = Field(default=None, alias="balanceLabel")
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionTrialRequest(BaseModel):
+    init_data: str = Field(..., alias="initData")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class MiniAppSubscriptionTrialResponse(BaseModel):
+    success: bool = True
+    message: Optional[str] = None
+    subscription_id: Optional[int] = Field(default=None, alias="subscriptionId")
+    trial_status: Optional[str] = Field(default=None, alias="trialStatus")
+    trial_duration_days: Optional[int] = Field(default=None, alias="trialDurationDays")
+
+    model_config = ConfigDict(populate_by_name=True)
 

app/webapi/schemas/remnawave.py

@@ -169,3 +169,34 @@ class RemnaWaveGenericSyncResponse(BaseModel):
     success: bool
     detail: Optional[str] = None
     data: Optional[Dict[str, Any]] = None
+
+
+class RemnaWaveSquadMigrationPreviewResponse(BaseModel):
+    squad_uuid: str
+    squad_name: str
+    current_users: int
+    max_users: Optional[int] = None
+    users_to_migrate: int
+
+
+class RemnaWaveSquadMigrationRequest(BaseModel):
+    source_uuid: str
+    target_uuid: str
+
+
+class RemnaWaveSquadMigrationStats(BaseModel):
+    source_uuid: str
+    target_uuid: str
+    total: int = 0
+    updated: int = 0
+    panel_updated: int = 0
+    panel_failed: int = 0
+    source_removed: int = 0
+    target_added: int = 0
+
+
+class RemnaWaveSquadMigrationResponse(BaseModel):
+    success: bool
+    detail: Optional[str] = None
+    error: Optional[str] = None
+    data: Optional[RemnaWaveSquadMigrationStats] = None

locales/en.json

@@ -391,6 +391,19 @@
   "SUBSCRIPTION_NONE": "❌ No active subscription",
   "SUBSCRIPTION_NOT_FOUND": "❌ Subscription not found",
   "SUBSCRIPTION_PURCHASED": "🎉 Subscription purchased successfully!",
+  "MINIAPP_PURCHASE_DISCOUNT_PERIOD": "Period discount: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_TRAFFIC": "Traffic discount: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_SERVERS": "Servers discount: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_DEVICES": "Devices discount: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_PROMO": "Promo offer: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_BREAKDOWN_DISCOUNT_NOTE": "Discount: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_BREAKDOWN_BASE": "Base plan",
+  "MINIAPP_PURCHASE_BREAKDOWN_TRAFFIC": "Traffic",
+  "MINIAPP_PURCHASE_BREAKDOWN_SERVERS": "Servers",
+  "MINIAPP_PURCHASE_BREAKDOWN_DEVICES": "Devices",
+  "MINIAPP_PURCHASE_BREAKDOWN_PROMO": "Promo discount",
+  "MINIAPP_PURCHASE_SUMMARY_DISCOUNT": "You save {amount}",
+  "MINIAPP_PURCHASE_STATUS_INSUFFICIENT": "Not enough funds on balance",
   "SUBSCRIPTION_SUMMARY": "\n📋 <b>Final configuration</b>\n\n📅 <b>Period:</b> {period} days\n📈 <b>Traffic:</b> {traffic}\n🌍 <b>Countries:</b> {countries}\n📱 <b>Devices:</b> {devices}\n\n💰 <b>Total:</b> {total_price}\n\nConfirm the purchase?\n",
   "SUBSCRIPTION_TRIAL": "🧪 Trial subscription",
   "SUPPORT_INFO": "\n🛠️ <b>Technical support</b>\n\nFor any questions contact our support:\n\n👤 {settings.SUPPORT_USERNAME}\n\nWe can help with:\n• Connection setup\n• Troubleshooting issues\n• Payment questions\n• Other requests\n\n⏰ Response time: usually within 1-2 hours\n",
@@ -870,7 +883,42 @@
   "ADMIN_REMNAWAVE_MANAGE_NODES": "🖥️ Manage nodes",
   "ADMIN_REMNAWAVE_SYNC": "🔄 Synchronization",
   "ADMIN_REMNAWAVE_MANAGE_SQUADS": "🌐 Manage squads",
+  "ADMIN_REMNAWAVE_MIGRATION": "🚚 Migration",
   "ADMIN_REMNAWAVE_TRAFFIC": "📈 Traffic",
+  "ADMIN_SQUAD_MIGRATION_TITLE": "🚚 <b>Squad migration</b>",
+  "ADMIN_SQUAD_MIGRATION_SELECT_SOURCE": "Choose the squad you want to migrate from:",
+  "ADMIN_SQUAD_MIGRATION_NO_OPTIONS": "No squads available. Add new ones or cancel the operation.",
+  "ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE": "✅ Available",
+  "ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE": "🚫 Unavailable",
+  "ADMIN_SQUAD_MIGRATION_SERVER_LABEL": "{name} — 👥 {users} ({status})",
+  "ADMIN_SQUAD_MIGRATION_SQUAD_BUTTON": "🌍 {name} — 👥 {users} ({status})",
+  "ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE_SHORT": "✅",
+  "ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE_SHORT": "🚫",
+  "ADMIN_SQUAD_MIGRATION_PAGE": "Page {page}/{pages}",
+  "ADMIN_SQUAD_MIGRATION_SELECTED_SOURCE": "Source: {source}",
+  "ADMIN_SQUAD_MIGRATION_SELECT_TARGET": "Choose the destination squad:",
+  "ADMIN_SQUAD_MIGRATION_TARGET_EMPTY": "No other squads available. Cancel or create new squads.",
+  "ADMIN_SQUAD_MIGRATION_SQUAD_NOT_FOUND": "Squad not found or unavailable.",
+  "ADMIN_SQUAD_MIGRATION_SAME_SQUAD": "You can't choose the same squad.",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_DETAILS": "Review the migration parameters:",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_SOURCE": "• From: {source}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_TARGET": "• To: {target}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_COUNT": "• Users to migrate: {count}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_PROMPT": "Confirm the operation.",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_BUTTON": "✅ Confirm",
+  "ADMIN_SQUAD_MIGRATION_CHANGE_TARGET": "🔄 Change destination",
+  "ADMIN_SQUAD_MIGRATION_IN_PROGRESS": "Starting migration...",
+  "ADMIN_SQUAD_MIGRATION_API_ERROR": "❌ Remnawave API is not configured: {error}",
+  "ADMIN_SQUAD_MIGRATION_ERROR": "❌ Failed to migrate (code: {code}). {details}",
+  "ADMIN_SQUAD_MIGRATION_NEW_BUTTON": "🔁 New migration",
+  "ADMIN_SQUAD_MIGRATION_BACK_BUTTON": "⬅️ Back to Remnawave",
+  "ADMIN_SQUAD_MIGRATION_SUCCESS_TITLE": "✅ Migration completed",
+  "ADMIN_SQUAD_MIGRATION_RESULT_TOTAL": "Subscriptions matched: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_UPDATED": "Migrated: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_UPDATED": "Updated in panel: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_FAILED": "Panel update failed: {count}",
+  "ADMIN_SQUAD_MIGRATION_CANCELLED": "❌ Migration cancelled.",
+  "ADMIN_SQUAD_MIGRATION_PAGE_HINT": "This is the current page.",
   "ADMIN_STATS_USERS": "👥 Users",
   "ADMIN_STATS_SUBSCRIPTIONS": "📱 Subscriptions",
   "ADMIN_STATS_REVENUE": "💰 Revenue",

locales/ru.json

@@ -364,6 +364,19 @@
   "SUBSCRIPTION_NONE": "❌ Нет активной подписки",
   "SUBSCRIPTION_NOT_FOUND": "❌ Подписка не найдена",
   "SUBSCRIPTION_PURCHASED": "🎉 Подписка успешно приобретена!",
+  "MINIAPP_PURCHASE_DISCOUNT_PERIOD": "Скидка на период: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_TRAFFIC": "Скидка на трафик: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_SERVERS": "Скидка на серверы: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_DEVICES": "Скидка на устройства: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_DISCOUNT_PROMO": "Промо-предложение: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_BREAKDOWN_DISCOUNT_NOTE": "Скидка: -{amount} ({percent}%)",
+  "MINIAPP_PURCHASE_BREAKDOWN_BASE": "Базовый план",
+  "MINIAPP_PURCHASE_BREAKDOWN_TRAFFIC": "Трафик",
+  "MINIAPP_PURCHASE_BREAKDOWN_SERVERS": "Серверы",
+  "MINIAPP_PURCHASE_BREAKDOWN_DEVICES": "Устройства",
+  "MINIAPP_PURCHASE_BREAKDOWN_PROMO": "Промо скидка",
+  "MINIAPP_PURCHASE_SUMMARY_DISCOUNT": "Экономия {amount}",
+  "MINIAPP_PURCHASE_STATUS_INSUFFICIENT": "Недостаточно средств на балансе",
   "SUBSCRIPTION_SETTINGS_BUTTON": "⚙️ Настройки подписки",
   "SUBSCRIPTION_SUMMARY": "\n📋 <b>Итоговая конфигурация</b>\n\n📅 <b>Период:</b> {period} дней\n📈 <b>Трафик:</b> {traffic}\n🌍 <b>Страны:</b> {countries}\n📱 <b>Устройства:</b> {devices}\n\n💰 <b>Итого к оплате:</b> {total_price}\n\nПодтвердить покупку?\n",
   "SUBSCRIPTION_TRIAL": "🧪 Тестовая подписка",
@@ -872,7 +885,42 @@
   "ADMIN_REMNAWAVE_MANAGE_NODES": "🖥️ Управление нодами",
   "ADMIN_REMNAWAVE_SYNC": "🔄 Синхронизация",
   "ADMIN_REMNAWAVE_MANAGE_SQUADS": "🌐 Управление сквадами",
+  "ADMIN_REMNAWAVE_MIGRATION": "🚚 Переезд",
   "ADMIN_REMNAWAVE_TRAFFIC": "📈 Трафик",
+  "ADMIN_SQUAD_MIGRATION_TITLE": "🚚 <b>Переезд сквадов</b>",
+  "ADMIN_SQUAD_MIGRATION_SELECT_SOURCE": "Выберите сквад, из которого нужно переехать:",
+  "ADMIN_SQUAD_MIGRATION_NO_OPTIONS": "Нет доступных сквадов. Добавьте новые или отмените операцию.",
+  "ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE": "✅ Доступен",
+  "ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE": "🚫 Недоступен",
+  "ADMIN_SQUAD_MIGRATION_SERVER_LABEL": "{name} — 👥 {users} ({status})",
+  "ADMIN_SQUAD_MIGRATION_SQUAD_BUTTON": "🌍 {name} — 👥 {users} ({status})",
+  "ADMIN_SQUAD_MIGRATION_STATUS_AVAILABLE_SHORT": "✅",
+  "ADMIN_SQUAD_MIGRATION_STATUS_UNAVAILABLE_SHORT": "🚫",
+  "ADMIN_SQUAD_MIGRATION_PAGE": "Стр. {page}/{pages}",
+  "ADMIN_SQUAD_MIGRATION_SELECTED_SOURCE": "Источник: {source}",
+  "ADMIN_SQUAD_MIGRATION_SELECT_TARGET": "Выберите сквад, в который нужно переехать:",
+  "ADMIN_SQUAD_MIGRATION_TARGET_EMPTY": "Нет других сквадов для переезда. Отмените операцию или создайте новые сквады.",
+  "ADMIN_SQUAD_MIGRATION_SQUAD_NOT_FOUND": "Сквад не найден или недоступен.",
+  "ADMIN_SQUAD_MIGRATION_SAME_SQUAD": "Нельзя выбрать тот же сквад.",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_DETAILS": "Проверьте параметры переезда:",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_SOURCE": "• Из: {source}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_TARGET": "• В: {target}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_COUNT": "• Пользователей к переносу: {count}",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_PROMPT": "Подтвердите выполнение операции.",
+  "ADMIN_SQUAD_MIGRATION_CONFIRM_BUTTON": "✅ Подтвердить",
+  "ADMIN_SQUAD_MIGRATION_CHANGE_TARGET": "🔄 Изменить сервер назначения",
+  "ADMIN_SQUAD_MIGRATION_IN_PROGRESS": "Запускаю переезд...",
+  "ADMIN_SQUAD_MIGRATION_API_ERROR": "❌ Remnawave API не настроен: {error}",
+  "ADMIN_SQUAD_MIGRATION_ERROR": "❌ Не удалось выполнить переезд (код: {code}). {details}",
+  "ADMIN_SQUAD_MIGRATION_NEW_BUTTON": "🔁 Новый переезд",
+  "ADMIN_SQUAD_MIGRATION_BACK_BUTTON": "⬅️ В Remnawave",
+  "ADMIN_SQUAD_MIGRATION_SUCCESS_TITLE": "✅ Переезд завершен",
+  "ADMIN_SQUAD_MIGRATION_RESULT_TOTAL": "Найдено подписок: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_UPDATED": "Перенесено: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_UPDATED": "Обновлено в панели: {count}",
+  "ADMIN_SQUAD_MIGRATION_RESULT_PANEL_FAILED": "Не удалось обновить в панели: {count}",
+  "ADMIN_SQUAD_MIGRATION_CANCELLED": "❌ Переезд отменен.",
+  "ADMIN_SQUAD_MIGRATION_PAGE_HINT": "Это текущая страница.",
   "ADMIN_STATS_USERS": "👥 Пользователи",
   "ADMIN_STATS_SUBSCRIPTIONS": "📱 Подписки",
   "ADMIN_STATS_REVENUE": "💰 Доходы",

tests/test_miniapp_payments.py

@@ -0,0 +1,353 @@
+import os
+import sys
+import types
+from datetime import datetime, timedelta
+from pathlib import Path
+
+import pytest
+
+ROOT_DIR = Path(__file__).resolve().parents[1]
+if str(ROOT_DIR) not in sys.path:
+    sys.path.insert(0, str(ROOT_DIR))
+
+BACKUP_DIR = ROOT_DIR / 'data' / 'backups'
+BACKUP_DIR.mkdir(parents=True, exist_ok=True)
+
+os.environ.setdefault('BOT_TOKEN', 'test-token')
+
+from app.config import settings
+from app.webapi.routes import miniapp
+from app.database.models import PaymentMethod
+from app.webapi.schemas.miniapp import (
+    MiniAppPaymentCreateRequest,
+    MiniAppPaymentMethodsRequest,
+    MiniAppPaymentStatusQuery,
+)
+
+
+@pytest.fixture
+def anyio_backend():
+    return 'asyncio'
+
+
+def test_compute_cryptobot_limits_scale_with_rate():
+    low_rate_min, low_rate_max = miniapp._compute_cryptobot_limits(70.0)
+    high_rate_min, high_rate_max = miniapp._compute_cryptobot_limits(120.0)
+
+    assert low_rate_min == 7000
+    assert low_rate_max == 7000000
+    assert high_rate_min == 12000
+    assert high_rate_max == 12000000
+    assert high_rate_min > low_rate_min
+    assert high_rate_max > low_rate_max
+
+
+@pytest.mark.anyio("asyncio")
+async def test_create_payment_link_pal24_uses_selected_option(monkeypatch):
+    monkeypatch.setattr(settings, 'PAL24_ENABLED', True, raising=False)
+    monkeypatch.setattr(settings, 'PAL24_API_TOKEN', 'token', raising=False)
+    monkeypatch.setattr(settings, 'PAL24_SHOP_ID', 'shop', raising=False)
+    monkeypatch.setattr(settings, 'PAL24_MIN_AMOUNT_KOPEKS', 1000, raising=False)
+    monkeypatch.setattr(settings, 'PAL24_MAX_AMOUNT_KOPEKS', 5000000, raising=False)
+
+    captured_calls = []
+
+    class DummyPaymentService:
+        def __init__(self, *args, **kwargs):
+            pass
+
+        async def create_pal24_payment(self, db, **kwargs):
+            captured_calls.append({'db': db, **kwargs})
+            return {
+                'local_payment_id': 101,
+                'bill_id': 'BILL42',
+                'order_id': 'ORD42',
+                'payment_method': kwargs.get('payment_method'),
+                'sbp_url': 'https://sbp',
+                'card_url': 'https://card',
+                'link_url': 'https://link',
+            }
+
+    async def fake_resolve_user(db, init_data):
+        return types.SimpleNamespace(id=123, language='ru'), {}
+
+    monkeypatch.setattr(miniapp, 'PaymentService', lambda *args, **kwargs: DummyPaymentService())
+    monkeypatch.setattr(miniapp, '_resolve_user_from_init_data', fake_resolve_user)
+
+    payload = MiniAppPaymentCreateRequest(
+        initData='test',
+        method='pal24',
+        amountKopeks=15000,
+        option='card',
+    )
+
+    response = await miniapp.create_payment_link(payload, db=types.SimpleNamespace())
+
+    assert response.payment_url == 'https://card'
+    assert response.extra['selected_option'] == 'card'
+    assert response.extra['payment_method'] == 'CARD'
+    assert captured_calls and captured_calls[0]['payment_method'] == 'CARD'
+
+
+@pytest.mark.anyio("asyncio")
+async def test_resolve_yookassa_status_includes_identifiers(monkeypatch):
+    payment = types.SimpleNamespace(
+        id=55,
+        user_id=1,
+        amount_kopeks=15000,
+        currency='RUB',
+        status='pending',
+        is_paid=False,
+        captured_at=None,
+        updated_at=None,
+        created_at=datetime.utcnow(),
+        transaction_id=42,
+        yookassa_payment_id='yk_1',
+    )
+
+    async def fake_get_by_local_id(db, local_id):
+        return payment if local_id == 55 else None
+
+    async def fake_get_by_id(db, payment_id):
+        return None
+
+    stub_module = types.SimpleNamespace(
+        get_yookassa_payment_by_local_id=fake_get_by_local_id,
+        get_yookassa_payment_by_id=fake_get_by_id,
+    )
+    monkeypatch.setitem(sys.modules, 'app.database.crud.yookassa', stub_module)
+
+    user = types.SimpleNamespace(id=1)
+    query = MiniAppPaymentStatusQuery(
+        method='yookassa',
+        localPaymentId=55,
+        paymentId='yk_1',
+        amountKopeks=15000,
+        startedAt='2024-01-01T00:00:00Z',
+        payload='payload123',
+    )
+
+    result = await miniapp._resolve_yookassa_payment_status(db=None, user=user, query=query)
+
+    assert result.extra['local_payment_id'] == 55
+    assert result.extra['payment_id'] == 'yk_1'
+    assert result.extra['invoice_id'] == 'yk_1'
+    assert result.extra['payload'] == 'payload123'
+    assert result.extra['started_at'] == '2024-01-01T00:00:00Z'
+
+
+@pytest.mark.anyio("asyncio")
+async def test_resolve_pal24_status_includes_identifiers(monkeypatch):
+    async def fake_get_pal24_payment_by_bill_id(db, bill_id):
+        return None
+
+    stub_module = types.SimpleNamespace(
+        get_pal24_payment_by_bill_id=fake_get_pal24_payment_by_bill_id,
+    )
+    monkeypatch.setitem(sys.modules, 'app.database.crud.pal24', stub_module)
+
+    paid_at = datetime.utcnow()
+
+    payment = types.SimpleNamespace(
+        id=321,
+        user_id=1,
+        amount_kopeks=25000,
+        currency='RUB',
+        is_paid=True,
+        status='PAID',
+        paid_at=paid_at,
+        updated_at=paid_at,
+        created_at=paid_at - timedelta(minutes=1),
+        transaction_id=777,
+        bill_id='BILL99',
+        order_id='ORD99',
+        payment_method='SBP',
+    )
+
+    class StubPal24Service:
+        async def get_pal24_payment_status(self, db, local_id):
+            assert local_id == 321
+            return {
+                'payment': payment,
+                'status': 'PAID',
+                'remote_status': 'PAID',
+            }
+
+    user = types.SimpleNamespace(id=1)
+    query = MiniAppPaymentStatusQuery(
+        method='pal24',
+        localPaymentId=321,
+        amountKopeks=25000,
+        startedAt='2024-01-01T00:00:00Z',
+        payload='pal24_payload',
+    )
+
+    result = await miniapp._resolve_pal24_payment_status(
+        StubPal24Service(),
+        db=None,
+        user=user,
+        query=query,
+    )
+
+    assert result.status == 'paid'
+    assert result.extra['local_payment_id'] == 321
+    assert result.extra['bill_id'] == 'BILL99'
+    assert result.extra['order_id'] == 'ORD99'
+    assert result.extra['payment_method'] == 'SBP'
+    assert result.extra['payload'] == 'pal24_payload'
+    assert result.extra['started_at'] == '2024-01-01T00:00:00Z'
+    assert result.extra['remote_status'] == 'PAID'
+
+
+@pytest.mark.anyio("asyncio")
+async def test_create_payment_link_stars_normalizes_amount(monkeypatch):
+    monkeypatch.setattr(settings, 'TELEGRAM_STARS_ENABLED', True, raising=False)
+    monkeypatch.setattr(settings, 'TELEGRAM_STARS_RATE_RUB', 1000.0, raising=False)
+    monkeypatch.setattr(settings, 'BOT_TOKEN', 'test-token', raising=False)
+
+    captured = {}
+
+    class DummyPaymentService:
+        def __init__(self, bot):
+            captured['bot'] = bot
+
+        async def create_stars_invoice(
+            self,
+            amount_kopeks,
+            description,
+            payload,
+            *,
+            stars_amount=None,
+        ):
+            captured['amount_kopeks'] = amount_kopeks
+            captured['description'] = description
+            captured['payload'] = payload
+            captured['stars_amount'] = stars_amount
+            return 'https://invoice.example'
+
+    class DummySession:
+        def __init__(self):
+            self.closed = False
+
+        async def close(self):
+            self.closed = True
+            captured['session_closed'] = True
+
+    class DummyBot:
+        def __init__(self, token):
+            captured['bot_token'] = token
+            self.session = DummySession()
+
+    async def fake_resolve_user(db, init_data):
+        return types.SimpleNamespace(id=7, language='ru'), {}
+
+    monkeypatch.setattr(miniapp, 'PaymentService', lambda bot: DummyPaymentService(bot))
+    monkeypatch.setattr(miniapp, 'Bot', DummyBot)
+    monkeypatch.setattr(miniapp, '_resolve_user_from_init_data', fake_resolve_user)
+
+    payload = MiniAppPaymentCreateRequest(
+        initData='data',
+        method='stars',
+        amountKopeks=101000,
+    )
+
+    response = await miniapp.create_payment_link(payload, db=types.SimpleNamespace())
+
+    assert response.payment_url == 'https://invoice.example'
+    assert response.amount_kopeks == 100000
+    assert response.extra['stars_amount'] == 1
+    assert response.extra['requested_amount_kopeks'] == 101000
+    assert captured['amount_kopeks'] == 100000
+    assert captured['stars_amount'] == 1
+    assert captured['bot_token'] == 'test-token'
+    assert captured.get('session_closed') is True
+
+
+@pytest.mark.anyio("asyncio")
+async def test_get_payment_methods_exposes_stars_min_amount(monkeypatch):
+    monkeypatch.setattr(settings, 'TELEGRAM_STARS_ENABLED', True, raising=False)
+    monkeypatch.setattr(settings, 'TELEGRAM_STARS_RATE_RUB', 999.99, raising=False)
+
+    async def fake_resolve_user(db, init_data):
+        return types.SimpleNamespace(id=1, language='ru'), {}
+
+    monkeypatch.setattr(miniapp, '_resolve_user_from_init_data', fake_resolve_user)
+
+    payload = MiniAppPaymentMethodsRequest(initData='abc')
+
+    response = await miniapp.get_payment_methods(payload, db=types.SimpleNamespace())
+
+    stars_method = next((method for method in response.methods if method.id == 'stars'), None)
+    assert stars_method is not None
+    assert stars_method.min_amount_kopeks == 99999
+    assert stars_method.amount_step_kopeks == 99999
+@pytest.mark.anyio("asyncio")
+async def test_find_recent_deposit_ignores_transactions_before_attempt():
+    started_at = datetime(2024, 5, 1, 12, 0, 0)
+
+    transaction = types.SimpleNamespace(
+        id=10,
+        amount_kopeks=1000,
+        completed_at=None,
+        created_at=started_at - timedelta(minutes=1),
+    )
+
+    class DummyResult:
+        def __init__(self, value):
+            self._value = value
+
+        def scalar_one_or_none(self):
+            return self._value
+
+    class DummySession:
+        def __init__(self, value):
+            self._value = value
+
+        async def execute(self, query):  # noqa: ARG002
+            return DummyResult(self._value)
+
+    result = await miniapp._find_recent_deposit(
+        DummySession(transaction),
+        user_id=1,
+        payment_method=PaymentMethod.TELEGRAM_STARS,
+        amount_kopeks=1000,
+        started_at=started_at,
+    )
+
+    assert result is None
+
+
+@pytest.mark.anyio("asyncio")
+async def test_find_recent_deposit_accepts_recent_transactions():
+    started_at = datetime(2024, 5, 1, 12, 0, 0)
+
+    transaction = types.SimpleNamespace(
+        id=11,
+        amount_kopeks=1000,
+        completed_at=started_at + timedelta(seconds=5),
+        created_at=started_at + timedelta(seconds=5),
+    )
+
+    class DummyResult:
+        def __init__(self, value):
+            self._value = value
+
+        def scalar_one_or_none(self):
+            return self._value
+
+    class DummySession:
+        def __init__(self, value):
+            self._value = value
+
+        async def execute(self, query):  # noqa: ARG002
+            return DummyResult(self._value)
+
+    result = await miniapp._find_recent_deposit(
+        DummySession(transaction),
+        user_id=1,
+        payment_method=PaymentMethod.TELEGRAM_STARS,
+        amount_kopeks=1000,
+        started_at=started_at,
+    )
+
+    assert result is transaction