Compare commits

...

128 Commits

Author SHA1 Message Date
Egor e1001156b4 Update Dockerfile 2025-10-01 07:05:17 +03:00
Egor ba2c534622 Update Dockerfile 2025-10-01 07:05:02 +03:00
Egor 72f06a784e Update docker-registry.yml 2025-10-01 07:04:44 +03:00
Egor 04e862b6bd Update docker-hub.yml 2025-10-01 07:04:31 +03:00
Egor 7f4af89d60 Update miniapp-setup.md 2025-10-01 06:43:37 +03:00
Egor f68bb699eb Update index.html 2025-10-01 06:32:56 +03:00
Egor c1d19e2ade Merge pull request #648 from Fr1ngg/dev2
Миниапка с подпиской
2025-10-01 06:14:01 +03:00
Egor e4c7e8b27f Merge pull request #647 from Fr1ngg/bedolaga/localize-subscription-button-to-english-w0zeno
Adjust purchase button localization and navigation
2025-10-01 06:10:51 +03:00
Egor c63c483b9b Adjust purchase button localization and navigation 2025-10-01 06:10:37 +03:00
Egor 4b04696feb Merge pull request #646 from Fr1ngg/revert-645-bedolaga/localize-subscription-button-to-english
Revert "Adjust miniapp purchase button behavior"
2025-10-01 06:10:09 +03:00
Egor 9ffbba7259 Revert "Adjust miniapp purchase button behavior" 2025-10-01 06:10:02 +03:00
Egor cc0b927388 Merge pull request #645 from Fr1ngg/bedolaga/localize-subscription-button-to-english
Adjust miniapp purchase button behavior
2025-10-01 06:08:34 +03:00
Egor cbcf2d55da Adjust miniapp purchase button behavior 2025-10-01 06:08:18 +03:00
Egor f7c70f60e1 Merge pull request #644 from Fr1ngg/bedolaga/add-subscription-purchase-button-in-miniapp-izs6w9
Add configurable purchase link button to mini app error state
2025-10-01 06:01:30 +03:00
Egor 7c96b0f71c Add purchase link support to mini app error state 2025-10-01 06:01:12 +03:00
Egor 2002032be3 Merge pull request #643 from Fr1ngg/revert-642-bedolaga/add-subscription-purchase-button-in-miniapp
Revert "Add configurable purchase link to the mini app"
2025-10-01 06:00:40 +03:00
Egor ed6ff293ea Revert "Add configurable purchase link to the mini app" 2025-10-01 06:00:29 +03:00
Egor 65e66353b2 Merge pull request #642 from Fr1ngg/bedolaga/add-subscription-purchase-button-in-miniapp
Add configurable purchase link to the mini app
2025-10-01 05:57:08 +03:00
Egor 4fa87804d9 Add miniapp purchase link support 2025-10-01 05:56:51 +03:00
Egor 17587a9b30 Update miniapp-setup.md 2025-10-01 05:53:53 +03:00
Egor 37c552c705 Merge pull request #641 from Fr1ngg/bedolaga/remove-happ_cryptolink_redirect_template-binding-etzom5
Open Happ CryptoLink subscriptions externally
2025-10-01 05:42:46 +03:00
Egor 95c6e72f1b fix: open happ cryptolink externally 2025-10-01 05:42:32 +03:00
Egor 4fa49e6f2e Merge pull request #640 from Fr1ngg/revert-639-bedolaga/remove-happ_cryptolink_redirect_template-binding
Revert "Open HAPP cryptolink from miniapp externally"
2025-10-01 05:41:48 +03:00
Egor 3aaa3d0671 Revert "Open HAPP cryptolink from miniapp externally" 2025-10-01 05:41:40 +03:00
Egor 9c013f19c4 Merge pull request #639 from Fr1ngg/bedolaga/remove-happ_cryptolink_redirect_template-binding
Open HAPP cryptolink from miniapp externally
2025-10-01 05:39:33 +03:00
Egor c7b6929dec Open HAPP cryptolink in external browser 2025-10-01 05:39:17 +03:00
Egor 4dca932ec2 Merge pull request #638 from Fr1ngg/revert-637-bedolaga/fix-hap_cryptolink-redirect-link
Revert "Fix miniapp connect button to open Happ CryptoLink directly"
2025-10-01 05:36:38 +03:00
Egor 997fcf8ec7 Revert "Fix miniapp connect button to open Happ CryptoLink directly" 2025-10-01 05:35:43 +03:00
Egor eb8c8ec4ce Merge pull request #637 from Fr1ngg/bedolaga/fix-hap_cryptolink-redirect-link
Fix miniapp connect button to open Happ CryptoLink directly
2025-10-01 05:34:04 +03:00
Egor f4ed61c4ca Adjust miniapp connect link handling 2025-10-01 05:33:30 +03:00
Egor 70d3434952 Merge pull request #636 from Fr1ngg/revert-635-revert-634-revert-633-bedolaga/remove-redirect-to-happ_cryptolink
Revert "Revert "Revert "Add configurable purchase link and direct Happ flow in miniapp"""
2025-10-01 05:27:04 +03:00
Egor 450d75227b Revert "Revert "Revert "Add configurable purchase link and direct Happ flow in miniapp""" 2025-10-01 05:26:48 +03:00
Egor 6e61980fa9 Merge pull request #635 from Fr1ngg/revert-634-revert-633-bedolaga/remove-redirect-to-happ_cryptolink
Revert "Revert "Add configurable purchase link and direct Happ flow in miniapp""
2025-10-01 05:25:02 +03:00
Egor 777e243bcd Revert "Revert "Add configurable purchase link and direct Happ flow in miniapp"" 2025-10-01 05:24:52 +03:00
Egor 46d9c25968 Merge pull request #634 from Fr1ngg/revert-633-bedolaga/remove-redirect-to-happ_cryptolink
Revert "Add configurable purchase link and direct Happ flow in miniapp"
2025-10-01 05:24:39 +03:00
Egor e26223a7d8 Revert "Add configurable purchase link and direct Happ flow in miniapp" 2025-10-01 05:24:28 +03:00
Egor 2098165229 Delete miniapp/index2.html 2025-10-01 05:19:00 +03:00
Egor c7e9d84585 Merge pull request #633 from Fr1ngg/bedolaga/remove-redirect-to-happ_cryptolink
Add configurable purchase link and direct Happ flow in miniapp
2025-10-01 05:17:29 +03:00
Egor 8a92d5e5a9 Add purchase link support and adjust miniapp connect flow 2025-10-01 05:17:12 +03:00
Egor 8b8f187cb3 Update index.html 2025-10-01 04:42:40 +03:00
Egor 02e3faf194 Create index2.html 2025-10-01 04:25:14 +03:00
Egor 7e8e05a0fc Merge pull request #631 from Fr1ngg/bedolaga/add-service-name-configuration-option-d3ekaj
Add configurable miniapp branding
2025-10-01 04:03:32 +03:00
Egor c3ca12a8a5 Update config.py 2025-10-01 04:03:14 +03:00
Egor d82b24927b Update README.md 2025-10-01 04:02:53 +03:00
Egor 7d9d05b1e8 Update .env.example 2025-10-01 04:02:33 +03:00
Egor cc96919672 Add configurable miniapp branding 2025-10-01 04:01:47 +03:00
Egor 1f0f5a4317 Merge pull request #630 from Fr1ngg/revert-629-bedolaga/add-service-name-configuration-option
Revert "feat: allow configuring miniapp branding"
2025-10-01 04:01:31 +03:00
Egor cd9218ec09 Revert "feat: allow configuring miniapp branding" 2025-10-01 04:01:22 +03:00
Egor 7256a0d1ab Merge pull request #629 from Fr1ngg/bedolaga/add-service-name-configuration-option
feat: allow configuring miniapp branding
2025-10-01 04:01:08 +03:00
Egor e2f5191844 Update config.py 2025-10-01 04:00:48 +03:00
Egor d964a2d53c Update README.md 2025-10-01 04:00:18 +03:00
Egor 7ace06834b Update .env.example 2025-10-01 03:59:49 +03:00
Egor 0a789d3bd1 feat: allow configuring miniapp branding 2025-10-01 03:58:34 +03:00
Egor 9c44c3ebd0 Merge pull request #628 from Fr1ngg/bedolaga/update-miniapp-index.html-template-mdwbtr
Enhance miniapp subscription details
2025-10-01 03:46:09 +03:00
Egor 67650666fc Enhance miniapp subscription details 2025-10-01 03:45:51 +03:00
Egor b5e343cfb0 Merge pull request #627 from Fr1ngg/revert-626-bedolaga/update-miniapp-index.html-template
Revert "Improve miniapp subscription metadata display"
2025-10-01 03:45:36 +03:00
Egor 68f72a88a4 Revert "Improve miniapp subscription metadata display" 2025-10-01 03:45:28 +03:00
Egor a225540c48 Merge pull request #626 from Fr1ngg/bedolaga/update-miniapp-index.html-template
Improve miniapp subscription metadata display
2025-10-01 03:44:30 +03:00
Egor 3fdc1fdeda Enhance miniapp subscription details 2025-10-01 03:44:05 +03:00
Egor 0748e9eed3 Merge pull request #625 from Fr1ngg/bedolaga/add-language-switch-and-subscription-redirect-waqu1h
Add localization and account data to miniapp
2025-10-01 03:17:27 +03:00
Egor f420e07a24 Add localization and account data to miniapp 2025-10-01 03:17:09 +03:00
Egor 885a56ecf4 Merge pull request #624 from Fr1ngg/revert-623-bedolaga/add-language-switch-and-subscription-redirect-7xmubf
Revert "Enhance miniapp page with localization and account data"
2025-10-01 03:16:47 +03:00
Egor 4e4e80f3c4 Revert "Enhance miniapp page with localization and account data" 2025-10-01 03:16:38 +03:00
Egor 4942ac4c5e Merge pull request #623 from Fr1ngg/bedolaga/add-language-switch-and-subscription-redirect-7xmubf
Enhance miniapp page with localization and account data
2025-10-01 03:14:58 +03:00
Egor 20f83ac751 feat: enhance miniapp UI with localization and account data 2025-10-01 03:14:40 +03:00
Egor 6b2b20cca2 Merge pull request #622 from Fr1ngg/revert-621-bedolaga/add-language-switch-and-subscription-redirect-w2rv5u
Revert "Add localization, balance, and server info to miniapp"
2025-10-01 03:13:44 +03:00
Egor 9db392b410 Revert "Add localization, balance, and server info to miniapp" 2025-10-01 03:13:34 +03:00
Egor 444e87d70e Merge pull request #621 from Fr1ngg/bedolaga/add-language-switch-and-subscription-redirect-w2rv5u
Add localization, balance, and server info to miniapp
2025-10-01 03:11:27 +03:00
Egor d8a6b6b08c Enhance miniapp with localization and account data 2025-10-01 03:11:09 +03:00
Egor 2658c298f0 Merge pull request #620 from Fr1ngg/revert-619-bedolaga/add-language-switch-and-subscription-redirect
Revert "Add localization and account data to mini app"
2025-10-01 03:10:44 +03:00
Egor 0ca4f9630a Revert "Add localization and account data to mini app" 2025-10-01 03:10:35 +03:00
Egor 718c9aba92 Merge pull request #619 from Fr1ngg/bedolaga/add-language-switch-and-subscription-redirect
Add localization and account data to mini app
2025-10-01 03:05:52 +03:00
Egor 078f1f8878 Add localization and account info to mini app 2025-10-01 03:05:34 +03:00
Egor c76eeea020 Merge pull request #617 from Fr1ngg/bedolaga/integrate-miniapp-page-with-bot-api
Document miniapp deployment and reverse proxy setup
2025-10-01 02:32:57 +03:00
Egor f919368d0b Document miniapp deployment and reverse proxy setup 2025-10-01 02:32:36 +03:00
Egor ccb442fe44 Create index.html 2025-10-01 02:10:06 +03:00
Egor d8c0dd862b Merge pull request #616 from Fr1ngg/dev2
W
2025-10-01 02:08:39 +03:00
Egor 1ed418b176 Delete miniapp/index.html 2025-10-01 02:08:17 +03:00
Egor 59efd837cd Merge pull request #615 from Fr1ngg/revert-614-bedolaga/add-third-purchase-mode-for-subscriptions
Revert "Add tariff-based subscription mode"
2025-10-01 02:06:32 +03:00
Egor 60d23bedde Revert "Add tariff-based subscription mode" 2025-10-01 02:06:18 +03:00
Egor d08f74179f Merge pull request #614 from Fr1ngg/bedolaga/add-third-purchase-mode-for-subscriptions
Add tariff-based subscription mode
2025-10-01 02:05:00 +03:00
Egor 70ad084bcd Add tariff-aware subscription API handling 2025-10-01 02:04:20 +03:00
Egor 818ef1ccb0 Create index.html 2025-10-01 02:03:30 +03:00
Egor f6369f7b44 Merge pull request #613 from Fr1ngg/bedolaga/add-english-locale-support-14ehhu
Add English localization for subscription management flows
2025-10-01 01:23:19 +03:00
Egor 5f8295a588 Add English localization for subscription settings flows 2025-10-01 01:22:49 +03:00
Egor 5c51788dc3 Merge pull request #612 from Fr1ngg/revert-611-bedolaga/add-english-locale-support
Revert "Add English localization for subscription management interfaces"
2025-10-01 01:22:36 +03:00
Egor 24e6d57273 Revert "Add English localization for subscription management interfaces" 2025-10-01 01:22:28 +03:00
Egor be95d34122 Merge pull request #611 from Fr1ngg/bedolaga/add-english-locale-support
Add English localization for subscription management interfaces
2025-10-01 01:18:14 +03:00
Egor 359cdd106d Add English localization for subscription management menus 2025-10-01 01:17:43 +03:00
Egor 0bc5b10a78 Merge pull request #610 from Fr1ngg/bedolaga/add-english-localization-for-user-management
Add English localization for admin user management view
2025-10-01 01:04:24 +03:00
Egor efd4eda62a Add English localization for admin user view 2025-10-01 01:04:05 +03:00
Egor d4c169e6bb Merge pull request #609 from Fr1ngg/bedolaga/add-localization-to-admin-panel-submenu
Add English localization for admin support menus
2025-10-01 00:08:24 +03:00
Egor c12f3d443c Add English localization for admin support menus 2025-10-01 00:08:03 +03:00
Egor db7ecea006 Merge pull request #608 from Fr1ngg/bedolaga/fix-payment-callback-signature-issue-xgkdfd
Handle additional MulenPay webhook signature formats
2025-09-30 23:57:35 +03:00
Egor 2b4136faa7 Handle additional MulenPay webhook signature formats 2025-09-30 23:57:18 +03:00
Egor ca09ce8cf4 Merge pull request #607 from Fr1ngg/revert-606-bedolaga/fix-payment-callback-signature-issue
Revert "Improve MulenPay webhook signature handling"
2025-09-30 23:57:02 +03:00
Egor 533087b333 Revert "Improve MulenPay webhook signature handling" 2025-09-30 23:56:54 +03:00
Egor 80afcbb737 Merge pull request #606 from Fr1ngg/bedolaga/fix-payment-callback-signature-issue
Improve MulenPay webhook signature handling
2025-09-30 23:51:44 +03:00
Egor 845faf037f Improve MulenPay webhook signature handling 2025-09-30 23:51:29 +03:00
Egor 1f160ced02 Merge pull request #605 from Fr1ngg/bedolaga/add-english-translations-for-admin-panel
Add missing admin panel locale translations
2025-09-30 23:47:25 +03:00
Egor 07e4c07d6e Add admin panel translations for ru/en locales 2025-09-30 23:47:06 +03:00
Egor 78ab84b021 Merge pull request #604 from Fr1ngg/bedolaga/add-card-payment-option-to-paypalych
Support PayPalych card payments with configurable button labels
2025-09-30 23:42:36 +03:00
Egor db5551df23 Add customizable PayPalych payment buttons 2025-09-30 23:42:19 +03:00
Egor ee75395c31 Merge pull request #603 from Fr1ngg/bedolaga/add-missing-translations-for-admin-panel
Add missing admin translations for Russian and English locales
2025-09-30 22:16:22 +03:00
Egor 453bb75b7f Add missing admin translations for Russian and English 2025-09-30 22:15:57 +03:00
Egor 88d2c8325d Merge pull request #602 from Fr1ngg/bedolaga/add-notifications-for-unsubscribed-users
Add monitoring notification for trial users leaving the channel
2025-09-30 21:45:13 +03:00
Egor 8fe9a3dbe2 feat: notify trial users when leaving channel 2025-09-30 21:44:49 +03:00
Egor cf6c282b25 Merge pull request #600 from PEDZEO/main
fix /start moderator
2025-09-30 21:12:03 +03:00
Egor 773e525a6a Merge pull request #599 from SantaSpeen/main
[+] Adding support stock app-config.json
2025-09-30 21:08:44 +03:00
Egor a7d35d51b8 Merge pull request #601 from Fr1ngg/revert-596-bedolaga/fix-all-merge-conflicts
Revert "Resolve duplicate handlers and cleanup imports"
2025-09-30 21:07:46 +03:00
Egor 46eb93dabe Revert "Resolve duplicate handlers and cleanup imports" 2025-09-30 21:07:37 +03:00
Egor 43e63f864e Merge pull request #594 from Gy9vin/main
Расширенный фильтр пользователей
2025-09-30 20:56:45 +03:00
PEDZEO 8774b53570 fix /start moderator 2025-09-30 18:45:44 +03:00
SantaSpeen 2aaec2ca58 Merge pull request #1 from SantaSpeen/slave
Merge into main
2025-09-30 17:20:56 +03:00
SantaSpeen 5efe36878d [~] Update upstream 2025-09-30 17:20:08 +03:00
SantaSpeen b9861249b7 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/handlers/subscription.py
2025-09-30 17:11:32 +03:00
Egor 2c9b585f4b Merge pull request #597 from Fr1ngg/dev2
fix
2025-09-30 16:51:54 +03:00
Egor dd5b36ff4a Merge pull request #596 from Fr1ngg/bedolaga/fix-all-merge-conflicts
Resolve duplicate handlers and cleanup imports
2025-09-30 16:41:09 +03:00
Egor 144a942a97 Resolve duplicate handlers and cleanup imports 2025-09-30 16:40:08 +03:00
SantaSpeen ff661d84ee [+] Update app-config.json: new get_apps_for_device 2025-09-30 14:46:55 +03:00
SantaSpeen ab1b8619f8 [+] Update get_apps_for_device: Allow app-config.json just from panel 2025-09-30 14:26:22 +03:00
gy9vin 0f621bfe5a Revert "Оживление виджета "Детальная статистика пользователей""
This reverts commit 400cc5a32e.
2025-09-30 12:42:17 +03:00
gy9vin c344f418c5 Расширение фильтров 2025-09-30 12:39:15 +03:00
gy9vin 400cc5a32e Оживление виджета "Детальная статистика пользователей" 2025-09-30 11:55:04 +03:00
Egor b6a383b5d8 Merge pull request #593 from Fr1ngg/dev2
Логи в боте
2025-09-30 04:37:25 +03:00
Egor a8215ddec5 Update system_logs.py 2025-09-30 04:34:09 +03:00
Egor 954c96ed16 Merge pull request #592 from Fr1ngg/bedolaga/add-log-section-to-admin-panel
Add system logs view to admin panel
2025-09-30 04:30:47 +03:00
Egor ed9a3613f5 Add system logs view to admin panel 2025-09-30 04:30:30 +03:00
48 changed files with 9293 additions and 2136 deletions
+4
View File
@@ -290,6 +290,10 @@ CONNECT_BUTTON_MODE=guide
# URL для режима miniapp_custom (обязателен при CONNECT_BUTTON_MODE=miniapp_custom)
MINIAPP_CUSTOM_URL=
MINIAPP_SERVICE_NAME_EN=Bedolaga VPN
MINIAPP_SERVICE_NAME_RU=Bedolaga VPN
MINIAPP_SERVICE_DESCRIPTION_EN=Secure & Fast Connection
MINIAPP_SERVICE_DESCRIPTION_RU=Безопасное и быстрое подключение
# Параметры режима happ_cryptolink
CONNECT_BUTTON_HAPP_DOWNLOAD_ENABLED=false
+3 -3
View File
@@ -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.1-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-$(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.1-dev-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-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.1-pr-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-pr-$(git rev-parse --short HEAD)"
TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)"
echo "🔀 Собираем PR версию: $VERSION"
fi
+3 -3
View File
@@ -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.1-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-$(git rev-parse --short HEAD)"
echo "🚀 Building main version: $VERSION"
elif [[ $GITHUB_REF == refs/heads/dev ]]; then
VERSION="v2.4.1-dev-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-dev-$(git rev-parse --short HEAD)"
echo "🧪 Building dev version: $VERSION"
else
VERSION="v2.4.1-pr-$(git rev-parse --short HEAD)"
VERSION="v2.4.2-pr-$(git rev-parse --short HEAD)"
echo "🔀 Building PR version: $VERSION"
fi
echo "version=$VERSION" >> $GITHUB_OUTPUT
+2 -2
View File
@@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
FROM python:3.13-slim
ARG VERSION="v2.4.1"
ARG VERSION="v2.4.2"
ARG BUILD_DATE
ARG VCS_REF
@@ -45,7 +45,7 @@ ENV PYTHONPATH=/app \
BUILD_DATE=${BUILD_DATE} \
VCS_REF=${VCS_REF}
EXPOSE 8081 8082
EXPOSE 8080 8081 8082
LABEL org.opencontainers.image.title="Bedolaga RemnaWave Bot" \
org.opencontainers.image.description="Telegram bot for RemnaWave VPN service" \
+8
View File
@@ -112,6 +112,10 @@ docker compose logs
Подробное пошаговое руководство по запуску административного веб-API и подключению внешней панели находится в [docs/web-admin-integration.md](docs/web-admin-integration.md).
### 📱 Telegram Mini App с подпиской
Инструкция по развёртыванию мини-приложения, публикации статической страницы и настройке reverse-proxy доступна в [docs/miniapp-setup.md](docs/miniapp-setup.md).
### 📊 Статус серверов в главном меню
| Переменная | Описание | Пример |
@@ -531,6 +535,10 @@ CONNECT_BUTTON_MODE=guide
# URL для режима miniapp_custom (обязателен при CONNECT_BUTTON_MODE=miniapp_custom)
MINIAPP_CUSTOM_URL=
MINIAPP_SERVICE_NAME_EN=Bedolaga VPN
MINIAPP_SERVICE_NAME_RU=Bedolaga VPN
MINIAPP_SERVICE_DESCRIPTION_EN=Secure & Fast Connection
MINIAPP_SERVICE_DESCRIPTION_RU=Безопасное и быстрое подключение
# Параметры режима happ_cryptolink
CONNECT_BUTTON_HAPP_DOWNLOAD_ENABLED=false
+216 -146
View File
@@ -1,163 +1,233 @@
{
"ios": [
{
"id": "happ",
"name": "Happ",
"isFeatured": true,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://apps.apple.com/us/app/happ-proxy-utility/id6504287215",
"buttonText": {
"en": "App Store [EU]",
"ru": "App Store [EU]"
}
},
{
"buttonLink": "https://apps.apple.com/ru/app/happ-proxy-utility-plus/id6746188973",
"buttonText": {
"en": "App Store [RU]",
"ru": "App Store [RU]"
"config": {},
"platforms": {
"ios": [
{
"id": "happ",
"name": "Happ",
"isFeatured": true,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://apps.apple.com/us/app/happ-proxy-utility/id6504287215",
"buttonText": {
"en": "App Store [EU]",
"fa": "App Store [EU]",
"ru": "App Store [EU]",
"zh": "App Store [EU]"
}
},
{
"buttonLink": "https://apps.apple.com/ru/app/happ-proxy-utility-plus/id6746188973",
"buttonText": {
"en": "App Store [RU]",
"fa": "App Store [RU]",
"ru": "App Store [RU]",
"zh": "App Store [RU]"
}
}
],
"description": {
"en": "Open the page in App Store and install the app. Launch it, in the VPN configuration permission window click Allow and enter your passcode.",
"fa": "صفحه را در App Store باز کنید و برنامه را نصب کنید. آن را اجرا کنید، در پنجره مجوز پیکربندی VPN روی Allow کلیک کنید و رمز عبور خود را وارد کنید.",
"ru": "Откройте страницу в App Store и установите приложение. Запустите его, в окне разрешения VPN-конфигурации нажмите Allow и введите свой пароль.",
"zh": "在 App Store 中打开页面并安装应用。启动应用后,在 VPN 配置权限窗口中点击\"允许\"并输入您的密码。"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below — the app will open and the subscription will be added automatically",
"fa": "برای افزودن خودکار اشتراک روی دکمه زیر کلیک کنید - برنامه باز خواهد شد",
"ru": "Нажмите кнопку ниже — приложение откроется, и подписка добавится автоматически.",
"zh": "点击下方按钮 — 应用将打开并自动添加订阅"
}
},
"connectAndUseStep": {
"description": {
"en": "In the main section, click the large power button in the center to connect to VPN. Don't forget to select a server from the server list. If needed, choose another server from the server list.",
"fa": "در بخش اصلی، دکمه بزرگ روشن/خاموش در مرکز را برای اتصال به VPN کلیک کنید. فراموش نکنید که یک سرور را از لیست سرورها انتخاب کنید. در صورت نیاز، سرور دیگری را از لیست سرورها انتخاب کنید.",
"ru": "В главном разделе нажмите большую кнопку включения в центре для подключения к VPN. Не забудьте выбрать сервер в списке серверов. При необходимости выберите другой сервер из списка серверов.",
"zh": "在主界面中,点击中央的大电源按钮连接到 VPN。别忘了从服务器列表中选择一个服务器。如有需要,可从服务器列表中选择其他服务器。"
}
],
"description": {
"en": "Open the page in App Store and install the app. Launch it, in the VPN configuration permission window click Allow and enter your passcode.",
"ru": "Откройте страницу в App Store и установите приложение. Вернись на страницу с подпиской"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below — the app will open and the subscription will be added automatically",
"ru": "Нажмите кнопку выше — (Подключить подписку) приложение откроется, и подписка добавится автоматически."
}
},
"connectAndUseStep": {
"description": {
"en": "In the main section, click the large power button in the center to connect to VPN. Don't forget to select a server from the server list. If needed, choose another server from the server list.",
"ru": "В главном разделе нажмите большую кнопку включения в центре для подключения к VPN. Не забудьте выбрать сервер в списке серверов. При необходимости выберите другой сервер из списка серверов."
}
}
}
],
"android": [
{
"id": "happ",
"name": "Happ",
"isFeatured": true,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://play.google.com/store/apps/details?id=com.happproxy",
"buttonText": {
"en": "Google Play",
"ru": "Google Play"
}
},
{
"buttonLink": "https://github.com/Happ-proxy/happ-android/releases/latest/download/Happ.apk",
"buttonText": {
"en": "Download APK",
"ru": "Скачать APK"
],
"android": [
{
"id": "happ",
"name": "Happ",
"isFeatured": true,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://play.google.com/store/apps/details?id=com.happproxy",
"buttonText": {
"en": "Google Play",
"fa": "Google Play",
"ru": "Google Play",
"zh": "Google Play"
}
},
{
"buttonLink": "https://github.com/Happ-proxy/happ-android/releases/latest/download/Happ.apk",
"buttonText": {
"en": "Download APK",
"fa": "دانلود APK",
"ru": "Скачать APK",
"zh": "下载 APK"
}
}
],
"description": {
"en": "Open the page in Google Play and install the app. Or install the app directly from the APK file if Google Play is not working.",
"fa": "صفحه را در Google Play باز کنید و برنامه را نصب کنید. یا برنامه را مستقیماً از فایل APK نصب کنید، اگر Google Play کار نمی کند.",
"ru": "Откройте страницу в Google Play и установите приложение. Или установите приложение из APK файла напрямую, если Google Play не работает.",
"zh": "在 Google Play 中打开页面并安装应用。如果 Google Play 无法使用,也可以直接从 APK 文件安装应用。"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"fa": "برای افزودن اشتراک روی دکمه زیر کلیک کنید",
"ru": "Нажмите кнопку ниже, чтобы добавить подписку",
"zh": "点击下方按钮添加订阅"
}
},
"connectAndUseStep": {
"description": {
"en": "Open the app and connect to the server",
"fa": "برنامه را باز کنید و به سرور متصل شوید",
"ru": "Откройте приложение и подключитесь к серверу",
"zh": "打开应用并连接到服务器"
}
],
"description": {
"en": "Open the page in Google Play and install the app. Or install the app directly from the APK file if Google Play is not working.",
"ru": "Откройте страницу в Google Play и установите приложение. Или установите приложение из APK файла напрямую, если Google Play не работает."
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"ru": "Нажмите кнопку выше — (Подключить подписку) приложение откроется, и подписка добавится автоматически."
}
},
"connectAndUseStep": {
"description": {
"en": "Open the app and connect to the server",
"ru": "Откройте приложение и подключитесь к серверу"
}
}
}
],
"pc": [
{
"id": "happ",
"name": "Happ",
"isFeatured": false,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://apps.apple.com/us/app/happ-proxy-utility/id6504287215?l=ru",
"buttonText": {
"en": "Mac Os",
"ru": "Mac Os"
}
},
{
"buttonLink": "https://github.com/Happ-proxy/happ-desktop/releases/latest/download/setup-Happ.x86.exe",
"buttonText": {
"en": "Windows",
"ru": "Windows"
],
"macos": [
{
"id": "happ",
"name": "Happ",
"isFeatured": true,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://apps.apple.com/us/app/happ-proxy-utility/id6504287215",
"buttonText": {
"en": "App Store [EU]",
"fa": "App Store [EU]",
"ru": "App Store [EU]",
"zh": "App Store [EU]"
}
},
{
"buttonLink": "https://apps.apple.com/ru/app/happ-proxy-utility-plus/id6746188973",
"buttonText": {
"en": "App Store [RU]",
"fa": "App Store [RU]",
"ru": "App Store [RU]",
"zh": "App Store [RU]"
}
}
],
"description": {
"en": "Open the page in App Store and install the app. Launch it, in the VPN configuration permission window click Allow and enter your passcode.",
"fa": "صفحه را در App Store باز کنید و برنامه را نصب کنید. آن را اجرا کنید، در پنجره مجوز پیکربندی VPN روی Allow کلیک کنید و رمز عبور خود را وارد کنید.",
"ru": "Откройте страницу в App Store и установите приложение. Запустите его, в окне разрешения VPN-конфигурации нажмите Allow и введите свой пароль.",
"zh": "在 App Store 中打开页面并安装应用。启动应用后,在 VPN 配置权限窗口中点击\"允许\"并输入您的密码。"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below — the app will open and the subscription will be added automatically",
"fa": "برای افزودن خودکار اشتراک روی دکمه زیر کلیک کنید - برنامه باز خواهد شد",
"ru": "Нажмите кнопку ниже — приложение откроется, и подписка добавится автоматически.",
"zh": "点击下方按钮 — 应用将打开并自动添加订阅"
}
},
"connectAndUseStep": {
"description": {
"en": "In the main section, click the large power button in the center to connect to VPN. Don't forget to select a server from the server list. If needed, choose another server from the server list.",
"fa": "در بخش اصلی، دکمه بزرگ روشن/خاموش در مرکز را برای اتصال به VPN کلیک کنید. فراموش نکنید که یک سرور را از لیست سرورها انتخاب کنید. در صورت نیاز، سرور دیگری را از لیست سرورها انتخاب کنید.",
"ru": "В главном разделе нажмите большую кнопку включения в центре для подключения к VPN. Не забудьте выбрать сервер в списке серверов. При необходимости выберите другой сервер из списка серверов.",
"zh": "在主界面中,点击中央的大电源按钮连接到 VPN。别忘了从服务器列表中选择一个服务器。如有需要,可从服务器列表中选择其他服务器。"
}
],
"description": {
"en": "Choose the version for your device, click the button below and install the app.",
"ru": "Выберите подходящую версию для вашего устройства, нажмите на кнопку ниже и установите приложение"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"ru": "Нажмите кнопку выше — (Подключить подписку) приложение откроется, и подписка добавится автоматически."
}
},
"connectAndUseStep": {
"description": {
"en": "You can select a server",
"ru": "Выберете локацию, включить VPN"
}
}
}
],
"tv": [
{
"id": "vpn4tv",
"name": "VPN4TV",
"isFeatured": true,
"urlScheme": "",
"installationStep": {
"buttons": [
{
"buttonLink": "https://play.google.com/store/apps/details?id=com.vpn4tv.hiddify",
"buttonText": {
"en": "Google Play",
"ru": "Google Play"
],
"windows": [
{
"id": "happ",
"name": "Happ",
"isFeatured": false,
"urlScheme": "happ://add/",
"installationStep": {
"buttons": [
{
"buttonLink": "https://github.com/Happ-proxy/happ-desktop/releases/latest/download/setup-Happ.x86.exe",
"buttonText": {
"en": "Download",
"ru": "Скачать"
}
}
],
"description": {
"en": "Download and install Happ.",
"ru": "Скачайте и установите Happ"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"ru": "Нажмите кнопку выше — (Подключить подписку) приложение откроется, и подписка добавится автоматически."
}
},
"connectAndUseStep": {
"description": {
"en": "You can select a server",
"ru": "Выберете локацию, включить VPN"
}
],
"description": {
"en": "Open the page in Google Play and install the app. Or install the app directly from the APK file if Google Play is not working.",
"ru": "Откройте страницу в Google Play и установите приложение"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"ru": "Нажмите кнопку выше — (Скопировать ссылку подписки) ты скопируешь свою подписку, далее на телевизоре открой VPN4TV, следуя инструкция передай telegram боту ссылку, которую ты скопировал"
}
},
"connectAndUseStep": {
"description": {
"en": "Open the app and connect to the server",
"ru": "Приложение автоматически обновится и загрузит нужные конфиги на твой телевизор, подключай VPN"
}
}
}
]
}
],
"androidTV": [
{
"id": "vpn4tv",
"name": "VPN4TV",
"isFeatured": true,
"urlScheme": "",
"installationStep": {
"buttons": [
{
"buttonLink": "https://play.google.com/store/apps/details?id=com.vpn4tv.hiddify",
"buttonText": {
"en": "Google Play",
"ru": "Google Play"
}
}
],
"description": {
"en": "Open the page in Google Play and install the app. Or install the app directly from the APK file if Google Play is not working.",
"ru": "Откройте страницу в Google Play и установите приложение"
}
},
"addSubscriptionStep": {
"description": {
"en": "Click the button below to add subscription",
"ru": "Нажмите кнопку выше — (Скопировать ссылку подписки) ты скопируешь свою подписку, далее на телевизоре открой VPN4TV, следуя инструкция передай telegram боту ссылку, которую ты скопировал"
}
},
"connectAndUseStep": {
"description": {
"en": "Open the app and connect to the server",
"ru": "Приложение автоматически обновится и загрузит нужные конфиги на твой телевизор, подключай VPN"
}
}
}
],
"linux": [],
"appleTV": []
}
}
+2
View File
@@ -36,6 +36,7 @@ from app.handlers.admin import (
user_messages as admin_user_messages,
updates as admin_updates,
backup as admin_backup,
system_logs as admin_system_logs,
welcome_text as admin_welcome_text,
tickets as admin_tickets,
reports as admin_reports,
@@ -139,6 +140,7 @@ async def setup_bot() -> tuple[Bot, Dispatcher]:
admin_user_messages.register_handlers(dp)
admin_updates.register_handlers(dp)
admin_backup.register_handlers(dp)
admin_system_logs.register_handlers(dp)
admin_welcome_text.register_welcome_text_handlers(dp)
admin_tickets.register_handlers(dp)
admin_reports.register_handlers(dp)
+43
View File
@@ -208,9 +208,16 @@ class Settings(BaseSettings):
PAL24_MIN_AMOUNT_KOPEKS: int = 10000
PAL24_MAX_AMOUNT_KOPEKS: int = 100000000
PAL24_REQUEST_TIMEOUT: int = 30
PAL24_SBP_BUTTON_TEXT: Optional[str] = None
PAL24_CARD_BUTTON_TEXT: Optional[str] = None
CONNECT_BUTTON_MODE: str = "guide"
MINIAPP_CUSTOM_URL: str = ""
MINIAPP_PURCHASE_URL: str = ""
MINIAPP_SERVICE_NAME_EN: str = "Bedolaga VPN"
MINIAPP_SERVICE_NAME_RU: str = "Bedolaga VPN"
MINIAPP_SERVICE_DESCRIPTION_EN: str = "Secure & Fast Connection"
MINIAPP_SERVICE_DESCRIPTION_RU: str = "Безопасное и быстрое подключение"
CONNECT_BUTTON_HAPP_DOWNLOAD_ENABLED: bool = False
HAPP_CRYPTOLINK_REDIRECT_TEMPLATE: Optional[str] = None
HAPP_DOWNLOAD_LINK_IOS: Optional[str] = None
@@ -399,6 +406,14 @@ class Settings(BaseSettings):
"password": self.REMNAWAVE_PASSWORD,
"auth_type": self.REMNAWAVE_AUTH_TYPE
}
def get_pal24_sbp_button_text(self, fallback: str) -> str:
value = (self.PAL24_SBP_BUTTON_TEXT or "").strip()
return value or fallback
def get_pal24_card_button_text(self, fallback: str) -> str:
value = (self.PAL24_CARD_BUTTON_TEXT or "").strip()
return value or fallback
def get_remnawave_user_delete_mode(self) -> str:
"""Возвращает режим удаления пользователей: 'delete' или 'disable'"""
@@ -508,6 +523,34 @@ class Settings(BaseSettings):
def is_deep_links_enabled(self) -> bool:
return self.ENABLE_DEEP_LINKS
def get_miniapp_branding(self) -> Dict[str, Dict[str, Optional[str]]]:
def _clean(value: Optional[str]) -> Optional[str]:
if value is None:
return None
value_str = str(value).strip()
return value_str or None
name_en = _clean(self.MINIAPP_SERVICE_NAME_EN)
name_ru = _clean(self.MINIAPP_SERVICE_NAME_RU)
desc_en = _clean(self.MINIAPP_SERVICE_DESCRIPTION_EN)
desc_ru = _clean(self.MINIAPP_SERVICE_DESCRIPTION_RU)
default_name = name_en or name_ru or "RemnaWave VPN"
default_description = desc_en or desc_ru or "Secure & Fast Connection"
return {
"service_name": {
"default": default_name,
"en": name_en,
"ru": name_ru,
},
"service_description": {
"default": default_description,
"en": desc_en,
"ru": desc_ru,
},
}
def get_app_config_cache_ttl(self) -> int:
return self.APP_CONFIG_CACHE_TTL
+14
View File
@@ -50,3 +50,17 @@ async def clear_notifications(db: AsyncSession, subscription_id: int) -> None:
)
)
await db.commit()
async def clear_notification_by_type(
db: AsyncSession,
subscription_id: int,
notification_type: str,
) -> None:
await db.execute(
delete(SentNotification).where(
SentNotification.subscription_id == subscription_id,
SentNotification.notification_type == notification_type,
)
)
await db.commit()
+128 -7
View File
@@ -2,8 +2,8 @@ import logging
import secrets
import string
from datetime import datetime, timedelta
from typing import Optional, List
from sqlalchemy import select, and_, or_, func
from typing import Optional, List, Dict
from sqlalchemy import select, and_, or_, func, case, nullslast
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import selectinload
@@ -273,7 +273,11 @@ async def get_users_list(
limit: int = 50,
search: Optional[str] = None,
status: Optional[UserStatus] = None,
order_by_balance: bool = False
order_by_balance: bool = False,
order_by_traffic: bool = False,
order_by_last_activity: bool = False,
order_by_total_spent: bool = False,
order_by_purchase_count: bool = False
) -> List[User]:
query = select(User).options(selectinload(User.subscription))
@@ -293,10 +297,71 @@ async def get_users_list(
conditions.append(User.telegram_id == int(search))
query = query.where(or_(*conditions))
# Сортировка по балансу в порядке убывания, если order_by_balance=True
if order_by_balance:
query = query.order_by(User.balance_kopeks.desc())
sort_flags = [
order_by_balance,
order_by_traffic,
order_by_last_activity,
order_by_total_spent,
order_by_purchase_count,
]
if sum(int(flag) for flag in sort_flags) > 1:
logger.debug(
"Выбрано несколько сортировок пользователей — применяется приоритет: трафик > траты > покупки > баланс > активность"
)
transactions_stats = None
if order_by_total_spent or order_by_purchase_count:
from app.database.models import Transaction
transactions_stats = (
select(
Transaction.user_id.label("user_id"),
func.coalesce(
func.sum(
case(
(
Transaction.type == TransactionType.SUBSCRIPTION_PAYMENT.value,
Transaction.amount_kopeks,
),
else_=0,
)
),
0,
).label("total_spent"),
func.coalesce(
func.sum(
case(
(
Transaction.type == TransactionType.SUBSCRIPTION_PAYMENT.value,
1,
),
else_=0,
)
),
0,
).label("purchase_count"),
)
.where(Transaction.is_completed.is_(True))
.group_by(Transaction.user_id)
.subquery()
)
query = query.outerjoin(transactions_stats, transactions_stats.c.user_id == User.id)
if order_by_traffic:
traffic_sort = func.coalesce(Subscription.traffic_used_gb, 0.0)
query = query.outerjoin(Subscription, Subscription.user_id == User.id)
query = query.order_by(traffic_sort.desc(), User.created_at.desc())
elif order_by_total_spent:
order_column = func.coalesce(transactions_stats.c.total_spent, 0)
query = query.order_by(order_column.desc(), User.created_at.desc())
elif order_by_purchase_count:
order_column = func.coalesce(transactions_stats.c.purchase_count, 0)
query = query.order_by(order_column.desc(), User.created_at.desc())
elif order_by_balance:
query = query.order_by(User.balance_kopeks.desc(), User.created_at.desc())
elif order_by_last_activity:
query = query.order_by(nullslast(User.last_activity.desc()), User.created_at.desc())
else:
query = query.order_by(User.created_at.desc())
@@ -334,6 +399,62 @@ async def get_users_count(
return result.scalar()
async def get_users_spending_stats(
db: AsyncSession,
user_ids: List[int]
) -> Dict[int, Dict[str, int]]:
if not user_ids:
return {}
from app.database.models import Transaction
stats_query = (
select(
Transaction.user_id,
func.coalesce(
func.sum(
case(
(
Transaction.type == TransactionType.SUBSCRIPTION_PAYMENT.value,
Transaction.amount_kopeks,
),
else_=0,
)
),
0,
).label("total_spent"),
func.coalesce(
func.sum(
case(
(
Transaction.type == TransactionType.SUBSCRIPTION_PAYMENT.value,
1,
),
else_=0,
)
),
0,
).label("purchase_count"),
)
.where(
Transaction.user_id.in_(user_ids),
Transaction.is_completed.is_(True),
)
.group_by(Transaction.user_id)
)
result = await db.execute(stats_query)
rows = result.all()
return {
row.user_id: {
"total_spent": int(row.total_spent or 0),
"purchase_count": int(row.purchase_count or 0),
}
for row in rows
}
async def get_referrals(db: AsyncSession, user_id: int) -> List[User]:
result = await db.execute(
select(User)
+1 -2
View File
@@ -571,8 +571,7 @@ class Subscription(Base):
return 0.0
def extend_subscription(self, days: int):
from datetime import timedelta, datetime
if self.end_date > datetime.utcnow():
self.end_date = self.end_date + timedelta(days=days)
else:
-1
View File
@@ -4,7 +4,6 @@ import ssl
import base64
from datetime import datetime, timedelta
from typing import Dict, List, Optional, Union, Any
from urllib.parse import urlparse
import aiohttp
import logging
from dataclasses import dataclass
+69 -10
View File
@@ -1,8 +1,9 @@
import base64
import hashlib
import hmac
import logging
import json
from typing import Optional
from typing import Optional, Iterable
from aiohttp import web
from aiogram import Bot
@@ -144,6 +145,14 @@ class WebhookServer:
logger.error(f"Критическая ошибка Mulen Pay webhook: {error}", exc_info=True)
return web.json_response({"status": "error", "reason": "internal_error", "message": str(error)}, status=500)
@staticmethod
def _extract_mulenpay_header(request: web.Request, header_names: Iterable[str]) -> Optional[str]:
for header_name in header_names:
value = request.headers.get(header_name)
if value:
return value.strip()
return None
@staticmethod
def _verify_mulenpay_signature(request: web.Request, raw_body: bytes) -> bool:
secret_key = settings.MULENPAY_SECRET_KEY
@@ -151,28 +160,78 @@ class WebhookServer:
logger.error("Mulen Pay secret key is not configured")
return False
signature = request.headers.get('X-MulenPay-Signature')
signature = WebhookServer._extract_mulenpay_header(
request,
(
'X-MulenPay-Signature',
'X-Mulenpay-Signature',
'X-MULENPAY-SIGNATURE',
'X-MulenPay-Webhook-Signature',
'X-Mulenpay-Webhook-Signature',
'X-MULENPAY-WEBHOOK-SIGNATURE',
'X-Signature',
'Signature',
)
)
if signature:
expected_signature = hmac.new(
normalized_signature = signature
if normalized_signature.lower().startswith('sha256='):
normalized_signature = normalized_signature.split('=', 1)[1].strip()
hmac_digest = hmac.new(
secret_key.encode('utf-8'),
raw_body,
hashlib.sha256,
).hexdigest()
).digest()
expected_hex_signature = hmac_digest.hex()
expected_base64_signature = base64.b64encode(hmac_digest).decode('utf-8').strip()
expected_urlsafe_base64_signature = base64.urlsafe_b64encode(hmac_digest).decode('utf-8').strip()
if hmac.compare_digest(signature.strip().lower(), expected_signature.lower()):
normalized_signature_lower = normalized_signature.lower()
if hmac.compare_digest(normalized_signature_lower, expected_hex_signature.lower()):
return True
normalized_signature_no_padding = normalized_signature.rstrip('=')
if hmac.compare_digest(normalized_signature_no_padding, expected_base64_signature.rstrip('=')):
return True
if hmac.compare_digest(normalized_signature_no_padding, expected_urlsafe_base64_signature.rstrip('=')):
return True
logger.error("Неверная подпись Mulen Pay webhook")
return False
authorization_header = request.headers.get('Authorization')
if authorization_header and authorization_header.startswith('Bearer '):
token = authorization_header.split(' ', 1)[1].strip()
if hmac.compare_digest(token, secret_key):
if authorization_header:
scheme, _, value = authorization_header.partition(' ')
scheme_lower = scheme.lower()
token = value.strip() if value else scheme.strip()
if scheme_lower in ('bearer', 'token'):
if hmac.compare_digest(token, secret_key):
return True
logger.error("Неверный %s токен Mulen Pay webhook", scheme)
return False
if not value and hmac.compare_digest(token, secret_key):
return True
logger.error("Неверный Bearer токен Mulen Pay webhook")
return False
fallback_token = WebhookServer._extract_mulenpay_header(
request,
(
'X-MulenPay-Token',
'X-Mulenpay-Token',
'X-Webhook-Token',
)
)
if fallback_token and hmac.compare_digest(fallback_token, secret_key):
return True
logger.debug(
"Mulen Pay webhook headers received: %s",
{key: value for key, value in request.headers.items() if 'authorization' not in key.lower()}
)
logger.error("Отсутствует подпись Mulen Pay webhook")
return False
+64 -18
View File
@@ -851,33 +851,79 @@ async def test_payment_provider(
language=language or "ru",
)
if not payment_result or not payment_result.get("link_url") and not payment_result.get("link_page_url"):
if not payment_result:
await callback.answer("❌ Не удалось создать платеж PayPalych", show_alert=True)
await _refresh_markup()
return
payment_url = payment_result.get("link_page_url") or payment_result.get("link_url")
sbp_url = (
payment_result.get("sbp_url")
or payment_result.get("transfer_url")
or payment_result.get("link_url")
)
card_url = payment_result.get("card_url")
fallback_url = payment_result.get("link_page_url") or payment_result.get("link_url")
if not (sbp_url or card_url or fallback_url):
await callback.answer("❌ Не удалось создать платеж PayPalych", show_alert=True)
await _refresh_markup()
return
if not sbp_url:
sbp_url = fallback_url
default_sbp_text = texts.t(
"PAL24_SBP_PAY_BUTTON",
"🏦 Оплатить через PayPalych (СБП)",
)
sbp_button_text = settings.get_pal24_sbp_button_text(default_sbp_text)
default_card_text = texts.t(
"PAL24_CARD_PAY_BUTTON",
"💳 Оплатить банковской картой (PayPalych)",
)
card_button_text = settings.get_pal24_card_button_text(default_card_text)
pay_rows: list[list[types.InlineKeyboardButton]] = []
if sbp_url:
pay_rows.append([
types.InlineKeyboardButton(
text=sbp_button_text,
url=sbp_url,
)
])
if card_url and card_url != sbp_url:
pay_rows.append([
types.InlineKeyboardButton(
text=card_button_text,
url=card_url,
)
])
if not pay_rows and fallback_url:
pay_rows.append([
types.InlineKeyboardButton(
text=sbp_button_text,
url=fallback_url,
)
])
message_text = (
"🧪 <b>Тестовый платеж PayPalych</b>\n\n"
f"💰 Сумма: {texts.format_price(amount_kopeks)}\n"
f"🆔 Bill ID: {payment_result['bill_id']}"
)
reply_markup = types.InlineKeyboardMarkup(
inline_keyboard=[
[
types.InlineKeyboardButton(
text="🏦 Перейти к оплате (СБП)",
url=payment_url,
)
],
[
types.InlineKeyboardButton(
text="📊 Проверить статус",
callback_data=f"check_pal24_{payment_result['local_payment_id']}",
)
],
]
)
keyboard_rows = pay_rows + [
[
types.InlineKeyboardButton(
text="📊 Проверить статус",
callback_data=f"check_pal24_{payment_result['local_payment_id']}",
)
],
]
reply_markup = types.InlineKeyboardMarkup(inline_keyboard=keyboard_rows)
await callback.message.answer(message_text, reply_markup=reply_markup, parse_mode="HTML")
await callback.answer("✅ Ссылка на платеж PayPalych отправлена", show_alert=True)
await _refresh_markup()
+40 -30
View File
@@ -71,10 +71,10 @@ async def show_users_submenu(
db: AsyncSession
):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"👥 **Управление пользователями и подписками**\n\n"
"Выберите нужный раздел:",
texts.t("ADMIN_USERS_SUBMENU_TITLE", "👥 **Управление пользователями и подписками**\n\n") +
texts.t("ADMIN_SUBMENU_SELECT_SECTION", "Выберите нужный раздел:"),
reply_markup=get_admin_users_submenu_keyboard(db_user.language),
parse_mode="Markdown"
)
@@ -89,10 +89,10 @@ async def show_promo_submenu(
db: AsyncSession
):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"💰 **Промокоды и статистика**\n\n"
"Выберите нужный раздел:",
texts.t("ADMIN_PROMO_SUBMENU_TITLE", "💰 **Промокоды и статистика**\n\n") +
texts.t("ADMIN_SUBMENU_SELECT_SECTION", "Выберите нужный раздел:"),
reply_markup=get_admin_promo_submenu_keyboard(db_user.language),
parse_mode="Markdown"
)
@@ -107,10 +107,10 @@ async def show_communications_submenu(
db: AsyncSession
):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"📨 **Коммуникации**\n\n"
"Управление рассылками и текстами интерфейса:",
texts.t("ADMIN_COMMUNICATIONS_SUBMENU_TITLE", "📨 **Коммуникации**\n\n") +
texts.t("ADMIN_COMMUNICATIONS_SUBMENU_DESCRIPTION", "Управление рассылками и текстами интерфейса:"),
reply_markup=get_admin_communications_submenu_keyboard(db_user.language),
parse_mode="Markdown"
)
@@ -128,16 +128,19 @@ async def show_support_submenu(
# Moderators have access only to tickets and not to settings
is_moderator_only = (not settings.is_admin(callback.from_user.id) and SupportSettingsService.is_moderator(callback.from_user.id))
from app.keyboards.admin import get_admin_support_submenu_keyboard
kb = get_admin_support_submenu_keyboard(db_user.language)
if is_moderator_only:
# Rebuild keyboard to include only tickets and back to main menu
kb = InlineKeyboardMarkup(inline_keyboard=[
[InlineKeyboardButton(text="🎫 Тикеты поддержки", callback_data="admin_tickets")],
[InlineKeyboardButton(text="⬅️ Назад", callback_data="back_to_menu")]
[InlineKeyboardButton(text=texts.t("ADMIN_SUPPORT_TICKETS", "🎫 Тикеты поддержки"), callback_data="admin_tickets")],
[InlineKeyboardButton(text=texts.BACK, callback_data="back_to_menu")]
])
await callback.message.edit_text(
"🛟 **Поддержка**\n\n" + ("Доступ к тикетам." if is_moderator_only else "Управление тикетами и настройками поддержки:"),
texts.t("ADMIN_SUPPORT_SUBMENU_TITLE", "🛟 **Поддержка**\n\n") + (
texts.t("ADMIN_SUPPORT_SUBMENU_DESCRIPTION_MODERATOR", "Доступ к тикетам.")
if is_moderator_only
else texts.t("ADMIN_SUPPORT_SUBMENU_DESCRIPTION", "Управление тикетами и настройками поддержки:")
),
reply_markup=kb,
parse_mode="Markdown"
)
@@ -150,12 +153,14 @@ async def show_moderator_panel(
db_user: User,
db: AsyncSession
):
texts = get_texts(db_user.language)
kb = InlineKeyboardMarkup(inline_keyboard=[
[InlineKeyboardButton(text="🎫 Тикеты поддержки", callback_data="admin_tickets")],
[InlineKeyboardButton(text="⬅️ В главное меню", callback_data="back_to_menu")]
[InlineKeyboardButton(text=texts.t("ADMIN_SUPPORT_TICKETS", "🎫 Тикеты поддержки"), callback_data="admin_tickets")],
[InlineKeyboardButton(text=texts.t("BACK_TO_MAIN_MENU_BUTTON", "⬅️ В главное меню"), callback_data="back_to_menu")]
])
await callback.message.edit_text(
"🧑‍⚖️ <b>Модерация поддержки</b>\n\nДоступ к тикетам поддержки.",
texts.t("ADMIN_SUPPORT_MODERATION_TITLE", "🧑‍⚖️ <b>Модерация поддержки</b>") + "\n\n" +
texts.t("ADMIN_SUPPORT_MODERATION_DESCRIPTION", "Доступ к тикетам поддержки."),
parse_mode="HTML",
reply_markup=kb
)
@@ -169,6 +174,7 @@ async def show_support_audit(
db_user: User,
db: AsyncSession
):
texts = get_texts(db_user.language)
# pagination
page = 1
if callback.data.startswith("admin_support_audit_page_"):
@@ -186,18 +192,22 @@ async def show_support_audit(
offset = (page - 1) * per_page
logs = await TicketCRUD.list_support_audit(db, limit=per_page, offset=offset)
lines = ["🧾 <b>Аудит модераторов</b>", ""]
lines = [texts.t("ADMIN_SUPPORT_AUDIT_TITLE", "🧾 <b>Аудит модераторов</b>"), ""]
if not logs:
lines.append("Пока пусто")
lines.append(texts.t("ADMIN_SUPPORT_AUDIT_EMPTY", "Пока пусто"))
else:
for log in logs:
role = "Модератор" if getattr(log, 'is_moderator', False) else "Админ"
role = (
texts.t("ADMIN_SUPPORT_AUDIT_ROLE_MODERATOR", "Модератор")
if getattr(log, 'is_moderator', False)
else texts.t("ADMIN_SUPPORT_AUDIT_ROLE_ADMIN", "Админ")
)
ts = log.created_at.strftime('%d.%m.%Y %H:%M') if getattr(log, 'created_at', None) else ''
action_map = {
'close_ticket': 'Закрытие тикета',
'block_user_timed': 'Блокировка (время)',
'block_user_perm': 'Блокировка (навсегда)',
'unblock_user': 'Снятие блока',
'close_ticket': texts.t("ADMIN_SUPPORT_AUDIT_ACTION_CLOSE_TICKET", "Закрытие тикета"),
'block_user_timed': texts.t("ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_TIMED", "Блокировка (время)"),
'block_user_perm': texts.t("ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_PERM", "Блокировка (навсегда)"),
'unblock_user': texts.t("ADMIN_SUPPORT_AUDIT_ACTION_UNBLOCK", "Снятие блока"),
}
action_text = action_map.get(log.action, log.action)
ticket_part = f" тикет #{log.ticket_id}" if log.ticket_id else ""
@@ -219,7 +229,7 @@ async def show_support_audit(
kb_rows = []
if nav_row:
kb_rows.append(nav_row)
kb_rows.append([InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_submenu_support")])
kb_rows.append([InlineKeyboardButton(text=texts.BACK, callback_data="admin_submenu_support")])
kb = InlineKeyboardMarkup(inline_keyboard=kb_rows)
await callback.message.edit_text("\n".join(lines), parse_mode="HTML", reply_markup=kb)
@@ -234,10 +244,10 @@ async def show_settings_submenu(
db: AsyncSession
):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"⚙️ **Настройки системы**\n\n"
"Управление Remnawave, мониторингом и другими настройками:",
texts.t("ADMIN_SETTINGS_SUBMENU_TITLE", "⚙️ **Настройки системы**\n\n") +
texts.t("ADMIN_SETTINGS_SUBMENU_DESCRIPTION", "Управление Remnawave, мониторингом и другими настройками:"),
reply_markup=get_admin_settings_submenu_keyboard(db_user.language),
parse_mode="Markdown"
)
@@ -252,10 +262,10 @@ async def show_system_submenu(
db: AsyncSession
):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"🛠️ **Системные функции**\n\n"
"Отчеты, обновления, резервные копии и системные операции:",
texts.t("ADMIN_SYSTEM_SUBMENU_TITLE", "🛠️ **Системные функции**\n\n") +
texts.t("ADMIN_SYSTEM_SUBMENU_DESCRIPTION", "Отчеты, обновления, логи, резервные копии и системные операции:"),
reply_markup=get_admin_system_submenu_keyboard(db_user.language),
parse_mode="Markdown"
)
+8 -8
View File
@@ -21,8 +21,8 @@ from app.keyboards.admin import (
get_custom_criteria_keyboard, get_broadcast_history_keyboard,
get_admin_pagination_keyboard, get_broadcast_media_keyboard,
get_media_confirm_keyboard, get_updated_message_buttons_selector_keyboard_with_media,
BROADCAST_BUTTONS, BROADCAST_BUTTON_ROWS, DEFAULT_BROADCAST_BUTTONS,
BROADCAST_BUTTON_LABELS
BROADCAST_BUTTON_ROWS, DEFAULT_BROADCAST_BUTTONS,
get_broadcast_button_config, get_broadcast_button_labels
)
from app.localization.texts import get_texts
from app.database.crud.user import get_users_list
@@ -31,10 +31,8 @@ from app.utils.decorators import admin_required, error_handler
logger = logging.getLogger(__name__)
BUTTON_CONFIG = BROADCAST_BUTTONS
BUTTON_ROWS = BROADCAST_BUTTON_ROWS
DEFAULT_SELECTED_BUTTONS = DEFAULT_BROADCAST_BUTTONS
BUTTON_LABELS = BROADCAST_BUTTON_LABELS
def get_message_buttons_selector_keyboard(language: str = "ru") -> types.InlineKeyboardMarkup:
@@ -45,16 +43,17 @@ def get_updated_message_buttons_selector_keyboard(selected_buttons: list, langua
return get_updated_message_buttons_selector_keyboard_with_media(selected_buttons, False, language)
def create_broadcast_keyboard(selected_buttons: list) -> Optional[types.InlineKeyboardMarkup]:
def create_broadcast_keyboard(selected_buttons: list, language: str = "ru") -> Optional[types.InlineKeyboardMarkup]:
selected_buttons = selected_buttons or []
keyboard: list[list[types.InlineKeyboardButton]] = []
button_config_map = get_broadcast_button_config(language)
for row in BUTTON_ROWS:
row_buttons: list[types.InlineKeyboardButton] = []
for button_key in row:
if button_key not in selected_buttons:
continue
button_config = BUTTON_CONFIG[button_key]
button_config = button_config_map[button_key]
row_buttons.append(
types.InlineKeyboardButton(
text=button_config["text"],
@@ -628,7 +627,8 @@ async def confirm_button_selection(
media_info = f"\n🖼️ <b>Медиафайл:</b> {media_type_names.get(media_type, media_type)}"
ordered_keys = [button_key for row in BUTTON_ROWS for button_key in row]
selected_names = [BUTTON_LABELS[key] for key in ordered_keys if key in selected_buttons]
button_labels = get_broadcast_button_labels(db_user.language)
selected_names = [button_labels[key] for key in ordered_keys if key in selected_buttons]
if selected_names:
buttons_info = f"\n📘 <b>Кнопки:</b> {', '.join(selected_names)}"
else:
@@ -745,7 +745,7 @@ async def confirm_broadcast(
sent_count = 0
failed_count = 0
broadcast_keyboard = create_broadcast_keyboard(selected_buttons)
broadcast_keyboard = create_broadcast_keyboard(selected_buttons, db_user.language)
for user in users:
try:
+60 -1
View File
@@ -37,6 +37,9 @@ def _build_notification_settings_view(language: str):
trial_1h_status = _format_toggle(config["trial_inactive_1h"].get("enabled", True))
trial_24h_status = _format_toggle(config["trial_inactive_24h"].get("enabled", True))
trial_channel_status = _format_toggle(
config["trial_channel_unsubscribed"].get("enabled", True)
)
expired_1d_status = _format_toggle(config["expired_1d"].get("enabled", True))
second_wave_status = _format_toggle(config["expired_second_wave"].get("enabled", True))
third_wave_status = _format_toggle(config["expired_third_wave"].get("enabled", True))
@@ -45,6 +48,7 @@ def _build_notification_settings_view(language: str):
"🔔 <b>Уведомления пользователям</b>\n\n"
f"• 1 час после триала: {trial_1h_status}\n"
f"• 24 часа после триала: {trial_24h_status}\n"
f"• Отписка от канала: {trial_channel_status}\n"
f"• 1 день после истечения: {expired_1d_status}\n"
f"• 2-3 дня (скидка {second_percent}% / {second_hours} ч): {second_wave_status}\n"
f"{third_days} дней (скидка {third_percent}% / {third_hours} ч): {third_wave_status}"
@@ -57,6 +61,8 @@ def _build_notification_settings_view(language: str):
[InlineKeyboardButton(text="🧪 Тест: 1 час после триала", callback_data="admin_mon_notify_preview_trial_1h")],
[InlineKeyboardButton(text=f"{trial_24h_status} • 24 часа после триала", callback_data="admin_mon_notify_toggle_trial_24h")],
[InlineKeyboardButton(text="🧪 Тест: 24 часа после триала", callback_data="admin_mon_notify_preview_trial_24h")],
[InlineKeyboardButton(text=f"{trial_channel_status} • Отписка от канала", callback_data="admin_mon_notify_toggle_trial_channel")],
[InlineKeyboardButton(text="🧪 Тест: отписка от канала", callback_data="admin_mon_notify_preview_trial_channel")],
[InlineKeyboardButton(text=f"{expired_1d_status} • 1 день после истечения", callback_data="admin_mon_notify_toggle_expired_1d")],
[InlineKeyboardButton(text="🧪 Тест: 1 день после истечения", callback_data="admin_mon_notify_preview_expired_1d")],
[InlineKeyboardButton(text=f"{second_wave_status} • 2-3 дня со скидкой", callback_data="admin_mon_notify_toggle_expired_2d")],
@@ -153,6 +159,36 @@ def _build_notification_preview_message(language: str, notification_type: str):
],
]
)
elif notification_type == "trial_channel_unsubscribed":
template = texts.get(
"TRIAL_CHANNEL_UNSUBSCRIBED",
(
"🚫 <b>Доступ приостановлен</b>\n\n"
"Мы не нашли вашу подписку на наш канал, поэтому тестовая подписка отключена.\n\n"
"Подпишитесь на канал и нажмите «{check_button}», чтобы вернуть доступ."
),
)
check_button = texts.t("CHANNEL_CHECK_BUTTON", "✅ Я подписался")
message = template.format(check_button=check_button)
buttons: list[list[InlineKeyboardButton]] = []
if settings.CHANNEL_LINK:
buttons.append(
[
InlineKeyboardButton(
text=texts.t("CHANNEL_SUBSCRIBE_BUTTON", "🔗 Подписаться"),
url=settings.CHANNEL_LINK,
)
]
)
buttons.append(
[
InlineKeyboardButton(
text=check_button,
callback_data="sub_channel_check",
)
]
)
keyboard = InlineKeyboardMarkup(inline_keyboard=buttons)
elif notification_type == "expired_1d":
template = texts.get(
"SUBSCRIPTION_EXPIRED_1D",
@@ -368,7 +404,8 @@ async def admin_monitoring_menu(callback: CallbackQuery):
🔧 Выберите действие:
"""
keyboard = get_monitoring_keyboard()
language = callback.from_user.language_code or settings.DEFAULT_LANGUAGE
keyboard = get_monitoring_keyboard(language)
await callback.message.edit_text(text, parse_mode="HTML", reply_markup=keyboard)
break
@@ -461,6 +498,27 @@ async def preview_trial_24h_notification(callback: CallbackQuery):
await callback.answer("❌ Не удалось отправить тест", show_alert=True)
@router.callback_query(F.data == "admin_mon_notify_toggle_trial_channel")
@admin_required
async def toggle_trial_channel_notification(callback: CallbackQuery):
enabled = NotificationSettingsService.is_trial_channel_unsubscribed_enabled()
NotificationSettingsService.set_trial_channel_unsubscribed_enabled(not enabled)
await callback.answer("✅ Включено" if not enabled else "⏸️ Отключено")
await _render_notification_settings(callback)
@router.callback_query(F.data == "admin_mon_notify_preview_trial_channel")
@admin_required
async def preview_trial_channel_notification(callback: CallbackQuery):
try:
language = callback.from_user.language_code or settings.DEFAULT_LANGUAGE
await _send_notification_preview(callback.bot, callback.from_user.id, language, "trial_channel_unsubscribed")
await callback.answer("✅ Пример отправлен")
except Exception as exc:
logger.error("Failed to send trial channel preview: %s", exc)
await callback.answer("❌ Не удалось отправить тест", show_alert=True)
@router.callback_query(F.data == "admin_mon_notify_toggle_expired_1d")
@admin_required
async def toggle_expired_1d_notification(callback: CallbackQuery):
@@ -533,6 +591,7 @@ async def preview_all_notifications(callback: CallbackQuery):
for notification_type in [
"trial_inactive_1h",
"trial_inactive_24h",
"trial_channel_unsubscribed",
"expired_1d",
"expired_2d",
"expired_nd",
+110 -79
View File
@@ -4,6 +4,7 @@ import html
import contextlib
from aiogram import Dispatcher, types, F
from aiogram.fsm.context import FSMContext
from aiogram.fsm.state import State, StatesGroup
from sqlalchemy.ext.asyncio import AsyncSession
from app.database.models import User
@@ -28,33 +29,63 @@ def _get_support_settings_keyboard(language: str) -> types.InlineKeyboardMarkup:
rows: list[list[types.InlineKeyboardButton]] = []
status_enabled = texts.t("ADMIN_SUPPORT_SETTINGS_STATUS_ENABLED", "Включены")
status_disabled = texts.t("ADMIN_SUPPORT_SETTINGS_STATUS_DISABLED", "Отключены")
def mode_button(label_key: str, default: str, active: bool) -> str:
prefix = "🔘" if active else ""
return f"{prefix} {texts.t(label_key, default)}"
rows.append([
types.InlineKeyboardButton(
text=("✅ Пункт 'Техподдержка' в меню" if menu_enabled else "🚫 Пункт 'Техподдержка' в меню"),
text=(
f"{'' if menu_enabled else '🚫'} "
f"{texts.t('ADMIN_SUPPORT_SETTINGS_MENU_LABEL', 'Пункт «Техподдержка» в меню')}"
),
callback_data="admin_support_toggle_menu"
)
])
rows.append([
types.InlineKeyboardButton(text=("🔘 Тикеты" if mode == "tickets" else "⚪ Тикеты"), callback_data="admin_support_mode_tickets"),
types.InlineKeyboardButton(text=("🔘 Контакт" if mode == "contact" else "⚪ Контакт"), callback_data="admin_support_mode_contact"),
types.InlineKeyboardButton(text=("🔘 Оба" if mode == "both" else "⚪ Оба"), callback_data="admin_support_mode_both"),
types.InlineKeyboardButton(
text=mode_button("ADMIN_SUPPORT_SETTINGS_MODE_TICKETS", "Тикеты", mode == "tickets"),
callback_data="admin_support_mode_tickets"
),
types.InlineKeyboardButton(
text=mode_button("ADMIN_SUPPORT_SETTINGS_MODE_CONTACT", "Контакт", mode == "contact"),
callback_data="admin_support_mode_contact"
),
types.InlineKeyboardButton(
text=mode_button("ADMIN_SUPPORT_SETTINGS_MODE_BOTH", "Оба", mode == "both"),
callback_data="admin_support_mode_both"
),
])
rows.append([
types.InlineKeyboardButton(text="📝 Изменить описание", callback_data="admin_support_edit_desc")
types.InlineKeyboardButton(
text=texts.t("ADMIN_SUPPORT_SETTINGS_EDIT_DESCRIPTION", "📝 Изменить описание"),
callback_data="admin_support_edit_desc"
)
])
# Notifications block
rows.append([
types.InlineKeyboardButton(
text=("🔔 Админ-уведомления: Включены" if admin_notif else "🔕 Админ-уведомления: Отключены"),
text=(
f"{'🔔' if admin_notif else '🔕'} "
f"{texts.t('ADMIN_SUPPORT_SETTINGS_ADMIN_NOTIFICATIONS', 'Админ-уведомления')}: "
f"{status_enabled if admin_notif else status_disabled}"
),
callback_data="admin_support_toggle_admin_notifications"
)
])
rows.append([
types.InlineKeyboardButton(
text=("🔔 Пользовательские уведомления: Включены" if user_notif else "🔕 Пользовательские уведомления: Отключены"),
text=(
f"{'🔔' if user_notif else '🔕'} "
f"{texts.t('ADMIN_SUPPORT_SETTINGS_USER_NOTIFICATIONS', 'Пользовательские уведомления')}: "
f"{status_enabled if user_notif else status_disabled}"
),
callback_data="admin_support_toggle_user_notifications"
)
])
@@ -62,13 +93,17 @@ def _get_support_settings_keyboard(language: str) -> types.InlineKeyboardMarkup:
# SLA block
rows.append([
types.InlineKeyboardButton(
text=("⏰ SLA: Включено" if sla_enabled else "⏹️ SLA: Отключено"),
text=(
f"{'' if sla_enabled else '⏹️'} "
f"{texts.t('ADMIN_SUPPORT_SETTINGS_SLA_LABEL', 'SLA')}: "
f"{status_enabled if sla_enabled else status_disabled}"
),
callback_data="admin_support_toggle_sla"
)
])
rows.append([
types.InlineKeyboardButton(
text=f"⏳ Время SLA: {sla_minutes} мин",
text=texts.t("ADMIN_SUPPORT_SETTINGS_SLA_TIME", "⏳ Время SLA: {minutes} мин").format(minutes=sla_minutes),
callback_data="admin_support_set_sla_minutes"
)
])
@@ -78,15 +113,18 @@ def _get_support_settings_keyboard(language: str) -> types.InlineKeyboardMarkup:
mod_count = len(moderators)
rows.append([
types.InlineKeyboardButton(
text=f"🧑‍⚖️ Модераторы: {mod_count}", callback_data="admin_support_list_moderators"
text=texts.t("ADMIN_SUPPORT_SETTINGS_MODERATORS_COUNT", "🧑‍⚖️ Модераторы: {count}").format(count=mod_count),
callback_data="admin_support_list_moderators"
)
])
rows.append([
types.InlineKeyboardButton(
text="➕ Назначить модератора", callback_data="admin_support_add_moderator"
text=texts.t("ADMIN_SUPPORT_SETTINGS_ADD_MODERATOR", "➕ Назначить модератора"),
callback_data="admin_support_add_moderator"
),
types.InlineKeyboardButton(
text="➖ Удалить модератора", callback_data="admin_support_remove_moderator"
text=texts.t("ADMIN_SUPPORT_SETTINGS_REMOVE_MODERATOR", "➖ Удалить модератора"),
callback_data="admin_support_remove_moderator"
)
])
@@ -107,8 +145,8 @@ async def show_support_settings(
texts = get_texts(db_user.language)
desc = SupportSettingsService.get_support_info_text(db_user.language)
await callback.message.edit_text(
"🛟 <b>Настройки поддержки</b>\n\n" +
"Режим работы и видимость в меню. Ниже текущее описание меню поддержки:\n\n" +
texts.t("ADMIN_SUPPORT_SETTINGS_TITLE", "🛟 <b>Настройки поддержки</b>") + "\n\n" +
texts.t("ADMIN_SUPPORT_SETTINGS_DESCRIPTION", "Режим работы и видимость в меню. Ниже текущее описание меню поддержки:") + "\n\n" +
desc,
reply_markup=_get_support_settings_keyboard(db_user.language),
parse_mode="HTML"
@@ -152,24 +190,6 @@ async def toggle_sla(callback: types.CallbackQuery, db_user: User, db: AsyncSess
await show_support_settings(callback, db_user, db)
from app.states import SupportSettingsStates
@admin_required
@error_handler
async def start_set_sla_minutes(callback: types.CallbackQuery, db_user: User, db: AsyncSession, state: FSMContext):
await callback.message.edit_text(
"⏳ <b>Настройка SLA</b>\n\nВведите количество минут ожидания ответа (целое число > 0):",
parse_mode="HTML",
reply_markup=types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_support_settings")]]
)
)
await state.set_state(SupportSettingsStates.waiting_for_desc) # temporary reuse replaced below
# we'll manage separate state below
from aiogram.fsm.state import State, StatesGroup
class SupportAdvancedStates(StatesGroup):
waiting_for_sla_minutes = State()
waiting_for_moderator_id = State()
@@ -178,11 +198,15 @@ class SupportAdvancedStates(StatesGroup):
@admin_required
@error_handler
async def start_set_sla_minutes(callback: types.CallbackQuery, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"⏳ <b>Настройка SLA</b>\n\nВведите количество минут ожидания ответа (целое число > 0):",
texts.t(
"ADMIN_SUPPORT_SLA_SETUP_PROMPT",
"⏳ <b>Настройка SLA</b>\n\nВведите количество минут ожидания ответа (целое число > 0):"
),
parse_mode="HTML",
reply_markup=types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_support_settings")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.BACK, callback_data="admin_support_settings")]]
)
)
await state.set_state(SupportAdvancedStates.waiting_for_sla_minutes)
@@ -192,63 +216,53 @@ async def start_set_sla_minutes(callback: types.CallbackQuery, db_user: User, db
@admin_required
@error_handler
async def handle_sla_minutes(message: types.Message, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
text = (message.text or "").strip()
try:
minutes = int(text)
if minutes <= 0 or minutes > 1440:
raise ValueError()
except Exception:
await message.answer("❌ Введите корректное число минут (1-1440)")
await message.answer(texts.t("ADMIN_SUPPORT_SLA_INVALID", "❌ Введите корректное число минут (1-1440)"))
return
SupportSettingsService.set_sla_minutes(minutes)
await state.clear()
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="🗑 Удалить", callback_data="admin_support_delete_msg")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.t("DELETE_MESSAGE", "🗑 Удалить"), callback_data="admin_support_delete_msg")]]
)
await message.answer("✅ Значение SLA сохранено", reply_markup=markup)
await message.answer(texts.t("ADMIN_SUPPORT_SLA_SAVED", "✅ Значение SLA сохранено"), reply_markup=markup)
@admin_required
@error_handler
async def start_add_moderator(callback: types.CallbackQuery, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"🧑‍⚖️ <b>Назначение модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
texts.t(
"ADMIN_SUPPORT_ASSIGN_MODERATOR_PROMPT",
"🧑‍⚖️ <b>Назначение модератора</b>\n\nОтправьте Telegram ID пользователя (число)"
),
parse_mode="HTML",
reply_markup=types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_support_settings")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.BACK, callback_data="admin_support_settings")]]
)
)
await state.set_state(SupportAdvancedStates.waiting_for_moderator_id)
await callback.answer()
@admin_required
@error_handler
async def handle_add_moderator(message: types.Message, db_user: User, db: AsyncSession, state: FSMContext):
text = (message.text or "").strip()
try:
tid = int(text)
except Exception:
await message.answer("❌ Введите корректный Telegram ID (число)")
return
if SupportSettingsService.add_moderator(tid):
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="🗑 Удалить", callback_data="admin_support_delete_msg")]]
)
await message.answer(f"✅ Пользователь {tid} назначен модератором", reply_markup=markup)
else:
await message.answer("❌ Не удалось сохранить")
await state.clear()
@admin_required
@error_handler
async def start_remove_moderator(callback: types.CallbackQuery, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
await callback.message.edit_text(
"🧑‍⚖️ <b>Удаление модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
texts.t(
"ADMIN_SUPPORT_REMOVE_MODERATOR_PROMPT",
"🧑‍⚖️ <b>Удаление модератора</b>\n\nОтправьте Telegram ID пользователя (число)"
),
parse_mode="HTML",
reply_markup=types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_support_settings")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.BACK, callback_data="admin_support_settings")]]
)
)
await state.set_state(SupportAdvancedStates.waiting_for_moderator_id)
@@ -260,24 +274,32 @@ async def start_remove_moderator(callback: types.CallbackQuery, db_user: User, d
@admin_required
@error_handler
async def handle_moderator_id(message: types.Message, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
data = await state.get_data()
action = data.get("action", "add")
text = (message.text or "").strip()
try:
tid = int(text)
except Exception:
await message.answer("❌ Введите корректный Telegram ID (число)")
await message.answer(texts.t("ADMIN_SUPPORT_INVALID_TELEGRAM_ID", "❌ Введите корректный Telegram ID (число)"))
return
ok = False
if action == "remove_moderator":
ok = SupportSettingsService.remove_moderator(tid)
msg = "✅ Модератор удалён" if ok else "❌ Не удалось удалить"
msg = (
texts.t("ADMIN_SUPPORT_MODERATOR_REMOVED_SUCCESS", "✅ Модератор {tid} удалён").format(tid=tid)
if ok
else texts.t("ADMIN_SUPPORT_MODERATOR_REMOVED_FAIL", "❌ Не удалось удалить модератора")
)
else:
ok = SupportSettingsService.add_moderator(tid)
msg = "✅ Пользователь назначен модератором" if ok else "❌ Не удалось назначить"
msg = (
texts.t("ADMIN_SUPPORT_MODERATOR_ADDED_SUCCESS", "✅ Пользователь {tid} назначен модератором").format(tid=tid)
if ok
else texts.t("ADMIN_SUPPORT_MODERATOR_ADDED_FAIL", "❌ Не удалось назначить модератора")
)
await state.clear()
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="🗑 Удалить", callback_data="admin_support_delete_msg")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.t("DELETE_MESSAGE", "🗑 Удалить"), callback_data="admin_support_delete_msg")]]
)
await message.answer(msg, reply_markup=markup)
@@ -285,13 +307,17 @@ async def handle_moderator_id(message: types.Message, db_user: User, db: AsyncSe
@admin_required
@error_handler
async def list_moderators(callback: types.CallbackQuery, db_user: User, db: AsyncSession):
texts = get_texts(db_user.language)
moderators = SupportSettingsService.get_moderators()
if not moderators:
await callback.answer("Список пуст", show_alert=True)
await callback.answer(texts.t("ADMIN_SUPPORT_MODERATORS_EMPTY", "Список пуст"), show_alert=True)
return
text = "🧑‍⚖️ <b>Модераторы</b>\n\n" + "\n".join([f"• <code>{tid}</code>" for tid in moderators])
text = (
texts.t("ADMIN_SUPPORT_MODERATORS_TITLE", "🧑‍⚖️ <b>Модераторы</b>") +
"\n\n" + "\n".join([f"• <code>{tid}</code>" for tid in moderators])
)
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_support_settings")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.BACK, callback_data="admin_support_settings")]]
)
await callback.message.edit_text(text, parse_mode="HTML", reply_markup=markup)
await callback.answer()
@@ -328,7 +354,10 @@ async def start_edit_desc(callback: types.CallbackQuery, db_user: User, db: Asyn
kb_rows: list[list[types.InlineKeyboardButton]] = []
kb_rows.append([
types.InlineKeyboardButton(text="📨 Прислать текст", callback_data="admin_support_send_desc")
types.InlineKeyboardButton(
text=texts.t("ADMIN_SUPPORT_SEND_DESCRIPTION", "📨 Прислать текст"),
callback_data="admin_support_send_desc"
)
])
# Подготовим блок контакта (отдельным инлайном)
from app.config import settings
@@ -338,19 +367,19 @@ async def start_edit_desc(callback: types.CallbackQuery, db_user: User, db: Asyn
])
text_parts = [
"📝 <b>Редактирование описания поддержки</b>",
texts.t("ADMIN_SUPPORT_EDIT_DESCRIPTION_TITLE", "📝 <b>Редактирование описания поддержки</b>"),
"",
"Текущее описание:",
texts.t("ADMIN_SUPPORT_EDIT_DESCRIPTION_CURRENT", "Текущее описание:"),
"",
f"<code>{html.escape(current_desc_plain)}</code>",
]
if support_contact_display:
text_parts += [
"",
"<b>Контакт для режима \u00abКонтакт\u00bb</b>",
texts.t("ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_TITLE", "<b>Контакт для режима «Контакт»</b>"),
f"<code>{html.escape(support_contact_display)}</code>",
"",
"Добавьте в описание при необходимости.",
texts.t("ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_HINT", "Добавьте в описание при необходимости."),
]
await callback.message.edit_text(
"\n".join(text_parts),
@@ -364,24 +393,26 @@ async def start_edit_desc(callback: types.CallbackQuery, db_user: User, db: Asyn
@admin_required
@error_handler
async def handle_new_desc(message: types.Message, db_user: User, db: AsyncSession, state: FSMContext):
texts = get_texts(db_user.language)
new_text = message.html_text or message.text
SupportSettingsService.set_support_info_text(db_user.language, new_text)
await state.clear()
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="🗑 Удалить", callback_data="admin_support_delete_msg")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.t("DELETE_MESSAGE", "🗑 Удалить"), callback_data="admin_support_delete_msg")]]
)
await message.answer("✅ Описание обновлено.", reply_markup=markup)
await message.answer(texts.t("ADMIN_SUPPORT_DESCRIPTION_UPDATED", "✅ Описание обновлено."), reply_markup=markup)
@admin_required
@error_handler
async def send_desc_copy(callback: types.CallbackQuery, db_user: User, db: AsyncSession):
# send plain text for easy copying
texts = get_texts(db_user.language)
current_desc_html = SupportSettingsService.get_support_info_text(db_user.language)
current_desc_plain = re.sub(r"<[^>]+>", "", current_desc_html)
# attach delete button to the sent message
markup = types.InlineKeyboardMarkup(
inline_keyboard=[[types.InlineKeyboardButton(text="🗑 Удалить", callback_data="admin_support_delete_msg")]]
inline_keyboard=[[types.InlineKeyboardButton(text=texts.t("DELETE_MESSAGE", "🗑 Удалить"), callback_data="admin_support_delete_msg")]]
)
if len(current_desc_plain) <= 4000:
await callback.message.answer(current_desc_plain, reply_markup=markup)
@@ -393,7 +424,7 @@ async def send_desc_copy(callback: types.CallbackQuery, db_user: User, db: Async
is_last = (chunk + 4000) >= len(current_desc_plain)
await callback.message.answer(next_chunk, reply_markup=(markup if is_last else None))
chunk += 4000
await callback.answer("Текст отправлен ниже")
await callback.answer(texts.t("ADMIN_SUPPORT_DESCRIPTION_SENT", "Текст отправлен ниже"))
@error_handler
@@ -403,15 +434,15 @@ async def delete_sent_message(callback: types.CallbackQuery, db_user: User, db:
may_delete = (settings.is_admin(callback.from_user.id) or SupportSettingsService.is_moderator(callback.from_user.id))
except Exception:
may_delete = False
texts = get_texts(db_user.language if db_user else 'ru')
if not may_delete:
texts = get_texts(db_user.language if db_user else 'ru')
await callback.answer(texts.ACCESS_DENIED, show_alert=True)
return
try:
await callback.message.delete()
finally:
with contextlib.suppress(Exception):
await callback.answer("Сообщение удалено")
await callback.answer(texts.t("ADMIN_SUPPORT_MESSAGE_DELETED", "Сообщение удалено"))
def register_handlers(dp: Dispatcher):
+165
View File
@@ -0,0 +1,165 @@
import logging
from datetime import datetime
from html import escape
from pathlib import Path
from aiogram import Dispatcher, F, types
from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup, FSInputFile
from sqlalchemy.ext.asyncio import AsyncSession
from app.config import settings
from app.database.models import User
from app.utils.decorators import admin_required, error_handler
logger = logging.getLogger(__name__)
LOG_PREVIEW_LIMIT = 2300
def _resolve_log_path() -> Path:
log_path = Path(settings.LOG_FILE)
if not log_path.is_absolute():
log_path = Path.cwd() / log_path
return log_path
def _format_preview_block(text: str) -> str:
escaped_text = escape(text) if text else ""
return f"<blockquote expandable><pre><code>{escaped_text}</code></pre></blockquote>"
def _build_logs_message(log_path: Path) -> str:
if not log_path.exists():
message = (
"🧾 <b>Системные логи</b>\n\n"
f"Файл <code>{log_path}</code> пока не создан.\n"
"Логи появятся автоматически после первой записи."
)
return message
try:
content = log_path.read_text(encoding="utf-8", errors="ignore")
except Exception as error: # pragma: no cover - защита от проблем чтения
logger.error("Ошибка чтения лог-файла %s: %s", log_path, error)
message = (
"❌ <b>Ошибка чтения логов</b>\n\n"
f"Не удалось прочитать файл <code>{log_path}</code>."
)
return message
total_length = len(content)
stats = log_path.stat()
updated_at = datetime.fromtimestamp(stats.st_mtime)
if not content:
preview_text = "Лог-файл пуст."
truncated = False
else:
preview_text = content[-LOG_PREVIEW_LIMIT:]
truncated = total_length > LOG_PREVIEW_LIMIT
details_lines = [
"🧾 <b>Системные логи</b>",
"",
f"📁 <b>Файл:</b> <code>{log_path}</code>",
f"🕒 <b>Обновлен:</b> {updated_at.strftime('%d.%m.%Y %H:%M:%S')}",
f"🧮 <b>Размер:</b> {total_length} символов",
(
f"👇 Показаны последние {LOG_PREVIEW_LIMIT} символов."
if truncated
else "📄 Показано все содержимое файла."
),
"",
_format_preview_block(preview_text),
]
return "\n".join(details_lines)
def _get_logs_keyboard() -> InlineKeyboardMarkup:
return InlineKeyboardMarkup(
inline_keyboard=[
[InlineKeyboardButton(text="🔄 Обновить", callback_data="admin_system_logs_refresh")],
[InlineKeyboardButton(text="⬇️ Скачать лог", callback_data="admin_system_logs_download")],
[InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_submenu_system")],
]
)
@admin_required
@error_handler
async def show_system_logs(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
):
log_path = _resolve_log_path()
message = _build_logs_message(log_path)
reply_markup = _get_logs_keyboard()
await callback.message.edit_text(message, reply_markup=reply_markup, parse_mode="HTML")
await callback.answer()
@admin_required
@error_handler
async def refresh_system_logs(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
):
log_path = _resolve_log_path()
message = _build_logs_message(log_path)
reply_markup = _get_logs_keyboard()
await callback.message.edit_text(message, reply_markup=reply_markup, parse_mode="HTML")
await callback.answer("🔄 Обновлено")
@admin_required
@error_handler
async def download_system_logs(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
):
log_path = _resolve_log_path()
if not log_path.exists() or not log_path.is_file():
await callback.answer("❌ Лог-файл не найден", show_alert=True)
return
try:
await callback.answer("⬇️ Отправляю лог...")
document = FSInputFile(log_path)
stats = log_path.stat()
updated_at = datetime.fromtimestamp(stats.st_mtime).strftime("%d.%m.%Y %H:%M:%S")
caption = (
f"🧾 Лог-файл <code>{log_path.name}</code>\n"
f"📁 Путь: <code>{log_path}</code>\n"
f"🕒 Обновлен: {updated_at}"
)
await callback.message.answer_document(document=document, caption=caption, parse_mode="HTML")
except Exception as error: # pragma: no cover - защита от ошибок отправки
logger.error("Ошибка отправки лог-файла %s: %s", log_path, error)
await callback.message.answer(
"❌ <b>Не удалось отправить лог-файл</b>\n\n"
"Проверьте журналы приложения или повторите попытку позже.",
parse_mode="HTML",
)
def register_handlers(dp: Dispatcher):
dp.callback_query.register(
show_system_logs,
F.data == "admin_system_logs",
)
dp.callback_query.register(
refresh_system_logs,
F.data == "admin_system_logs_refresh",
)
dp.callback_query.register(
download_system_logs,
F.data == "admin_system_logs_download",
)
+673 -51
View File
@@ -80,7 +80,7 @@ async def show_users_filters(
state: FSMContext
):
text = "⚙️ <b>Фильтры пользователей</b>\n\nВыберите фильтр для отображения пользователей:"
text = ("⚙️ <b>Фильтры пользователей</b>\n\nВыберите фильтр для отображения пользователей:\n")
await callback.message.edit_text(
text,
@@ -142,7 +142,7 @@ async def show_users_list(
if user.balance_kopeks > 0:
button_text += f" | 💰 {settings.format_price(user.balance_kopeks)}"
button_text += f" | 📅 {format_time_ago(user.created_at)}"
button_text += f" | 📅 {format_time_ago(user.created_at, db_user.language)}"
if len(button_text) > 60:
short_name = user.full_name
@@ -288,6 +288,464 @@ async def show_users_list_by_balance(
await callback.answer()
@admin_required
@error_handler
async def show_users_list_by_traffic(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext,
page: int = 1
):
await state.set_state(AdminStates.viewing_user_from_traffic_list)
user_service = UserService()
users_data = await user_service.get_users_page(
db, page=page, limit=10, order_by_traffic=True
)
if not users_data["users"]:
await callback.message.edit_text(
"📶 Пользователи с трафиком не найдены",
reply_markup=get_admin_users_keyboard(db_user.language)
)
await callback.answer()
return
text = f"👥 <b>Список пользователей по использованному трафику</b> (стр. {page}/{users_data['total_pages']})\n\n"
text += "Нажмите на пользователя для управления:"
keyboard = []
for user in users_data["users"]:
if user.status == UserStatus.ACTIVE.value:
status_emoji = ""
elif user.status == UserStatus.BLOCKED.value:
status_emoji = "🚫"
else:
status_emoji = "🗑️"
if user.subscription:
sub = user.subscription
if sub.is_trial:
subscription_emoji = "🎁"
elif sub.is_active:
subscription_emoji = "💎"
else:
subscription_emoji = ""
used = sub.traffic_used_gb or 0.0
if sub.traffic_limit_gb and sub.traffic_limit_gb > 0:
limit_display = f"{sub.traffic_limit_gb}"
else:
limit_display = "♾️"
traffic_display = f"{used:.1f}/{limit_display} ГБ"
else:
subscription_emoji = ""
traffic_display = "нет подписки"
button_text = f"{status_emoji} {subscription_emoji} {user.full_name}"
button_text += f" | 📶 {traffic_display}"
if user.balance_kopeks > 0:
button_text += f" | 💰 {settings.format_price(user.balance_kopeks)}"
if len(button_text) > 60:
short_name = user.full_name
if len(short_name) > 20:
short_name = short_name[:17] + "..."
button_text = f"{status_emoji} {subscription_emoji} {short_name}"
button_text += f" | 📶 {traffic_display}"
keyboard.append([
types.InlineKeyboardButton(
text=button_text,
callback_data=f"admin_user_manage_{user.id}"
)
])
if users_data["total_pages"] > 1:
pagination_row = get_admin_pagination_keyboard(
users_data["current_page"],
users_data["total_pages"],
"admin_users_traffic_list",
"admin_users",
db_user.language
).inline_keyboard[0]
keyboard.append(pagination_row)
keyboard.extend([
[
types.InlineKeyboardButton(text="🔍 Поиск", callback_data="admin_users_search"),
types.InlineKeyboardButton(text="📊 Статистика", callback_data="admin_users_stats")
],
[
types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_users")
]
])
await callback.message.edit_text(
text,
reply_markup=types.InlineKeyboardMarkup(inline_keyboard=keyboard)
)
await callback.answer()
@admin_required
@error_handler
async def show_users_list_by_last_activity(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext,
page: int = 1
):
await state.set_state(AdminStates.viewing_user_from_last_activity_list)
user_service = UserService()
users_data = await user_service.get_users_page(
db,
page=page,
limit=10,
order_by_last_activity=True,
)
if not users_data["users"]:
await callback.message.edit_text(
"🕒 Пользователи с активностью не найдены",
reply_markup=get_admin_users_keyboard(db_user.language)
)
await callback.answer()
return
text = f"👥 <b>Пользователи по активности</b> (стр. {page}/{users_data['total_pages']})\n\n"
text += "Нажмите на пользователя для управления:"
keyboard = []
for user in users_data["users"]:
if user.status == UserStatus.ACTIVE.value:
status_emoji = ""
elif user.status == UserStatus.BLOCKED.value:
status_emoji = "🚫"
else:
status_emoji = "🗑️"
activity_display = (
format_time_ago(user.last_activity, db_user.language)
if user.last_activity
else "неизвестно"
)
subscription_emoji = ""
if user.subscription:
if user.subscription.is_trial:
subscription_emoji = "🎁"
elif user.subscription.is_active:
subscription_emoji = "💎"
else:
subscription_emoji = ""
button_text = f"{status_emoji} {subscription_emoji} {user.full_name}"
button_text += f" | 🕒 {activity_display}"
keyboard.append([
types.InlineKeyboardButton(
text=button_text,
callback_data=f"admin_user_manage_{user.id}"
)
])
if users_data["total_pages"] > 1:
pagination_row = get_admin_pagination_keyboard(
users_data["current_page"],
users_data["total_pages"],
"admin_users_activity_list",
"admin_users",
db_user.language
).inline_keyboard[0]
keyboard.append(pagination_row)
keyboard.extend([
[
types.InlineKeyboardButton(text="🔍 Поиск", callback_data="admin_users_search"),
types.InlineKeyboardButton(text="📊 Статистика", callback_data="admin_users_stats")
],
[
types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_users")
]
])
await callback.message.edit_text(
text,
reply_markup=types.InlineKeyboardMarkup(inline_keyboard=keyboard)
)
await callback.answer()
@admin_required
@error_handler
async def show_users_list_by_spending(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext,
page: int = 1
):
await state.set_state(AdminStates.viewing_user_from_spending_list)
user_service = UserService()
users_data = await user_service.get_users_page(
db,
page=page,
limit=10,
order_by_total_spent=True,
)
users = users_data["users"]
if not users:
await callback.message.edit_text(
"💳 Пользователи с тратами не найдены",
reply_markup=get_admin_users_keyboard(db_user.language)
)
await callback.answer()
return
spending_map = await user_service.get_user_spending_stats_map(
db,
[user.id for user in users],
)
text = f"👥 <b>Пользователи по сумме трат</b> (стр. {page}/{users_data['total_pages']})\n\n"
text += "Нажмите на пользователя для управления:"
keyboard = []
for user in users:
stats = spending_map.get(
user.id,
{"total_spent": 0, "purchase_count": 0},
)
total_spent = stats.get("total_spent", 0)
purchases = stats.get("purchase_count", 0)
status_emoji = "" if user.status == UserStatus.ACTIVE.value else "🚫" if user.status == UserStatus.BLOCKED.value else "🗑️"
button_text = (
f"{status_emoji} {user.full_name}"
f" | 💳 {settings.format_price(total_spent)}"
f" | 🛒 {purchases}"
)
keyboard.append([
types.InlineKeyboardButton(
text=button_text,
callback_data=f"admin_user_manage_{user.id}"
)
])
if users_data["total_pages"] > 1:
pagination_row = get_admin_pagination_keyboard(
users_data["current_page"],
users_data["total_pages"],
"admin_users_spending_list",
"admin_users",
db_user.language
).inline_keyboard[0]
keyboard.append(pagination_row)
keyboard.extend([
[
types.InlineKeyboardButton(text="🔍 Поиск", callback_data="admin_users_search"),
types.InlineKeyboardButton(text="📊 Статистика", callback_data="admin_users_stats")
],
[
types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_users")
]
])
await callback.message.edit_text(
text,
reply_markup=types.InlineKeyboardMarkup(inline_keyboard=keyboard)
)
await callback.answer()
@admin_required
@error_handler
async def show_users_list_by_purchases(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext,
page: int = 1
):
await state.set_state(AdminStates.viewing_user_from_purchases_list)
user_service = UserService()
users_data = await user_service.get_users_page(
db,
page=page,
limit=10,
order_by_purchase_count=True,
)
users = users_data["users"]
if not users:
await callback.message.edit_text(
"🛒 Пользователи с покупками не найдены",
reply_markup=get_admin_users_keyboard(db_user.language)
)
await callback.answer()
return
spending_map = await user_service.get_user_spending_stats_map(
db,
[user.id for user in users],
)
text = f"👥 <b>Пользователи по количеству покупок</b> (стр. {page}/{users_data['total_pages']})\n\n"
text += "Нажмите на пользователя для управления:"
keyboard = []
for user in users:
stats = spending_map.get(
user.id,
{"total_spent": 0, "purchase_count": 0},
)
total_spent = stats.get("total_spent", 0)
purchases = stats.get("purchase_count", 0)
status_emoji = "" if user.status == UserStatus.ACTIVE.value else "🚫" if user.status == UserStatus.BLOCKED.value else "🗑️"
button_text = (
f"{status_emoji} {user.full_name}"
f" | 🛒 {purchases}"
f" | 💳 {settings.format_price(total_spent)}"
)
keyboard.append([
types.InlineKeyboardButton(
text=button_text,
callback_data=f"admin_user_manage_{user.id}"
)
])
if users_data["total_pages"] > 1:
pagination_row = get_admin_pagination_keyboard(
users_data["current_page"],
users_data["total_pages"],
"admin_users_purchases_list",
"admin_users",
db_user.language
).inline_keyboard[0]
keyboard.append(pagination_row)
keyboard.extend([
[
types.InlineKeyboardButton(text="🔍 Поиск", callback_data="admin_users_search"),
types.InlineKeyboardButton(text="📊 Статистика", callback_data="admin_users_stats")
],
[
types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_users")
]
])
await callback.message.edit_text(
text,
reply_markup=types.InlineKeyboardMarkup(inline_keyboard=keyboard)
)
await callback.answer()
@admin_required
@error_handler
async def show_users_list_by_campaign(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext,
page: int = 1
):
await state.set_state(AdminStates.viewing_user_from_campaign_list)
user_service = UserService()
users_data = await user_service.get_users_by_campaign_page(
db,
page=page,
limit=10,
)
users = users_data.get("users", [])
campaign_map = users_data.get("campaigns", {})
if not users:
await callback.message.edit_text(
"📢 Пользователи с кампанией не найдены",
reply_markup=get_admin_users_keyboard(db_user.language)
)
await callback.answer()
return
text = f"👥 <b>Пользователи по кампании регистрации</b> (стр. {page}/{users_data['total_pages']})\n\n"
text += "Нажмите на пользователя для управления:"
keyboard = []
for user in users:
info = campaign_map.get(user.id, {})
campaign_name = info.get("campaign_name") or "Без кампании"
registered_at = info.get("registered_at")
registered_display = format_datetime(registered_at) if registered_at else "неизвестно"
status_emoji = "" if user.status == UserStatus.ACTIVE.value else "🚫" if user.status == UserStatus.BLOCKED.value else "🗑️"
button_text = (
f"{status_emoji} {user.full_name}"
f" | 📢 {campaign_name}"
f" | 📅 {registered_display}"
)
keyboard.append([
types.InlineKeyboardButton(
text=button_text,
callback_data=f"admin_user_manage_{user.id}"
)
])
if users_data["total_pages"] > 1:
pagination_row = get_admin_pagination_keyboard(
users_data["current_page"],
users_data["total_pages"],
"admin_users_campaign_list",
"admin_users",
db_user.language
).inline_keyboard[0]
keyboard.append(pagination_row)
keyboard.extend([
[
types.InlineKeyboardButton(text="🔍 Поиск", callback_data="admin_users_search"),
types.InlineKeyboardButton(text="📊 Статистика", callback_data="admin_users_stats")
],
[
types.InlineKeyboardButton(text="⬅️ Назад", callback_data="admin_users")
]
])
await callback.message.edit_text(
text,
reply_markup=types.InlineKeyboardMarkup(inline_keyboard=keyboard)
)
await callback.answer()
@admin_required
@error_handler
async def handle_users_list_pagination_fixed(
@@ -322,6 +780,91 @@ async def handle_users_balance_list_pagination(
await show_users_list_by_balance(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def handle_users_traffic_list_pagination(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext
):
try:
callback_parts = callback.data.split('_')
page = int(callback_parts[-1])
await show_users_list_by_traffic(callback, db_user, db, state, page)
except (ValueError, IndexError) as e:
logger.error(f"Ошибка парсинга номера страницы: {e}")
await show_users_list_by_traffic(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def handle_users_activity_list_pagination(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext
):
try:
callback_parts = callback.data.split('_')
page = int(callback_parts[-1])
await show_users_list_by_last_activity(callback, db_user, db, state, page)
except (ValueError, IndexError) as e:
logger.error(f"Ошибка парсинга номера страницы: {e}")
await show_users_list_by_last_activity(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def handle_users_spending_list_pagination(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext
):
try:
callback_parts = callback.data.split('_')
page = int(callback_parts[-1])
await show_users_list_by_spending(callback, db_user, db, state, page)
except (ValueError, IndexError) as e:
logger.error(f"Ошибка парсинга номера страницы: {e}")
await show_users_list_by_spending(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def handle_users_purchases_list_pagination(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext
):
try:
callback_parts = callback.data.split('_')
page = int(callback_parts[-1])
await show_users_list_by_purchases(callback, db_user, db, state, page)
except (ValueError, IndexError) as e:
logger.error(f"Ошибка парсинга номера страницы: {e}")
await show_users_list_by_purchases(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def handle_users_campaign_list_pagination(
callback: types.CallbackQuery,
db_user: User,
db: AsyncSession,
state: FSMContext
):
try:
callback_parts = callback.data.split('_')
page = int(callback_parts[-1])
await show_users_list_by_campaign(callback, db_user, db, state, page)
except (ValueError, IndexError) as e:
logger.error(f"Ошибка парсинга номера страницы: {e}")
await show_users_list_by_campaign(callback, db_user, db, state, 1)
@admin_required
@error_handler
async def start_user_search(
@@ -830,66 +1373,97 @@ async def show_user_management(
user = profile["user"]
subscription = profile["subscription"]
if user.status == UserStatus.ACTIVE.value:
status_text = "✅ Активен"
elif user.status == UserStatus.BLOCKED.value:
status_text = "🚫 Заблокирован"
elif user.status == UserStatus.DELETED.value:
status_text = "🗑️ Удален"
else:
status_text = "❓ Неизвестно"
text = f"""
👤 <b>Управление пользователем</b>
<b>Основная информация:</b>
Имя: {user.full_name}
ID: <code>{user.telegram_id}</code>
Username: @{user.username or 'не указан'}
Статус: {status_text}
Язык: {user.language}
texts = get_texts(db_user.language)
<b>Финансы:</b>
Баланс: {settings.format_price(user.balance_kopeks)}
Транзакций: {profile['transactions_count']}
status_map = {
UserStatus.ACTIVE.value: texts.ADMIN_USER_STATUS_ACTIVE,
UserStatus.BLOCKED.value: texts.ADMIN_USER_STATUS_BLOCKED,
UserStatus.DELETED.value: texts.ADMIN_USER_STATUS_DELETED,
}
status_text = status_map.get(user.status, texts.ADMIN_USER_STATUS_UNKNOWN)
username_display = (
f"@{user.username}" if user.username else texts.ADMIN_USER_USERNAME_NOT_SET
)
last_activity = (
format_time_ago(user.last_activity, db_user.language)
if user.last_activity
else texts.ADMIN_USER_LAST_ACTIVITY_UNKNOWN
)
sections = [
texts.ADMIN_USER_MANAGEMENT_PROFILE.format(
name=user.full_name,
telegram_id=user.telegram_id,
username=username_display,
status=status_text,
language=user.language,
balance=settings.format_price(user.balance_kopeks),
transactions=profile["transactions_count"],
registration=format_datetime(user.created_at),
last_activity=last_activity,
registration_days=profile["registration_days"],
)
]
<b>Активность:</b>
Регистрация: {format_datetime(user.created_at)}
Последняя активность: {format_time_ago(user.last_activity) if user.last_activity else 'Неизвестно'}
Дней с регистрации: {profile['registration_days']}
"""
if subscription:
text += f"""
<b>Подписка:</b>
Тип: {'🎁 Триал' if subscription.is_trial else '💎 Платная'}
Статус: {'✅ Активна' if subscription.is_active else '❌ Неактивна'}
До: {format_datetime(subscription.end_date)}
Трафик: {subscription.traffic_used_gb:.1f}/{subscription.traffic_limit_gb} ГБ
Устройства: {subscription.device_limit}
Стран: {len(subscription.connected_squads)}
"""
subscription_type = (
texts.ADMIN_USER_SUBSCRIPTION_TYPE_TRIAL
if subscription.is_trial
else texts.ADMIN_USER_SUBSCRIPTION_TYPE_PAID
)
subscription_status = (
texts.ADMIN_USER_SUBSCRIPTION_STATUS_ACTIVE
if subscription.is_active
else texts.ADMIN_USER_SUBSCRIPTION_STATUS_INACTIVE
)
traffic_usage = texts.ADMIN_USER_TRAFFIC_USAGE.format(
used=f"{subscription.traffic_used_gb:.1f}",
limit=subscription.traffic_limit_gb,
)
sections.append(
texts.ADMIN_USER_MANAGEMENT_SUBSCRIPTION.format(
type=subscription_type,
status=subscription_status,
end_date=format_datetime(subscription.end_date),
traffic=traffic_usage,
devices=subscription.device_limit,
countries=len(subscription.connected_squads),
)
)
else:
text += "\n<b>Подписка:</b> Отсутствует"
sections.append(texts.ADMIN_USER_MANAGEMENT_SUBSCRIPTION_NONE)
if user.promo_group:
promo_group = user.promo_group
text += f"""
<b>Промогруппа:</b>
Название: {promo_group.name}
Скидка на сервера: {promo_group.server_discount_percent}%
Скидка на трафик: {promo_group.traffic_discount_percent}%
Скидка на устройства: {promo_group.device_discount_percent}%
"""
sections.append(
texts.ADMIN_USER_MANAGEMENT_PROMO_GROUP.format(
name=promo_group.name,
server_discount=promo_group.server_discount_percent,
traffic_discount=promo_group.traffic_discount_percent,
device_discount=promo_group.device_discount_percent,
)
)
else:
text += "\n<b>Промогруппа:</b> Не назначена"
sections.append(texts.ADMIN_USER_MANAGEMENT_PROMO_GROUP_NONE)
text = "\n\n".join(sections)
# Проверяем состояние, чтобы определить, откуда пришел пользователь
current_state = await state.get_state()
if current_state == AdminStates.viewing_user_from_balance_list:
back_callback = "admin_users_balance_filter"
elif current_state == AdminStates.viewing_user_from_traffic_list:
back_callback = "admin_users_traffic_filter"
elif current_state == AdminStates.viewing_user_from_last_activity_list:
back_callback = "admin_users_activity_filter"
elif current_state == AdminStates.viewing_user_from_spending_list:
back_callback = "admin_users_spending_filter"
elif current_state == AdminStates.viewing_user_from_purchases_list:
back_callback = "admin_users_purchases_filter"
elif current_state == AdminStates.viewing_user_from_campaign_list:
back_callback = "admin_users_campaign_filter"
# Базовая клавиатура профиля
kb = get_user_management_keyboard(user.id, user.status, db_user.language, back_callback)
@@ -1210,7 +1784,12 @@ async def show_inactive_users(
for user in inactive_users[:10]:
text += f"👤 {user.full_name}\n"
text += f"🆔 <code>{user.telegram_id}</code>\n"
text += f"📅 {format_time_ago(user.last_activity) if user.last_activity else 'Никогда'}\n\n"
last_activity_display = (
format_time_ago(user.last_activity, db_user.language)
if user.last_activity
else "Никогда"
)
text += f"📅 {last_activity_display}\n\n"
if len(inactive_users) > 10:
text += f"... и еще {len(inactive_users) - 10} пользователей"
@@ -3340,6 +3919,31 @@ def register_handlers(dp: Dispatcher):
F.data.startswith("admin_users_balance_list_page_")
)
dp.callback_query.register(
handle_users_traffic_list_pagination,
F.data.startswith("admin_users_traffic_list_page_")
)
dp.callback_query.register(
handle_users_activity_list_pagination,
F.data.startswith("admin_users_activity_list_page_")
)
dp.callback_query.register(
handle_users_spending_list_pagination,
F.data.startswith("admin_users_spending_list_page_")
)
dp.callback_query.register(
handle_users_purchases_list_pagination,
F.data.startswith("admin_users_purchases_list_page_")
)
dp.callback_query.register(
handle_users_campaign_list_pagination,
F.data.startswith("admin_users_campaign_list_page_")
)
dp.callback_query.register(
start_user_search,
F.data == "admin_users_search"
@@ -3545,9 +4149,27 @@ def register_handlers(dp: Dispatcher):
)
dp.callback_query.register(
show_users_list_by_balance,
F.data.startswith("admin_users_balance_list_page_")
show_users_list_by_traffic,
F.data == "admin_users_traffic_filter"
)
dp.callback_query.register(
show_users_list_by_last_activity,
F.data == "admin_users_activity_filter"
)
dp.callback_query.register(
show_users_list_by_spending,
F.data == "admin_users_spending_filter"
)
dp.callback_query.register(
show_users_list_by_purchases,
F.data == "admin_users_purchases_filter"
)
dp.callback_query.register(
show_users_list_by_campaign,
F.data == "admin_users_campaign_filter"
)
+30 -31
View File
@@ -3,7 +3,6 @@ from aiogram import Dispatcher, types, F
from aiogram.fsm.context import FSMContext
from sqlalchemy.ext.asyncio import AsyncSession
from app.config import settings
from app.database.models import User
from app.states import AdminStates
from app.keyboards.admin import get_welcome_text_keyboard, get_admin_main_keyboard
@@ -44,16 +43,16 @@ async def show_welcome_text_panel(
db_user: User,
db: AsyncSession
):
settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if settings['is_enabled'] else "🔴"
status_text = "включено" if settings['is_enabled'] else "отключено"
welcome_settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if welcome_settings['is_enabled'] else "🔴"
status_text = "включено" if welcome_settings['is_enabled'] else "отключено"
await callback.message.edit_text(
f"👋 Управление приветственным текстом\n\n"
f"{status_emoji} <b>Статус:</b> {status_text}\n\n"
f"Здесь вы можете управлять текстом, который показывается новым пользователям после регистрации.\n\n"
f"💡 Доступные плейсхолдеры для автозамены:",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
await callback.answer()
@@ -89,11 +88,11 @@ async def show_current_welcome_text(
db_user: User,
db: AsyncSession
):
settings = await get_current_welcome_text_settings(db)
current_text = settings['text']
is_enabled = settings['is_enabled']
if not settings['id']:
welcome_settings = await get_current_welcome_text_settings(db)
current_text = welcome_settings['text']
is_enabled = welcome_settings['is_enabled']
if not welcome_settings['id']:
status = "📝 Используется стандартный текст:"
else:
status = "📝 Текущий приветственный текст:"
@@ -121,7 +120,7 @@ async def show_placeholders_help(
db_user: User,
db: AsyncSession
):
settings = await get_current_welcome_text_settings(db)
welcome_settings = await get_current_welcome_text_settings(db)
placeholders = get_available_placeholders()
placeholders_text = "\n".join([f"• <code>{key}</code>\n {desc}" for key, desc in placeholders.items()])
@@ -137,7 +136,7 @@ async def show_placeholders_help(
await callback.message.edit_text(
help_text,
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
await callback.answer()
@@ -149,12 +148,12 @@ async def show_formatting_help(
db_user: User,
db: AsyncSession
):
settings = await get_current_welcome_text_settings(db)
welcome_settings = await get_current_welcome_text_settings(db)
formatting_info = get_telegram_formatting_info()
await callback.message.edit_text(
formatting_info,
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
await callback.answer()
@@ -167,8 +166,8 @@ async def start_edit_welcome_text(
db_user: User,
db: AsyncSession
):
settings = await get_current_welcome_text_settings(db)
current_text = settings['text']
welcome_settings = await get_current_welcome_text_settings(db)
current_text = welcome_settings['text']
placeholders = get_available_placeholders()
placeholders_text = "\n".join([f"• <code>{key}</code> - {desc}" for key, desc in placeholders.items()])
@@ -206,9 +205,9 @@ async def process_welcome_text_edit(
success = await set_welcome_text(db, new_text, db_user.id)
if success:
settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if settings['is_enabled'] else "🔴"
status_text = "включено" if settings['is_enabled'] else "отключено"
welcome_settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if welcome_settings['is_enabled'] else "🔴"
status_text = "включено" if welcome_settings['is_enabled'] else "отключено"
placeholders = get_available_placeholders()
placeholders_text = "\n".join([f"• <code>{key}</code>" for key in placeholders.keys()])
@@ -219,14 +218,14 @@ async def process_welcome_text_edit(
f"Новый текст:\n"
f"<code>{new_text}</code>\n\n"
f"💡 Будут заменяться плейсхолдеры: {placeholders_text}",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
else:
settings = await get_current_welcome_text_settings(db)
welcome_settings = await get_current_welcome_text_settings(db)
await message.answer(
"❌ Ошибка при сохранении текста. Попробуйте еще раз.",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled'])
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled'])
)
await state.clear()
@@ -242,9 +241,9 @@ async def reset_welcome_text(
success = await set_welcome_text(db, default_text, db_user.id)
if success:
settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if settings['is_enabled'] else "🔴"
status_text = "включено" if settings['is_enabled'] else "отключено"
welcome_settings = await get_current_welcome_text_settings(db)
status_emoji = "🟢" if welcome_settings['is_enabled'] else "🔴"
status_text = "включено" if welcome_settings['is_enabled'] else "отключено"
await callback.message.edit_text(
f"✅ Приветственный текст сброшен на стандартный!\n\n"
@@ -252,14 +251,14 @@ async def reset_welcome_text(
f"Стандартный текст:\n"
f"<code>{default_text}</code>\n\n"
f"💡 Плейсхолдер <code>{{user_name}}</code> будет заменяться на имя пользователя",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
else:
settings = await get_current_welcome_text_settings(db)
welcome_settings = await get_current_welcome_text_settings(db)
await callback.message.edit_text(
"❌ Ошибка при сбросе текста. Попробуйте еще раз.",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled'])
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled'])
)
await callback.answer()
@@ -281,14 +280,14 @@ async def show_preview_welcome_text(
test_user = TestUser()
preview_text = await get_welcome_text_for_user(db, test_user)
settings = await get_current_welcome_text_settings(db)
welcome_settings = await get_current_welcome_text_settings(db)
if preview_text:
await callback.message.edit_text(
f"👁️ Предварительный просмотр\n\n"
f"Как будет выглядеть текст для пользователя 'Иван' (@test_user):\n\n"
f"<code>{preview_text}</code>",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
else:
@@ -296,7 +295,7 @@ async def show_preview_welcome_text(
f"👁️ Предварительный просмотр\n\n"
f"🔴 Приветственные сообщения отключены.\n"
f"Новые пользователи не будут получать приветственный текст после регистрации.",
reply_markup=get_welcome_text_keyboard(db_user.language, settings['is_enabled']),
reply_markup=get_welcome_text_keyboard(db_user.language, welcome_settings['is_enabled']),
parse_mode="HTML"
)
+154 -38
View File
@@ -1,3 +1,4 @@
import html
import logging
from aiogram import Dispatcher, types, F
from aiogram.fsm.context import FSMContext
@@ -1002,9 +1003,7 @@ async def process_pal24_payment_amount(
language=db_user.language,
)
if not payment_result or not (
payment_result.get("link_url") or payment_result.get("link_page_url")
):
if not payment_result:
await message.answer(
texts.t(
"PAL24_PAYMENT_ERROR",
@@ -1014,49 +1013,146 @@ async def process_pal24_payment_amount(
await state.clear()
return
payment_url = (
sbp_url = (
payment_result.get("sbp_url")
or payment_result.get("transfer_url")
)
card_url = payment_result.get("card_url")
fallback_url = (
payment_result.get("link_page_url")
or payment_result.get("link_url")
)
if not (sbp_url or card_url or fallback_url):
await message.answer(
texts.t(
"PAL24_PAYMENT_ERROR",
"❌ Ошибка создания платежа PayPalych. Попробуйте позже или обратитесь в поддержку.",
)
)
await state.clear()
return
if not sbp_url:
sbp_url = fallback_url
bill_id = payment_result.get("bill_id")
local_payment_id = payment_result.get("local_payment_id")
keyboard = types.InlineKeyboardMarkup(
inline_keyboard=[
[
types.InlineKeyboardButton(
text=texts.t("PAL24_PAY_BUTTON", "🏦 Оплатить через PayPalych (СБП)"),
url=payment_url,
)
],
[
types.InlineKeyboardButton(
text=texts.t("CHECK_STATUS_BUTTON", "📊 Проверить статус"),
callback_data=f"check_pal24_{local_payment_id}",
)
],
[types.InlineKeyboardButton(text=texts.BACK, callback_data="balance_topup")],
]
pay_buttons: list[list[types.InlineKeyboardButton]] = []
steps: list[str] = []
step_counter = 1
default_sbp_text = texts.t(
"PAL24_SBP_PAY_BUTTON",
"🏦 Оплатить через PayPalych (СБП)",
)
sbp_button_text = settings.get_pal24_sbp_button_text(default_sbp_text)
if sbp_url:
pay_buttons.append(
[
types.InlineKeyboardButton(
text=sbp_button_text,
url=sbp_url,
)
]
)
steps.append(
texts.t(
"PAL24_INSTRUCTION_BUTTON",
"{step}. Нажмите кнопку «{button}»",
).format(step=step_counter, button=html.escape(sbp_button_text))
)
step_counter += 1
default_card_text = texts.t(
"PAL24_CARD_PAY_BUTTON",
"💳 Оплатить банковской картой (PayPalych)",
)
card_button_text = settings.get_pal24_card_button_text(default_card_text)
if card_url and card_url != sbp_url:
pay_buttons.append(
[
types.InlineKeyboardButton(
text=card_button_text,
url=card_url,
)
]
)
steps.append(
texts.t(
"PAL24_INSTRUCTION_BUTTON",
"{step}. Нажмите кнопку «{button}»",
).format(step=step_counter, button=html.escape(card_button_text))
)
step_counter += 1
if not pay_buttons and fallback_url:
pay_buttons.append(
[
types.InlineKeyboardButton(
text=sbp_button_text,
url=fallback_url,
)
]
)
steps.append(
texts.t(
"PAL24_INSTRUCTION_BUTTON",
"{step}. Нажмите кнопку «{button}»",
).format(step=step_counter, button=html.escape(sbp_button_text))
)
step_counter += 1
follow_template = texts.t(
"PAL24_INSTRUCTION_FOLLOW",
"{step}. Следуйте подсказкам платёжной системы",
)
steps.append(follow_template.format(step=step_counter))
step_counter += 1
confirm_template = texts.t(
"PAL24_INSTRUCTION_CONFIRM",
"{step}. Подтвердите перевод",
)
steps.append(confirm_template.format(step=step_counter))
step_counter += 1
success_template = texts.t(
"PAL24_INSTRUCTION_COMPLETE",
"{step}. Средства зачислятся автоматически",
)
steps.append(success_template.format(step=step_counter))
message_template = texts.t(
"PAL24_PAYMENT_INSTRUCTIONS",
(
"🏦 <b>Оплата через PayPalych (СБП)</b>\n\n"
"🏦 <b>Оплата через PayPalych</b>\n\n"
"💰 Сумма: {amount}\n"
"🆔 ID счета: {bill_id}\n\n"
"📱 <b>Инструкция:</b>\n"
"1. Нажмите кнопку ‘Оплатить через PayPalych (СБП)\n"
"2. Следуйте подсказкам платежной системы\n"
"3. Подтвердите перевод\n"
"4. Средства зачислятся автоматически\n\n"
"📱 <b>Инструкция:</b>\n{steps}\n\n"
"❓ Если возникнут проблемы, обратитесь в {support}"
),
)
keyboard_rows = pay_buttons + [
[
types.InlineKeyboardButton(
text=texts.t("CHECK_STATUS_BUTTON", "📊 Проверить статус"),
callback_data=f"check_pal24_{local_payment_id}",
)
],
[types.InlineKeyboardButton(text=texts.BACK, callback_data="balance_topup")],
]
keyboard = types.InlineKeyboardMarkup(inline_keyboard=keyboard_rows)
message_text = message_template.format(
amount=settings.format_price(amount_kopeks),
bill_id=bill_id,
steps="\n".join(steps),
support=settings.get_support_contact_display_html(),
)
@@ -1231,28 +1327,48 @@ async def check_pal24_payment_status(
emoji, status_text = status_labels.get(payment.status, ("", "Неизвестно"))
payment_link = payment.link_page_url or payment.link_url
metadata = payment.metadata_json or {}
links_meta = metadata.get("links") if isinstance(metadata, dict) else None
if not isinstance(links_meta, dict):
links_meta = {}
sbp_link = links_meta.get("sbp") or payment.link_url
card_link = links_meta.get("card")
if not card_link and payment.link_page_url and payment.link_page_url != sbp_link:
card_link = payment.link_page_url
message_lines = [
"🏦 Статус платежа PayPalych (СБП):\n\n",
f"🆔 ID счета: {payment.bill_id}\n",
f"💰 Сумма: {settings.format_price(payment.amount_kopeks)}\n",
f"📊 Статус: {emoji} {status_text}\n",
f"📅 Создан: {payment.created_at.strftime('%d.%m.%Y %H:%M')}\n",
"🏦 Статус платежа PayPalych:",
"",
f"🆔 ID счета: {payment.bill_id}",
f"💰 Сумма: {settings.format_price(payment.amount_kopeks)}",
f"📊 Статус: {emoji} {status_text}",
f"📅 Создан: {payment.created_at.strftime('%d.%m.%Y %H:%M')}",
]
if payment.is_paid:
message_lines.append("\n✅ Платеж успешно завершен! Средства уже на балансе.")
message_lines.append("")
message_lines.append("✅ Платеж успешно завершен! Средства уже на балансе.")
elif payment.status in {"NEW", "PROCESS"}:
message_lines.append("\n⏳ Платеж еще не завершен. Оплатите счет и проверьте статус позже.")
if payment_link:
message_lines.append(f"\n🔗 Ссылка на оплату: {payment_link}")
message_lines.append("")
message_lines.append("⏳ Платеж еще не завершен. Оплатите счет и проверьте статус позже.")
if sbp_link:
message_lines.append("")
message_lines.append(f"🏦 СБП: {sbp_link}")
if card_link and card_link != sbp_link:
message_lines.append(f"💳 Банковская карта: {card_link}")
elif payment.status in {"FAIL", "UNDERPAID", "OVERPAID"}:
message_lines.append("")
message_lines.append(
f"\n❌ Платеж не завершен корректно. Обратитесь в {settings.get_support_contact_display()}"
f"❌ Платеж не завершен корректно. Обратитесь в {settings.get_support_contact_display()}"
)
await callback.answer("".join(message_lines), show_alert=True)
await callback.answer()
await callback.message.answer(
"\n".join(message_lines),
disable_web_page_preview=True,
)
except Exception as e:
logger.error(f"Ошибка проверки статуса PayPalych: {e}")
+14 -16
View File
@@ -10,7 +10,6 @@ from app.database.crud.user import get_user_by_telegram_id, update_user
from app.keyboards.inline import get_main_menu_keyboard, get_language_selection_keyboard
from app.localization.texts import get_texts, get_rules
from app.database.models import User
from app.utils.user_utils import mark_user_as_had_paid_subscription
from app.database.crud.user_message import get_random_active_message
from app.services.subscription_checkout_service import (
has_subscription_checkout_draft,
@@ -45,13 +44,18 @@ async def show_main_menu(
draft_exists = await has_subscription_checkout_draft(db_user.id)
show_resume_checkout = should_offer_checkout_resume(db_user, draft_exists)
is_admin = settings.is_admin(db_user.telegram_id)
is_moderator = (not is_admin) and SupportSettingsService.is_moderator(
db_user.telegram_id
)
await edit_or_answer_photo(
callback=callback,
caption=menu_text,
keyboard=get_main_menu_keyboard(
language=db_user.language,
is_admin=settings.is_admin(db_user.telegram_id),
is_moderator=(not settings.is_admin(db_user.telegram_id) and SupportSettingsService.is_moderator(db_user.telegram_id)),
is_admin=is_admin,
is_moderator=is_moderator,
has_had_paid_subscription=db_user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
@@ -65,17 +69,6 @@ async def show_main_menu(
await callback.answer()
async def mark_user_as_had_paid_subscription(
db: AsyncSession,
user: User
) -> None:
if not user.has_had_paid_subscription:
user.has_had_paid_subscription = True
user.updated_at = datetime.utcnow()
await db.commit()
logger.info(f"🎯 Пользователь {user.telegram_id} отмечен как имевший платную подписку")
async def show_service_rules(
callback: types.CallbackQuery,
db_user: User,
@@ -203,13 +196,18 @@ async def handle_back_to_menu(
draft_exists = await has_subscription_checkout_draft(db_user.id)
show_resume_checkout = should_offer_checkout_resume(db_user, draft_exists)
is_admin = settings.is_admin(db_user.telegram_id)
is_moderator = (not is_admin) and SupportSettingsService.is_moderator(
db_user.telegram_id
)
await edit_or_answer_photo(
callback=callback,
caption=menu_text,
keyboard=get_main_menu_keyboard(
language=db_user.language,
is_admin=settings.is_admin(db_user.telegram_id),
is_moderator=(not settings.is_admin(db_user.telegram_id) and SupportSettingsService.is_moderator(db_user.telegram_id)),
is_admin=is_admin,
is_moderator=is_moderator,
has_had_paid_subscription=db_user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
+58 -16
View File
@@ -30,6 +30,7 @@ from app.services.referral_service import process_referral_registration
from app.services.campaign_service import AdvertisingCampaignService
from app.services.admin_notification_service import AdminNotificationService
from app.services.subscription_service import SubscriptionService
from app.services.support_settings_service import SupportSettingsService
from app.utils.user_utils import generate_unique_referral_code
from app.database.crud.user_message import get_random_active_message
@@ -322,17 +323,23 @@ async def cmd_start(message: types.Message, state: FSMContext, db: AsyncSession,
subscription_is_active = user.subscription.is_active
menu_text = await get_main_menu_text(user, texts, db)
is_admin = settings.is_admin(user.telegram_id)
is_moderator = (not is_admin) and SupportSettingsService.is_moderator(
user.telegram_id
)
await message.answer(
menu_text,
reply_markup=get_main_menu_keyboard(
language=user.language,
is_admin=settings.is_admin(user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=user.balance_kopeks,
subscription=user.subscription
subscription=user.subscription,
is_moderator=is_moderator,
),
parse_mode="HTML"
)
@@ -728,18 +735,25 @@ async def complete_registration_from_callback(
subscription_is_active = existing_user.subscription.is_active
menu_text = await get_main_menu_text(existing_user, texts, db)
is_admin = settings.is_admin(existing_user.telegram_id)
is_moderator = (
(not is_admin)
and SupportSettingsService.is_moderator(existing_user.telegram_id)
)
try:
await callback.message.answer(
menu_text,
reply_markup=get_main_menu_keyboard(
language=existing_user.language,
is_admin=settings.is_admin(existing_user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=existing_user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=existing_user.balance_kopeks,
subscription=existing_user.subscription
subscription=existing_user.subscription,
is_moderator=is_moderator,
),
parse_mode="HTML"
)
@@ -893,18 +907,25 @@ async def complete_registration_from_callback(
subscription_is_active = user.subscription.is_active
menu_text = await get_main_menu_text(user, texts, db)
is_admin = settings.is_admin(user.telegram_id)
is_moderator = (
(not is_admin)
and SupportSettingsService.is_moderator(user.telegram_id)
)
try:
await callback.message.answer(
menu_text,
reply_markup=get_main_menu_keyboard(
language=user.language,
is_admin=settings.is_admin(user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=user.balance_kopeks,
subscription=user.subscription
subscription=user.subscription,
is_moderator=is_moderator,
),
parse_mode="HTML"
)
@@ -952,18 +973,25 @@ async def complete_registration(
subscription_is_active = existing_user.subscription.is_active
menu_text = await get_main_menu_text(existing_user, texts, db)
is_admin = settings.is_admin(existing_user.telegram_id)
is_moderator = (
(not is_admin)
and SupportSettingsService.is_moderator(existing_user.telegram_id)
)
try:
await message.answer(
menu_text,
reply_markup=get_main_menu_keyboard(
language=existing_user.language,
is_admin=settings.is_admin(existing_user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=existing_user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=existing_user.balance_kopeks,
subscription=existing_user.subscription
subscription=existing_user.subscription,
is_moderator=is_moderator,
),
parse_mode="HTML"
)
@@ -1117,18 +1145,25 @@ async def complete_registration(
subscription_is_active = user.subscription.is_active
menu_text = await get_main_menu_text(user, texts, db)
is_admin = settings.is_admin(user.telegram_id)
is_moderator = (
(not is_admin)
and SupportSettingsService.is_moderator(user.telegram_id)
)
try:
await message.answer(
menu_text,
reply_markup=get_main_menu_keyboard(
language=user.language,
is_admin=settings.is_admin(user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=user.balance_kopeks,
subscription=user.subscription
subscription=user.subscription,
is_moderator=is_moderator,
),
parse_mode="HTML"
)
@@ -1357,14 +1392,21 @@ async def required_sub_channel_check(
from app.utils.message_patch import LOGO_PATH
from aiogram.types import FSInputFile
is_admin = settings.is_admin(user.telegram_id)
is_moderator = (
(not is_admin)
and SupportSettingsService.is_moderator(user.telegram_id)
)
keyboard = get_main_menu_keyboard(
language=user.language,
is_admin=settings.is_admin(user.telegram_id),
is_admin=is_admin,
has_had_paid_subscription=user.has_had_paid_subscription,
has_active_subscription=has_active_subscription,
subscription_is_active=subscription_is_active,
balance_kopeks=user.balance_kopeks,
subscription=user.subscription,
is_moderator=is_moderator,
)
if settings.ENABLE_LOGO_MODE:
+1461 -1182
View File
File diff suppressed because it is too large Load Diff
-2
View File
@@ -412,7 +412,6 @@ async def show_my_tickets(
# Добавим кнопку перехода к закрытым
keyboard.inline_keyboard.insert(0, [types.InlineKeyboardButton(text=texts.t("VIEW_CLOSED_TICKETS", "🟢 Закрытые тикеты"), callback_data="my_tickets_closed")])
# Всегда используем фото-рендер с логотипом (утилита сама сделает фоллбек при необходимости)
from app.utils.photo_message import edit_or_answer_photo
await edit_or_answer_photo(
callback=callback,
caption=texts.t("MY_TICKETS_TITLE", "📋 Ваши тикеты:"),
@@ -456,7 +455,6 @@ async def show_my_tickets_closed(
data = [{'id': t.id, 'title': t.title, 'status_emoji': t.status_emoji} for t in tickets]
kb = get_my_tickets_keyboard(data, current_page=current_page, total_pages=total_pages, language=db_user.language, page_prefix="my_tickets_closed_page_")
kb.inline_keyboard.insert(0, [types.InlineKeyboardButton(text=texts.t("BACK_TO_OPEN_TICKETS", "🔴 Открытые тикеты"), callback_data="my_tickets")])
from app.utils.photo_message import edit_or_answer_photo
await edit_or_answer_photo(
callback=callback,
caption=texts.t("CLOSED_TICKETS_TITLE", "🟢 Закрытые тикеты:"),
+976 -317
View File
File diff suppressed because it is too large Load Diff
+273 -2
View File
@@ -1,19 +1,41 @@
{
"ADD_COUNTRIES_BUTTON": "🌐 Add countries",
"COUNTRY_MANAGEMENT_UNAVAILABLE": "️ Server management is unavailable — only one server is accessible",
"COUNTRY_MANAGEMENT_PROMPT": "🌍 <b>Manage subscription countries</b>\n\n📋 <b>Current countries ({current_count}):</b>\n{current_list}\n\n💡 <b>How it works:</b>\n✅ — currently connected\n — will be added (paid)\n — will be removed (free)\n⚪ — not selected\n\n⚠️ <b>Important:</b> Reconnecting removed countries will be charged again!",
"COUNTRY_MANAGEMENT_NONE": "No countries connected",
"PAID_FEATURE_ONLY": "⚠ This feature is available only for paid subscriptions",
"PAID_FEATURE_ONLY_SHORT": "⚠ Paid subscriptions only",
"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",
"COUNTRY_CHANGES_ADDED_HEADER": " <b>Added countries:</b>\n",
"COUNTRY_CHANGES_CHARGED": "💰 Charged: {amount} (for {months} mo)",
"COUNTRY_CHANGES_DISCOUNT_INFO": " (discount {percent}%: -{amount})",
"COUNTRY_CHANGES_REMOVED_HEADER": " <b>Removed countries:</b>\n",
"COUNTRY_CHANGES_REMOVED_WARNING": "️ Reconnecting later will be charged",
"COUNTRY_CHANGES_ACTIVE_COUNT": "🌐 <b>Active countries:</b> {count}",
"ADMIN_MAIN_MENU": "🏠 Main menu",
"ADMIN_CAMPAIGNS": "📣 Promotional campaigns",
"AUTOPAY_BUTTON": "💳 Auto payment",
"AUTOPAY_SET_DAYS_BUTTON": "⚙️ Configure days",
"AUTOPAY_STATUS_ENABLED": "enabled",
"AUTOPAY_STATUS_DISABLED": "disabled",
"AUTOPAY_MENU_TEXT": "💳 <b>Auto payment</b>\n\n📊 <b>Status:</b> {status}\n⏰ <b>Charge:</b> {days} days before expiry\n\nChoose an action:",
"AUTOPAY_TOGGLE_SUCCESS": "✅ Autopay {status}!",
"AUTOPAY_SELECT_DAYS_PROMPT": "⏰ Choose how many days before expiry to charge the payment:",
"AUTOPAY_DAYS_SET": "✅ Set to {days} days!",
"BACK": "⬅️ Back",
"BACK_TO_SUBSCRIPTION": "⬅️ Back to subscription",
"BALANCE_BUTTON_DEFAULT": "💰 Balance: {balance}",
"CANCEL": "❌ Cancel",
"CHANGE_DEVICES_BUTTON": "📱 Change devices",
"CHANGE_DEVICES_PROMPT": "📱 <b>Adjust device limit</b>\n\nCurrent limit: {current_devices} devices\nChoose the new number of devices:\n\n💡 <b>Important:</b>\n• Increasing — extra cost prorated by remaining time\n• Decreasing — payments are not refunded",
"CHANNEL_CHECK_BUTTON": "✅ I have joined",
"CHANNEL_REQUIRED_TEXT": "🔒 Please join the announcement channel to access the bot, then press the button below.",
"CHANNEL_SUBSCRIBE_BUTTON": "🔗 Subscribe",
"CHANNEL_SUBSCRIBE_REQUIRED_ALERT": "❌ You haven't joined the channel!",
"CHANNEL_SUBSCRIBE_THANKS": "✅ Thanks for subscribing",
"TRIAL_CHANNEL_UNSUBSCRIBED": "\n🚫 <b>Access paused</b>\n\nWe couldn't find your subscription to our channel, so the trial plan has been disabled.\n\nJoin the channel and tap “{check_button}” to restore access.",
"CHECK_STATUS_BUTTON": "📊 Check status",
"CHOOSE_ANOTHER_DEVICE": "📱 Choose another device",
"CONFIRM": "✅ Confirm",
@@ -55,6 +77,26 @@
"MAIN_MENU_ACTION_PROMPT": "Choose an option:",
"MAIN_MENU_BUTTON": "🏠 Main menu",
"MANAGE_DEVICES_BUTTON": "🔧 Manage devices",
"DEVICE_UUID_NOT_FOUND": "❌ User UUID not found",
"DEVICE_NONE_CONNECTED": "️ You have no connected devices",
"DEVICE_FETCH_INFO_ERROR": "❌ Failed to load device information",
"DEVICE_MANAGEMENT_OVERVIEW": "🔄 <b>Device management</b>\n\n📊 Total connected: {total} devices\n📄 Page {page} of {pages}\n\n",
"DEVICE_MANAGEMENT_CONNECTED_HEADER": "<b>Connected devices:</b>\n",
"DEVICE_MANAGEMENT_LIST_ITEM": "• {device}\n",
"DEVICE_MANAGEMENT_ACTIONS": "\n💡 <b>Actions:</b>\n• Select a device to reset\n• Or reset all devices at once",
"DEVICE_FETCH_ERROR": "❌ Failed to load devices",
"DEVICE_PAGE_LOAD_ERROR": "❌ Failed to open the page",
"DEVICE_RESET_INVALID_REQUEST": "❌ Error: invalid request",
"DEVICE_RESET_PARSE_ERROR": "❌ Failed to process the request",
"DEVICE_RESET_SUCCESS": "✅ Device {device} has been reset!",
"DEVICE_RESET_ALL_DONE": "️ All devices have been reset",
"DEVICE_RESET_ID_FAILED": "❌ Unable to get device ID",
"DEVICE_RESET_NOT_FOUND": "❌ Device not found",
"DEVICE_RESET_ERROR": "❌ Failed to reset the device",
"DEVICE_LIST_FETCH_ERROR": "❌ Failed to load device list",
"DEVICE_RESET_ALL_SUCCESS_MESSAGE": "✅ <b>All devices have been reset!</b>\n\n🔄 Reset: {count} devices\n📱 You can now reconnect your devices\n\n💡 Use the link from the 'My subscription' section to reconnect",
"DEVICE_RESET_PARTIAL_MESSAGE": "⚠️ <b>Devices reset partially</b>\n\n✅ Removed: {success} devices\n❌ Failed to remove: {failed} devices\n\nTry again or contact support.",
"DEVICE_RESET_ALL_FAILED_MESSAGE": "❌ <b>Couldn't reset devices</b>\n\nPlease try again later or contact support.\n\nTotal devices: {total}",
"MENU_BALANCE": "💰 Balance",
"MENU_SUBSCRIPTION": "📱 Subscription",
"MENU_TRIAL": "🎁 Trial subscription",
@@ -97,6 +139,9 @@
"SHOW_SUBSCRIPTION_LINK": "📋 Show subscription link",
"SKIP_BUTTON": "Skip ➡️",
"SUBSCRIPTION_SETTINGS_BUTTON": "⚙️ Subscription settings",
"SUBSCRIPTION_SETTINGS_PAID_ONLY": "⚠️ Settings are available only for paid subscriptions",
"SUBSCRIPTION_SETTINGS_OVERVIEW": "⚙️ <b>Subscription settings</b>\n\n📊 <b>Current parameters:</b>\n🌐 Countries: {countries_count}\n📈 Traffic: {traffic_used} / {traffic_limit}\n📱 Devices: {devices_used} / {devices_limit}\n\nChoose what you want to change:",
"SUBSCRIPTION_ACTIVE_REQUIRED": "⚠️ You don't have an active subscription!",
"SUB_STATUS_ACTIVE_FEW_DAYS": "💎 Active\n⚠️ expires in {days} days",
"SUB_STATUS_ACTIVE_LONG": "💎 Active\n📅 until {end_date} ({days} days)",
"SUB_STATUS_ACTIVE_TODAY": "💎 Active\n⚠️ expires today!",
@@ -162,6 +207,22 @@
"ADMIN_USER_PROMO_GROUP_ALREADY": "️ The user is already in this promo group.",
"ADMIN_USER_PROMO_GROUP_ERROR": "❌ Failed to update the user's promo group.",
"ADMIN_USER_PROMO_GROUP_BACK": "⬅️ Back to user",
"ADMIN_USER_MANAGEMENT_PROFILE": "👤 <b>User management</b>\n\n<b>Main information:</b>\n• Name: {name}\n• ID: <code>{telegram_id}</code>\n• Username: {username}\n• Status: {status}\n• Language: {language}\n\n<b>Finances:</b>\n• Balance: {balance}\n• Transactions: {transactions}\n\n<b>Activity:</b>\n• Registration: {registration}\n• Last activity: {last_activity}\n• Days since registration: {registration_days}",
"ADMIN_USER_USERNAME_NOT_SET": "not set",
"ADMIN_USER_STATUS_ACTIVE": "✅ Active",
"ADMIN_USER_STATUS_BLOCKED": "🚫 Blocked",
"ADMIN_USER_STATUS_DELETED": "🗑️ Deleted",
"ADMIN_USER_STATUS_UNKNOWN": "❓ Unknown",
"ADMIN_USER_LAST_ACTIVITY_UNKNOWN": "Unknown",
"ADMIN_USER_SUBSCRIPTION_TYPE_TRIAL": "🎁 Trial",
"ADMIN_USER_SUBSCRIPTION_TYPE_PAID": "💎 Paid",
"ADMIN_USER_SUBSCRIPTION_STATUS_ACTIVE": "✅ Active",
"ADMIN_USER_SUBSCRIPTION_STATUS_INACTIVE": "❌ Inactive",
"ADMIN_USER_TRAFFIC_USAGE": "{used}/{limit} GB",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION": "<b>Subscription:</b>\n• Type: {type}\n• Status: {status}\n• Until: {end_date}\n• Traffic: {traffic}\n• Devices: {devices}\n• Countries: {countries}",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION_NONE": "<b>Subscription:</b> None",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP": "<b>Promo group:</b>\n• Name: {name}\n• Server discount: {server_discount}%\n• Traffic discount: {traffic_discount}%\n• Device discount: {device_discount}%",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP_NONE": "<b>Promo group:</b> Not assigned",
"ADMIN_PROMO_GROUP_DETAILS_TITLE": "💳 <b>Promo group:</b> {name}",
"ADMIN_PROMO_GROUP_DETAILS_MEMBERS": "Members: {count}",
"ADMIN_PROMO_GROUP_DETAILS_DEFAULT": "This is the default group.",
@@ -219,6 +280,19 @@
"DEVICES_LIMIT_EXCEEDED": "⚠️ Maximum device limit exceeded ({limit})",
"DEVICES_MINIMUM_LIMIT": "⚠️ Minimum number of devices: {limit}",
"DEVICES_NO_CHANGE": "️ Device limit was not changed",
"PAYMENT_CHARGE_ERROR": "⚠️ Failed to charge the payment",
"DEVICE_CHANGE_ACTION_INCREASE": "increase to {count}",
"DEVICE_CHANGE_EXTRA_COST": "Extra payment: {amount} (for {months} mo)",
"DEVICE_CHANGE_DISCOUNT_INFO": " (discount {percent}%: -{amount})",
"DEVICE_CHANGE_FREE": "Free",
"DEVICE_CHANGE_ACTION_DECREASE": "decrease to {count}",
"DEVICE_CHANGE_NO_REFUND": "Payments are not refunded",
"DEVICE_CHANGE_CONFIRMATION": "📱 <b>Confirm change</b>\n\nCurrent amount: {current} devices\nNew amount: {new} devices\n\nAction: {action}\n💰 {cost}\n\nApply this change?",
"DEVICE_CHANGE_INCREASE_SUCCESS": "✅ Device limit increased!\n\n",
"DEVICE_CHANGE_RESULT_LINE": "📱 Was: {old} → Now: {new}\n",
"DEVICE_CHANGE_CHARGED": "💰 Charged: {amount}",
"DEVICE_CHANGE_DECREASE_SUCCESS": "✅ Device limit decreased!\n\n",
"DEVICE_CHANGE_NO_REFUND_INFO": "️ Payments are not refunded",
"INVALID_AMOUNT": "❌ Invalid amount",
"MAINTENANCE_MODE_ACTIVE": "\n🔧 Maintenance in progress!\n\nThe service is temporarily unavailable while we improve performance.\n\n⏰ Estimated completion time: unknown\n🔄 Please try again later\n\nWe apologize for the inconvenience.\n",
"MAINTENANCE_MODE_API_ERROR": "\n🔧 Maintenance in progress!\n\nThe service is temporarily unavailable due to connection issues with the servers.\n\n⏰ We're working on it. Please try again in a few minutes.\n\n🔄 Last check: {last_check}\n",
@@ -299,6 +373,9 @@
"TRIAL_ALREADY_USED": "❌ The trial subscription has already been used",
"TRIAL_AVAILABLE": "\n🎁 <b>Trial subscription</b>\n\nYou can get a free trial plan:\n\n⏰ <b>Duration:</b> {days} days\n📈 <b>Traffic:</b> {traffic} GB\n📱 <b>Devices:</b> {devices} pcs\n🌍 <b>Server:</b> {server_name}\n\nActivate the trial subscription?\n",
"TRIAL_ENDING_SOON": "\n🎁 <b>The trial subscription is ending soon!</b>\n\nYour trial expires in a few hours.\n\n💎 <b>Don't want to lose VPN access?</b>\nSwitch to the full subscription!\n\n🔥 <b>Special offer:</b>\n• 30 days for {price}\n• Unlimited traffic\n• All servers available\n• Speeds up to 1 Gbit/s\n\n⚡️ Activate before the trial ends!\n",
"TRAFFIC_FIXED_MODE": "⚠️ Traffic is fixed in the current mode and cannot be changed",
"TRAFFIC_ALREADY_UNLIMITED": "⚠ You already have unlimited traffic",
"ADD_TRAFFIC_PROMPT": "📈 <b>Add traffic to your subscription</b>\n\nCurrent limit: {current_traffic}\nChoose extra traffic:",
"USER_NOT_FOUND": "❌ User not found",
"MENU_LANGUAGE": "🌐 Language",
"SUBSCRIPTION_STATUS_EXPIRED": "Expired",
@@ -426,6 +503,200 @@
"PAYMENT_METHOD_CRYPTOBOT_DESCRIPTION": "via CryptoBot",
"PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Support team</b>",
"PAYMENT_METHOD_SUPPORT_DESCRIPTION": "other options",
"PAYMENT_METHODS_UNAVAILABLE_ALERT": "⚠️ Automated payment methods are temporarily unavailable. Contact support to top up your balance."
"PAYMENT_METHODS_UNAVAILABLE_ALERT": "⚠️ Automated payment methods are temporarily unavailable. Contact support to top up your balance.",
"ADMIN_MONITORING_SETTINGS": "⚙️ Monitoring settings",
"ADMIN_PROMO_GROUP_AUTO_ASSIGN_DISABLED": "Auto assignment by total spending: disabled",
"ADMIN_PROMO_GROUP_AUTO_ASSIGN_LINE": "Auto assignment by total spending from {amount} ₽",
"ADMIN_PROMO_GROUP_CREATE_AUTO_ASSIGN_PROMPT": "Enter total spending (in ₽) required for automatic assignment. Send 0 to disable.",
"ADMIN_PROMO_GROUP_CREATE_PERIOD_PROMPT": "Enter subscription period discounts (e.g. 30:10, 90:15). Send 0 if none.",
"ADMIN_PROMO_GROUP_EDIT_AUTO_ASSIGN_PROMPT": "Enter total spending (in ₽) for auto assignment. Current value: {current}.",
"ADMIN_PROMO_GROUP_EDIT_FIELD_AUTO_ASSIGN": "🤖 Auto assignment by spending",
"ADMIN_PROMO_GROUP_EDIT_FIELD_DEVICES": "📱 Device discount",
"ADMIN_PROMO_GROUP_EDIT_FIELD_NAME": "✏️ Rename",
"ADMIN_PROMO_GROUP_EDIT_FIELD_PERIODS": "⏳ Period discounts",
"ADMIN_PROMO_GROUP_EDIT_FIELD_SERVERS": "🖥 Server discount",
"ADMIN_PROMO_GROUP_EDIT_FIELD_TRAFFIC": "🌐 Traffic discount",
"ADMIN_PROMO_GROUP_EDIT_MENU_HINT": "Select a parameter to change:",
"ADMIN_PROMO_GROUP_EDIT_MENU_TITLE": "✏️ Promo group settings “{name}”",
"ADMIN_PROMO_GROUP_EDIT_PERIOD_PROMPT": "Enter new period discounts (current: {current}). Send 0 if none.",
"ADMIN_PROMO_GROUP_INVALID_AUTO_ASSIGN": "Enter a non-negative amount in rubles or 0 to disable.",
"ADMIN_PROMO_GROUP_INVALID_PERIOD_DISCOUNTS": "Enter period:discount pairs separated by commas, e.g. 30:10, 90:15, or 0.",
"ADMIN_PROMO_GROUP_PERIOD_DISCOUNTS_HEADER": "⏳ Period discounts:",
"ADMIN_REPORTS": "📊 Reports",
"ADMIN_TICKETS_TITLE": "🎫 All support tickets:",
"ADMIN_TICKETS_TITLE_CLOSED": "🎫 Closed support tickets:",
"ADMIN_TICKETS_TITLE_OPEN": "🎫 Open support tickets:",
"ADMIN_TICKET_REPLY_INPUT": "Enter support reply:",
"ADMIN_TICKET_REPLY_SENT": "✅ Reply sent!",
"ATTACHMENTS_SENT": "✅ Attachments sent.",
"BACK_TO_MENU": "🏠 Back to menu",
"BACK_TO_OPEN_TICKETS": "🔴 Open tickets",
"BACK_TO_SUPPORT": "⬅️ Back to support",
"BACK_TO_TICKETS": "⬅️ Back to tickets",
"BALANCE_TOPUP": "💳 Top up balance",
"BLOCK_BY_TIME": "⏳ Temporary block",
"BLOCK_FOREVER": "🚫 Block permanently",
"CAMPAIGN_EXISTING_USERL": "️ This promotional link is available to new users only.",
"CANCEL_REPLY": "❌ Cancel reply",
"CANCEL_TICKET_CREATION": "❌ Cancel ticket creation",
"CLOSED_TICKETS": "🟢 Closed",
"CLOSED_TICKETS_HEADER": "🟢 Closed tickets",
"CLOSED_TICKETS_TITLE": "🟢 Closed tickets:",
"CLOSE_NOTIFICATION": "❌ Close notification",
"CLOSE_TICKET": "🔒 Close ticket",
"CONTACT_SUPPORT_BUTTON": "💬 Contact support",
"CREATE_TICKET_BUTTON": "🎫 Create ticket",
"DELETE_MESSAGE": "🗑 Delete",
"DISCOUNT_BONUS_DESCRIPTION": "Renewal discount bonus",
"DISCOUNT_CLAIM_ALREADY": "️ This discount has already been activated.",
"DISCOUNT_CLAIM_ERROR": "❌ Failed to credit the discount. Please try again later.",
"DISCOUNT_CLAIM_EXPIRED": "⚠️ The offer has expired.",
"DISCOUNT_CLAIM_NOT_FOUND": "❌ Offer not found.",
"DISCOUNT_CLAIM_SUCCESS": "🎉 Discount of {percent}% activated! {amount} credited to your balance.",
"ENTER_BLOCK_MINUTES": "Enter the number of minutes to block the user (e.g., 15):",
"LANGUAGE_SELECTION_DISABLED": "⚙️ Language selection is temporarily unavailable. Using the default language.",
"MARK_AS_ANSWERED": "✅ Mark as answered",
"MULENPAY_PAYMENT_ERROR": "❌ Failed to create Mulen Pay payment. Please try again later or contact support.",
"MULENPAY_PAYMENT_INSTRUCTIONS": "💳 <b>Mulen Pay payment</b>\n\n💰 Amount: {amount}\n🆔 Payment ID: {payment_id}\n\n📱 <b>How to pay:</b>\n1. Press Pay with Mulen Pay\n2. Follow the instructions on the payment page\n3. Confirm the transfer\n4. Funds will be credited automatically\n\n❓ Need help? Contact {support}",
"MULENPAY_PAY_BUTTON": "💳 Pay with Mulen Pay",
"MULENPAY_TOPUP_PROMPT": "💳 <b>Mulen Pay payment</b>\n\nEnter an amount between 100 and 100,000 ₽.\nThe payment is processed by the secure Mulen Pay platform.",
"MY_TICKETS_BUTTON": "📋 My tickets",
"MY_TICKETS_TITLE": "📋 Your tickets:",
"NOTIFICATION_CLOSED": "Notification closed.",
"NOTIFICATION_VALUE_INVALID": "❌ Invalid value, please enter a number.",
"NOTIFICATION_VALUE_UPDATED": "✅ Settings updated.",
"NOTIFY_PROMPT_SECOND_HOURS": "Enter the number of hours the discount is active (1-168):",
"NOTIFY_PROMPT_SECOND_PERCENT": "Enter a new discount percentage for the 2-3 day reminder (0-100):",
"NOTIFY_PROMPT_THIRD_DAYS": "After how many days without a subscription should we send the offer? (minimum 2):",
"NOTIFY_PROMPT_THIRD_HOURS": "Enter the number of hours the late discount is active (1-168):",
"NOTIFY_PROMPT_THIRD_PERCENT": "Enter a new discount percentage for the late offer (0-100):",
"NO_ATTACHMENTS": "No attachments.",
"NO_CLOSED_TICKETS": "There are no closed tickets yet.",
"NO_TICKETS": "You don't have any tickets yet.",
"NO_TICKETS_ADMIN": "No tickets to display.",
"OPEN_TICKETS": "🔴 Open",
"OPEN_TICKETS_HEADER": "🔴 Open tickets",
"PAL24_PAYMENT_ERROR": "❌ Failed to create a PayPalych payment. Please try again later or contact support.",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>PayPalych (SBP) payment</b>\n\n💰 Amount: {amount}\n🆔 Invoice ID: {bill_id}\n\n📱 <b>How to pay:</b>\n1. Press Pay with PayPalych (SBP)\n2. Follow the system prompts\n3. Confirm the transfer\n4. Funds will be credited automatically\n\n❓ Need help? Contact {support}",
"PAL24_PAY_BUTTON": "🏦 Pay with PayPalych (SBP)",
"PAL24_TOPUP_PROMPT": "🏦 <b>PayPalych (SBP) payment</b>\n\nEnter an amount between 100 and 1,000,000 ₽.\nThe payment is processed via the PayPalych Faster Payments System.",
"PAYMENT_CARD_MULENPAY": "💳 Bank card (Mulen Pay)",
"PAYMENT_CARD_PAL24": "🏦 SBP (PayPalych)",
"PAYMENT_METHOD_MULENPAY_DESCRIPTION": "via Mulen Pay",
"PAYMENT_METHOD_MULENPAY_NAME": "💳 <b>Bank card (Mulen Pay)</b>",
"PAYMENT_METHOD_PAL24_DESCRIPTION": "via Faster Payments System",
"PAYMENT_METHOD_PAL24_NAME": "🏦 <b>SBP (PayPalych)</b>",
"REPLY_TO_TICKET": "💬 Reply",
"REPORT_CLOSE": "❌ Close",
"REPORT_CLOSED": "✅ Report closed.",
"REPORT_CLOSE_ERROR": "❌ Failed to close the report.",
"SENDING_ATTACHMENTS": "📎 Sending attachments...",
"SUBSCRIPTION_EXPIRED_1D": "⛔ <b>Your subscription expired</b>\n\nAccess was disabled on {end_date}. Renew to return to the service.\n\n💎 Renewal price: {price}",
"SUBSCRIPTION_EXPIRED_SECOND_WAVE": "🔥 <b>{percent}% discount on renewal</b>\n\nTap “Get discount” and we'll add {bonus} to your balance. The offer is valid until {expires_at}.",
"SUBSCRIPTION_EXPIRED_THIRD_WAVE": "🎁 <b>Personal {percent}% discount</b>\n\nIt's been {trigger_days} days without a subscription. Come back — tap “Get discount” and {bonus} will be credited. Offer valid until {expires_at}.",
"SUBSCRIPTION_EXTEND": "💎 Extend subscription",
"SUBSCRIPTION_HAPP_CRYPTOLINK_BLOCK": "<blockquote expandable><code>{crypto_link}</code></blockquote>",
"SUBSCRIPTION_HAPP_LINK_PROMPT": "🔒 Subscription link is ready. Tap the \"Connect\" button below to open it in Happ.",
"SUBSCRIPTION_HAPP_OPEN_BUTTON_HINT": "▶️ Tap the \"Connect\" button below to open Happ and add the subscription automatically.",
"SUBSCRIPTION_HAPP_OPEN_HINT": "💡 If the link doesn't open automatically, copy it manually:",
"SUBSCRIPTION_HAPP_OPEN_LINK": "<a href=\"{subscription_link}\">🔓 Open link in Happ</a>",
"SUBSCRIPTION_HAPP_OPEN_TITLE": "🔗 <b>Connect via Happ</b>",
"SUPPORT_BUTTON": "🆘 Support",
"TICKET_ALREADY_OPEN": "You already have an open ticket. Please close it first.",
"TICKET_ATTACHMENTS": "📎 Attachments",
"TICKET_CLOSED": "✅ Ticket closed.",
"TICKET_CLOSED_NO_REPLY": "❌ The ticket is closed; replying is not possible.",
"TICKET_CLOSE_ERROR": "❌ Error closing ticket.",
"TICKET_CREATED_SUCCESS": "✅ Ticket #{ticket_id} created successfully!\n\nTitle: {title}\n\nWe will respond to you soon.",
"TICKET_CREATE_ERROR": "❌ An error occurred while creating the ticket. Please try again later.",
"TICKET_CREATION_CANCELLED": "Ticket creation cancelled.",
"TICKET_CREATION_ERROR": "❌ An error occurred while creating the ticket. Please try again later.",
"TICKET_MARKED_ANSWERED": "✅ Ticket marked as answered.",
"TICKET_MESSAGE_INPUT": "Now describe your problem or question:",
"TICKET_MESSAGE_TOO_SHORT": "Message must contain at least 10 characters. Try again:",
"TICKET_NOT_FOUND": "Ticket not found.",
"TICKET_PRIORITY_HIGH": "🟠 High",
"TICKET_PRIORITY_LOW": "🟢 Low",
"TICKET_PRIORITY_NORMAL": "🟡 Normal",
"TICKET_PRIORITY_SELECT": "Select ticket priority:",
"TICKET_PRIORITY_URGENT": "🔴 Urgent",
"TICKET_REPLY_CANCELLED": "Reply cancelled.",
"TICKET_REPLY_ERROR": "❌ An error occurred while sending the reply. Please try again later.",
"TICKET_REPLY_INPUT": "Enter your reply:",
"TICKET_REPLY_NOTIFICATION": "🎫 Reply received for ticket #{ticket_id}\n\n{reply_preview}\n\nClick the button below to go to the ticket:",
"TICKET_REPLY_SENT": "✅ Your reply has been sent!",
"TICKET_REPLY_TOO_SHORT": "Reply must contain at least 5 characters. Try again:",
"TICKET_STATUS_ANSWERED": "Answered",
"TICKET_STATUS_CLOSED": "Closed",
"TICKET_STATUS_OPEN": "Open",
"TICKET_STATUS_PENDING": "Pending",
"TICKET_TITLE_INPUT": "Enter ticket title:",
"TICKET_TITLE_TOO_LONG": "Title is too long. Maximum 255 characters. Try again:",
"TICKET_TITLE_TOO_SHORT": "Title must contain at least 5 characters. Try again:",
"TICKET_UPDATE_ERROR": "❌ Error updating ticket.",
"TRIAL_INACTIVE_1H": "⏳ <b>An hour has passed and we haven't seen any traffic yet</b>\n\nOpen the connection guide and follow the steps. We're always ready to help!",
"TRIAL_INACTIVE_24H": "⏳ <b>A full day passed without activity</b>\n\nWe still don't see traffic from your test subscription. Use the guide or message support and we'll help you connect!",
"UNBLOCK": "✅ Unblock",
"USER_BLOCKED_FOREVER": "You are blocked from contacting support.",
"USER_BLOCKED_UNTIL": "You are blocked until {time}",
"VIEW_CLOSED_TICKETS": "🟢 Closed tickets",
"VIEW_TICKET": "👁️ View ticket",
"ADMIN_USERS_SUBMENU_TITLE": "👥 **User and subscription management**\n\n",
"ADMIN_PROMO_SUBMENU_TITLE": "💰 **Promo codes and statistics**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_TITLE": "📨 **Communications**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_DESCRIPTION": "Manage broadcasts and interface texts:",
"ADMIN_SUBMENU_SELECT_SECTION": "Choose a section:",
"ADMIN_SUPPORT_SUBMENU_TITLE": "🛟 **Support**\n\n",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION": "Manage tickets and support settings:",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION_MODERATOR": "Ticket access only.",
"ADMIN_SUPPORT_MODERATION_TITLE": "🧑‍⚖️ <b>Support moderation</b>",
"ADMIN_SUPPORT_MODERATION_DESCRIPTION": "Access to support tickets.",
"ADMIN_SUPPORT_AUDIT_TITLE": "🧾 <b>Moderator audit</b>",
"ADMIN_SUPPORT_AUDIT_EMPTY": "Nothing here yet",
"ADMIN_SUPPORT_AUDIT_ROLE_MODERATOR": "Moderator",
"ADMIN_SUPPORT_AUDIT_ROLE_ADMIN": "Admin",
"ADMIN_SUPPORT_AUDIT_ACTION_CLOSE_TICKET": "Ticket closed",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_TIMED": "Timed block",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_PERM": "Permanent block",
"ADMIN_SUPPORT_AUDIT_ACTION_UNBLOCK": "Unblock",
"ADMIN_SETTINGS_SUBMENU_TITLE": "⚙️ **System settings**\n\n",
"ADMIN_SETTINGS_SUBMENU_DESCRIPTION": "Manage Remnawave, monitoring and other settings:",
"ADMIN_SYSTEM_SUBMENU_TITLE": "🛠️ **System tools**\n\n",
"ADMIN_SYSTEM_SUBMENU_DESCRIPTION": "Reports, updates, logs, backups and system operations:",
"ADMIN_SUPPORT_SETTINGS_STATUS_ENABLED": "Enabled",
"ADMIN_SUPPORT_SETTINGS_STATUS_DISABLED": "Disabled",
"ADMIN_SUPPORT_SETTINGS_MENU_LABEL": "\"Support\" menu item",
"ADMIN_SUPPORT_SETTINGS_MODE_TICKETS": "Tickets",
"ADMIN_SUPPORT_SETTINGS_MODE_CONTACT": "Contact",
"ADMIN_SUPPORT_SETTINGS_MODE_BOTH": "Both",
"ADMIN_SUPPORT_SETTINGS_EDIT_DESCRIPTION": "📝 Edit description",
"ADMIN_SUPPORT_SETTINGS_ADMIN_NOTIFICATIONS": "Admin notifications",
"ADMIN_SUPPORT_SETTINGS_USER_NOTIFICATIONS": "User notifications",
"ADMIN_SUPPORT_SETTINGS_SLA_LABEL": "SLA",
"ADMIN_SUPPORT_SETTINGS_SLA_TIME": "⏳ SLA time: {minutes} min",
"ADMIN_SUPPORT_SETTINGS_MODERATORS_COUNT": "🧑‍⚖️ Moderators: {count}",
"ADMIN_SUPPORT_SETTINGS_ADD_MODERATOR": " Assign moderator",
"ADMIN_SUPPORT_SETTINGS_REMOVE_MODERATOR": " Remove moderator",
"ADMIN_SUPPORT_SETTINGS_TITLE": "🛟 <b>Support settings</b>",
"ADMIN_SUPPORT_SETTINGS_DESCRIPTION": "Working hours and menu visibility. Current support menu description:",
"ADMIN_SUPPORT_SLA_SETUP_PROMPT": "⏳ <b>SLA configuration</b>\n\nEnter the response wait time in minutes (integer > 0):",
"ADMIN_SUPPORT_SLA_INVALID": "❌ Enter a valid number of minutes (1-1440)",
"ADMIN_SUPPORT_SLA_SAVED": "✅ SLA value saved",
"ADMIN_SUPPORT_ASSIGN_MODERATOR_PROMPT": "🧑‍⚖️ <b>Assign moderator</b>\n\nSend the user's Telegram ID (number)",
"ADMIN_SUPPORT_REMOVE_MODERATOR_PROMPT": "🧑‍⚖️ <b>Remove moderator</b>\n\nSend the user's Telegram ID (number)",
"ADMIN_SUPPORT_INVALID_TELEGRAM_ID": "❌ Enter a valid Telegram ID (number)",
"ADMIN_SUPPORT_MODERATOR_REMOVED_SUCCESS": "✅ Moderator {tid} removed",
"ADMIN_SUPPORT_MODERATOR_REMOVED_FAIL": "❌ Failed to remove moderator",
"ADMIN_SUPPORT_MODERATOR_ADDED_SUCCESS": "✅ User {tid} assigned as moderator",
"ADMIN_SUPPORT_MODERATOR_ADDED_FAIL": "❌ Failed to assign moderator",
"ADMIN_SUPPORT_MODERATORS_EMPTY": "List is empty",
"ADMIN_SUPPORT_MODERATORS_TITLE": "🧑‍⚖️ <b>Moderators</b>",
"ADMIN_SUPPORT_SEND_DESCRIPTION": "📨 Send description",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_TITLE": "📝 <b>Editing support description</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CURRENT": "Current description:",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_TITLE": "<b>Contact for \"Contact\" mode</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_HINT": "Add to the description if needed.",
"ADMIN_SUPPORT_DESCRIPTION_UPDATED": "✅ Description updated.",
"ADMIN_SUPPORT_DESCRIPTION_SENT": "Description sent below",
"ADMIN_SUPPORT_MESSAGE_DELETED": "Message deleted"
}
+271 -2
View File
@@ -1,6 +1,20 @@
{
"ACCESS_DENIED": "❌ Доступ запрещен",
"ADD_COUNTRIES_BUTTON": "🌐 Добавить страны",
"COUNTRY_MANAGEMENT_UNAVAILABLE": "ℹ️ Управление серверами недоступно - доступен только один сервер",
"COUNTRY_MANAGEMENT_PROMPT": "🌍 <b>Управление странами подписки</b>\n\n📋 <b>Текущие страны ({current_count}):</b>\n{current_list}\n\n💡 <b>Инструкция:</b>\n✅ - страна подключена\n➕ - будет добавлена (платно)\n➖ - будет отключена (бесплатно)\n⚪ - не выбрана\n\n⚠️ <b>Важно:</b> Повторное подключение отключенных стран будет платным!",
"COUNTRY_MANAGEMENT_NONE": "Нет подключенных стран",
"PAID_FEATURE_ONLY": "⚠ Эта функция доступна только для платных подписок",
"PAID_FEATURE_ONLY_SHORT": "⚠ Только для платных подписок",
"COUNTRY_NOT_AVAILABLE_PROMOGROUP": "❌ Сервер недоступен для вашей промогруппы",
"COUNTRY_CHANGES_NOT_FOUND": "⚠️ Изменения не обнаружены",
"COUNTRY_CHANGES_SUCCESS_HEADER": "✅ <b>Страны успешно обновлены!</b>\n\n",
"COUNTRY_CHANGES_ADDED_HEADER": " <b>Добавлены страны:</b>\n",
"COUNTRY_CHANGES_CHARGED": "💰 Списано: {amount} (за {months} мес)",
"COUNTRY_CHANGES_DISCOUNT_INFO": " (скидка {percent}%: -{amount})",
"COUNTRY_CHANGES_REMOVED_HEADER": " <b>Отключены страны:</b>\n",
"COUNTRY_CHANGES_REMOVED_WARNING": "ℹ️ Повторное подключение будет платным",
"COUNTRY_CHANGES_ACTIVE_COUNT": "🌐 <b>Активных стран:</b> {count}",
"ADMIN_MAIN_MENU": "🏠 Главное меню",
"ADMIN_CAMPAIGNS": "📣 Рекламные кампании",
"ADMIN_MESSAGES": "📨 Рассылки",
@@ -38,6 +52,22 @@
"ADMIN_USER_PROMO_GROUP_ALREADY": "ℹ️ Пользователь уже состоит в этой промогруппе.",
"ADMIN_USER_PROMO_GROUP_ERROR": "❌ Не удалось обновить промогруппу пользователя.",
"ADMIN_USER_PROMO_GROUP_BACK": "⬅️ К пользователю",
"ADMIN_USER_MANAGEMENT_PROFILE": "👤 <b>Управление пользователем</b>\n\n<b>Основная информация:</b>\n• Имя: {name}\n• ID: <code>{telegram_id}</code>\n• Username: {username}\n• Статус: {status}\n• Язык: {language}\n\n<b>Финансы:</b>\n• Баланс: {balance}\n• Транзакций: {transactions}\n\n<b>Активность:</b>\n• Регистрация: {registration}\n• Последняя активность: {last_activity}\n• Дней с регистрации: {registration_days}",
"ADMIN_USER_USERNAME_NOT_SET": "не указан",
"ADMIN_USER_STATUS_ACTIVE": "✅ Активен",
"ADMIN_USER_STATUS_BLOCKED": "🚫 Заблокирован",
"ADMIN_USER_STATUS_DELETED": "🗑️ Удален",
"ADMIN_USER_STATUS_UNKNOWN": "❓ Неизвестно",
"ADMIN_USER_LAST_ACTIVITY_UNKNOWN": "Неизвестно",
"ADMIN_USER_SUBSCRIPTION_TYPE_TRIAL": "🎁 Триал",
"ADMIN_USER_SUBSCRIPTION_TYPE_PAID": "💎 Платная",
"ADMIN_USER_SUBSCRIPTION_STATUS_ACTIVE": "✅ Активна",
"ADMIN_USER_SUBSCRIPTION_STATUS_INACTIVE": "❌ Неактивна",
"ADMIN_USER_TRAFFIC_USAGE": "{used}/{limit} ГБ",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION": "<b>Подписка:</b>\n• Тип: {type}\n• Статус: {status}\n• До: {end_date}\n• Трафик: {traffic}\n• Устройства: {devices}\n• Стран: {countries}",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION_NONE": "<b>Подписка:</b> Отсутствует",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP": "<b>Промогруппа:</b>\n• Название: {name}\n• Скидка на сервера: {server_discount}%\n• Скидка на трафик: {traffic_discount}%\n• Скидка на устройства: {device_discount}%",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP_NONE": "<b>Промогруппа:</b> Не назначена",
"ADMIN_PROMO_GROUP_DETAILS_TITLE": "💳 <b>Промогруппа:</b> {name}",
"ADMIN_PROMO_GROUP_DETAILS_MEMBERS": "Участников: {count}",
"ADMIN_PROMO_GROUP_DETAILS_DEFAULT": "Это базовая группа.",
@@ -72,6 +102,12 @@
"AUTOPAY_FAILED": "\n❌ <b>Ошибка автоплатежа</b>\n\nНе удалось списать средства для продления подписки.\nНедостаточно средств на балансе: {balance}\nТребуется: {required}\n\nПополните баланс и продлите подписку вручную.\n",
"AUTOPAY_SET_DAYS_BUTTON": "⚙️ Настроить дни",
"AUTOPAY_SUCCESS": "\n✅ <b>Автоплатеж выполнен</b>\n\nВаша подписка автоматически продлена на {days} дней.\nСписано с баланса: {amount}\n",
"AUTOPAY_STATUS_ENABLED": "включен",
"AUTOPAY_STATUS_DISABLED": "выключен",
"AUTOPAY_MENU_TEXT": "💳 <b>Автоплатеж</b>\n\n📊 <b>Статус:</b> {status}\n⏰ <b>Списание за:</b> {days} дн. до окончания\n\nВыберите действие:",
"AUTOPAY_TOGGLE_SUCCESS": "✅ Автоплатеж {status}!",
"AUTOPAY_SELECT_DAYS_PROMPT": "⏰ Выберите за сколько дней до окончания списывать средства:",
"AUTOPAY_DAYS_SET": "✅ Установлено {days} дней!",
"BACK": "⬅️ Назад",
"BACK_TO_SUBSCRIPTION": "⬅️ К подписке",
"BALANCE_BUTTON": "💰 Баланс: {balance}",
@@ -93,6 +129,7 @@
"PROMO_GROUP_PERIOD_DISCOUNT_ITEM": "{period} — {percent}%",
"CANCEL": "❌ Отмена",
"CHANGE_DEVICES_BUTTON": "📱 Изменить устройства",
"CHANGE_DEVICES_PROMPT": "📱 <b>Изменение количества устройств</b>\n\nТекущий лимит: {current_devices} устройств\nВыберите новое количество устройств:\n\n💡 <b>Важно:</b>\n• При увеличении - доплата пропорционально оставшемуся времени\n• При уменьшении - возврат средств не производится",
"CHANGE_DEVICES_CONFIRM": "\n 📱 <b>Подтверждение изменения</b>\n\n Текущее количество: {current_devices} устройств\n Новое количество: {new_devices} устройств\n\n Действие: {action}\n 💰 {cost}\n\n Подтвердить изменение?\n ",
"CHANGE_DEVICES_INFO": "\n 📱 <b>Изменение количества устройств</b>\n\n Текущий лимит: {current_devices} устройств\n\n Выберите новое количество устройств:\n\n 💡 <b>Важно:</b>\n • При увеличении - доплата пропорционально оставшемуся времени\n • При уменьшении - возврат средств не производится\n ",
"CHANGE_DEVICES_SUCCESS_DECREASE": "\n ✅ Количество устройств уменьшено!\n\n 📱 Было: {old_count} → Стало: {new_count}\n ℹ️ Возврат средств не производится\n ",
@@ -103,6 +140,7 @@
"CHANNEL_SUBSCRIBE_BUTTON": "🔗 Подписаться",
"CHANNEL_SUBSCRIBE_REQUIRED_ALERT": "❌ Вы не подписались на канал!",
"CHANNEL_SUBSCRIBE_THANKS": "✅ Спасибо за подписку",
"TRIAL_CHANNEL_UNSUBSCRIBED": "\n🚫 <b>Доступ приостановлен</b>\n\nМы не нашли вашу подписку на наш канал, поэтому тестовая подписка отключена.\n\nПодпишитесь на канал и нажмите «{check_button}», чтобы вернуть доступ.",
"CHECK_STATUS_BUTTON": "📊 Проверить статус",
"CHOOSE_ANOTHER_DEVICE": "📱 Выбрать другое устройство",
"CONFIRM": "✅ Подтвердить",
@@ -128,6 +166,19 @@
"DEVICES_LIMIT_EXCEEDED": "⚠️ Превышен максимальный лимит устройств ({limit})",
"DEVICES_MINIMUM_LIMIT": "⚠️ Минимальное количество устройств: {limit}",
"DEVICES_NO_CHANGE": "ℹ️ Количество устройств не изменилось",
"PAYMENT_CHARGE_ERROR": "⚠️ Ошибка списания средств",
"DEVICE_CHANGE_ACTION_INCREASE": "увеличить до {count}",
"DEVICE_CHANGE_EXTRA_COST": "Доплата: {amount} (за {months} мес)",
"DEVICE_CHANGE_DISCOUNT_INFO": " (скидка {percent}%: -{amount})",
"DEVICE_CHANGE_FREE": "Бесплатно",
"DEVICE_CHANGE_ACTION_DECREASE": "уменьшить до {count}",
"DEVICE_CHANGE_NO_REFUND": "Возврат средств не производится",
"DEVICE_CHANGE_CONFIRMATION": "📱 <b>Подтверждение изменения</b>\n\nТекущее количество: {current} устройств\nНовое количество: {new} устройств\n\nДействие: {action}\n💰 {cost}\n\nПодтвердить изменение?",
"DEVICE_CHANGE_INCREASE_SUCCESS": "✅ Количество устройств увеличено!\n\n",
"DEVICE_CHANGE_RESULT_LINE": "📱 Было: {old} → Стало: {new}\n",
"DEVICE_CHANGE_CHARGED": "💰 Списано: {amount}",
"DEVICE_CHANGE_DECREASE_SUCCESS": "✅ Количество устройств уменьшено!\n\n",
"DEVICE_CHANGE_NO_REFUND_INFO": "ℹ️ Возврат средств не производится",
"DEVICE_CONNECTION_HELP": "❓ Как подключить устройство заново?",
"DEVICE_GUIDE_ANDROID": "🤖 Android",
"DEVICE_GUIDE_ANDROID_TV": "📺 Android TV",
@@ -153,6 +204,26 @@
"MAIN_MENU_ACTION_PROMPT": "Выберите действие:",
"MAIN_MENU_BUTTON": "🏠 Главное меню",
"MANAGE_DEVICES_BUTTON": "🔧 Управление устройствами",
"DEVICE_UUID_NOT_FOUND": "❌ UUID пользователя не найден",
"DEVICE_NONE_CONNECTED": "ℹ️ У вас нет подключенных устройств",
"DEVICE_FETCH_INFO_ERROR": "❌ Ошибка получения информации об устройствах",
"DEVICE_MANAGEMENT_OVERVIEW": "🔄 <b>Управление устройствами</b>\n\n📊 Всего подключено: {total} устройств\n📄 Страница {page} из {pages}\n\n",
"DEVICE_MANAGEMENT_CONNECTED_HEADER": "<b>Подключенные устройства:</b>\n",
"DEVICE_MANAGEMENT_LIST_ITEM": "• {device}\n",
"DEVICE_MANAGEMENT_ACTIONS": "\n💡 <b>Действия:</b>\n• Выберите устройство для сброса\n• Или сбросьте все устройства сразу",
"DEVICE_FETCH_ERROR": "❌ Ошибка получения устройств",
"DEVICE_PAGE_LOAD_ERROR": "❌ Ошибка загрузки страницы",
"DEVICE_RESET_INVALID_REQUEST": "❌ Ошибка: некорректный запрос",
"DEVICE_RESET_PARSE_ERROR": "❌ Ошибка обработки запроса",
"DEVICE_RESET_SUCCESS": "✅ Устройство {device} успешно сброшено!",
"DEVICE_RESET_ALL_DONE": "ℹ️ Все устройства сброшены",
"DEVICE_RESET_ID_FAILED": "❌ Не удалось получить ID устройства",
"DEVICE_RESET_NOT_FOUND": "❌ Устройство не найдено",
"DEVICE_RESET_ERROR": "❌ Ошибка сброса устройства",
"DEVICE_LIST_FETCH_ERROR": "❌ Ошибка получения списка устройств",
"DEVICE_RESET_ALL_SUCCESS_MESSAGE": "✅ <b>Все устройства успешно сброшены!</b>\n\n🔄 Сброшено: {count} устройств\n📱 Теперь вы можете заново подключить свои устройства\n\n💡 Используйте ссылку из раздела 'Моя подписка' для повторного подключения",
"DEVICE_RESET_PARTIAL_MESSAGE": "⚠️ <b>Частичный сброс устройств</b>\n\n✅ Удалено: {success} устройств\n❌ Не удалось удалить: {failed} устройств\n\nПопробуйте еще раз или обратитесь в поддержку.",
"DEVICE_RESET_ALL_FAILED_MESSAGE": "❌ <b>Не удалось сбросить устройства</b>\n\nПопробуйте еще раз позже или обратитесь в техподдержку.\n\nВсего устройств: {total}",
"MENU_ADMIN": "⚙️ Админ-панель",
"MENU_BALANCE": "💰 Баланс",
"MENU_BUY_SUBSCRIPTION": "💎 Купить подписку",
@@ -234,6 +305,9 @@
"SUBSCRIPTION_NONE": "❌ Нет активной подписки",
"SUBSCRIPTION_NOT_FOUND": "❌ Подписка не найдена",
"SUBSCRIPTION_PURCHASED": "🎉 Подписка успешно приобретена!",
"SUBSCRIPTION_SETTINGS_PAID_ONLY": "⚠️ Настройки доступны только для платных подписок",
"SUBSCRIPTION_SETTINGS_OVERVIEW": "⚙️ <b>Настройки подписки</b>\n\n📊 <b>Текущие параметры:</b>\n🌐 Стран: {countries_count}\n📈 Трафик: {traffic_used} / {traffic_limit}\n📱 Устройства: {devices_used} / {devices_limit}\n\nВыберите что хотите изменить:",
"SUBSCRIPTION_ACTIVE_REQUIRED": "⚠️ У вас нет активной подписки!",
"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": "🧪 Тестовая подписка",
@@ -297,6 +371,9 @@
"TRIAL_ALREADY_USED": "❌ Тестовая подписка уже была использована",
"TRIAL_AVAILABLE": "\n🎁 <b>Тестовая подписка</b>\n\nВы можете получить бесплатную тестовую подписку:\n\n⏰ <b>Период:</b> {days} дней\n📈 <b>Трафик:</b> {traffic} ГБ\n📱 <b>Устройства:</b> {devices} шт.\n🌍 <b>Сервер:</b> {server_name}\n\nАктивировать тестовую подписку?\n",
"TRIAL_ENDING_SOON": "\n🎁 <b>Тестовая подписка скоро закончится!</b>\n\nВаша тестовая подписка истекает через несколько часов.\n\n💎 <b>Не хотите остаться без VPN?</b>\nПереходите на полную подписку!\n\n🔥 <b>Специальное предложение:</b>\n• 30 дней всего за {price}\n• Безлимитный трафик \n• Все серверы доступны\n• Скорость до 1ГБит/сек\n\n⚡️ Успейте оформить до окончания тестового периода!\n",
"TRAFFIC_FIXED_MODE": "⚠️ В текущем режиме трафик фиксированный и не может быть изменен",
"TRAFFIC_ALREADY_UNLIMITED": "⚠ У вас уже безлимитный трафик",
"ADD_TRAFFIC_PROMPT": "📈 <b>Добавить трафик к подписке</b>\n\nТекущий лимит: {current_traffic}\nВыберите дополнительный трафик:",
"UNKNOWN_CALLBACK_ALERT": "❓ Неизвестная команда. Попробуйте ещё раз.",
"UNKNOWN_COMMAND_MESSAGE": "❓ Не понимаю эту команду. Используйте кнопки меню.",
"USER_NOT_FOUND": "❌ Пользователь не найден",
@@ -428,6 +505,198 @@
"PAYMENT_METHOD_CRYPTOBOT_DESCRIPTION": "через CryptoBot",
"PAYMENT_METHOD_SUPPORT_NAME": "🛠️ <b>Через поддержку</b>",
"PAYMENT_METHOD_SUPPORT_DESCRIPTION": "другие способы",
"PAYMENT_METHODS_UNAVAILABLE_ALERT": "⚠️ В данный момент автоматические способы оплаты временно недоступны. Для пополнения баланса обратитесь в техподдержку."
"PAYMENT_METHODS_UNAVAILABLE_ALERT": "⚠️ В данный момент автоматические способы оплаты временно недоступны. Для пополнения баланса обратитесь в техподдержку.",
"ADMIN_MONITORING_SETTINGS": "⚙️ Настройки мониторинга",
"ADMIN_PROMO_GROUP_AUTO_ASSIGN_DISABLED": "Автовыдача по суммарным тратам: отключена",
"ADMIN_PROMO_GROUP_AUTO_ASSIGN_LINE": "Автовыдача по суммарным тратам: от {amount} ₽",
"ADMIN_PROMO_GROUP_CREATE_AUTO_ASSIGN_PROMPT": "Введите сумму общих трат (в ₽) для автоматической выдачи этой группы. Отправьте 0, чтобы отключить.",
"ADMIN_PROMO_GROUP_CREATE_PERIOD_PROMPT": "Введите скидки на периоды подписки (например, 30:10, 90:15). Отправьте 0, если без скидок.",
"ADMIN_PROMO_GROUP_EDIT_AUTO_ASSIGN_PROMPT": "Введите сумму общих трат (в ₽) для автовыдачи. Текущее значение: {current}.",
"ADMIN_PROMO_GROUP_EDIT_FIELD_AUTO_ASSIGN": "🤖 Автовыдача по тратам",
"ADMIN_PROMO_GROUP_EDIT_FIELD_DEVICES": "📱 Скидка на устройства",
"ADMIN_PROMO_GROUP_EDIT_FIELD_NAME": "✏️ Изменить название",
"ADMIN_PROMO_GROUP_EDIT_FIELD_PERIODS": "⏳ Скидки по периодам",
"ADMIN_PROMO_GROUP_EDIT_FIELD_SERVERS": "🖥 Скидка на серверы",
"ADMIN_PROMO_GROUP_EDIT_FIELD_TRAFFIC": "🌐 Скидка на трафик",
"ADMIN_PROMO_GROUP_EDIT_MENU_HINT": "Выберите параметр для изменения:",
"ADMIN_PROMO_GROUP_EDIT_MENU_TITLE": "✏️ Настройки промогруппы «{name}»",
"ADMIN_PROMO_GROUP_EDIT_PERIOD_PROMPT": "Введите новые скидки на периоды (текущие: {current}). Отправьте 0, если без скидок.",
"ADMIN_PROMO_GROUP_INVALID_AUTO_ASSIGN": "Введите неотрицательное число в рублях или 0 для отключения.",
"ADMIN_PROMO_GROUP_INVALID_PERIOD_DISCOUNTS": "Введите пары период:скидка через запятую, например 30:10, 90:15, или 0.",
"ADMIN_PROMO_GROUP_PERIOD_DISCOUNTS_HEADER": "⏳ Скидки по периодам:",
"ADMIN_REPORTS": "📊 Отчеты",
"ADMIN_TICKETS_TITLE": "🎫 Все тикеты поддержки:",
"ADMIN_TICKET_REPLY_INPUT": "Введите ответ от поддержки:",
"ADMIN_TICKET_REPLY_SENT": "✅ Ответ отправлен!",
"ATTACHMENTS_SENT": "✅ Вложения отправлены.",
"BACK_TO_MENU": "🏠 В главное меню",
"BACK_TO_OPEN_TICKETS": "🔴 Открытые тикеты",
"BACK_TO_SUPPORT": "⬅️ К поддержке",
"BACK_TO_TICKETS": "⬅️ К тикетам",
"BALANCE_TOPUP": "💳 Пополнить баланс",
"BLOCK_BY_TIME": "⏳ Блокировка по времени",
"BLOCK_FOREVER": "🚫 Заблокировать",
"CAMPAIGN_EXISTING_USERL": "ℹ️ Эта рекламная ссылка доступна только новым пользователям.",
"CANCEL_REPLY": "❌ Отменить ответ",
"CANCEL_TICKET_CREATION": "❌ Отменить создание тикета",
"CLOSED_TICKETS": "🟢 Закрытые",
"CLOSED_TICKETS_HEADER": "🟢 Закрытые тикеты",
"CLOSED_TICKETS_TITLE": "🟢 Закрытые тикеты:",
"CLOSE_NOTIFICATION": "❌ Закрыть уведомление",
"CLOSE_TICKET": "🔒 Закрыть тикет",
"CONTACT_SUPPORT_BUTTON": "💬 Связаться с поддержкой",
"CREATE_TICKET_BUTTON": "🎫 Создать тикет",
"DELETE_MESSAGE": "🗑 Удалить",
"DISCOUNT_BONUS_DESCRIPTION": "Скидка за продление подписки",
"DISCOUNT_CLAIM_ALREADY": "ℹ️ Скидка уже была активирована ранее.",
"DISCOUNT_CLAIM_ERROR": "❌ Не удалось начислить скидку. Попробуйте позже.",
"DISCOUNT_CLAIM_EXPIRED": "⚠️ Время действия предложения истекло.",
"DISCOUNT_CLAIM_NOT_FOUND": "❌ Предложение не найдено.",
"DISCOUNT_CLAIM_SUCCESS": "🎉 Скидка {percent}% активирована! На баланс начислено {amount}.",
"ENTER_BLOCK_MINUTES": "Введите количество минут для блокировки пользователя (например, 15):",
"LANGUAGE_SELECTION_DISABLED": "⚙️ Выбор языка временно недоступен. Используем язык по умолчанию.",
"MARK_AS_ANSWERED": "✅ Отметить как отвеченный",
"MULENPAY_PAYMENT_ERROR": "❌ Ошибка создания платежа Mulen Pay. Попробуйте позже или обратитесь в поддержку.",
"MULENPAY_PAYMENT_INSTRUCTIONS": "💳 <b>Оплата через Mulen Pay</b>\n\n💰 Сумма: {amount}\n🆔 ID платежа: {payment_id}\n\n📱 <b>Инструкция:</b>\n1. Нажмите кнопку ‘Оплатить через Mulen Pay’\n2. Следуйте подсказкам платежной системы\n3. Подтвердите перевод\n4. Средства зачислятся автоматически\n\n❓ Если возникнут проблемы, обратитесь в {support}",
"MULENPAY_PAY_BUTTON": "💳 Оплатить через Mulen Pay",
"MULENPAY_TOPUP_PROMPT": "💳 <b>Оплата через Mulen Pay</b>\n\nВведите сумму для пополнения от 100 до 100 000 ₽.\nОплата происходит через защищенную платформу Mulen Pay.",
"MY_TICKETS_BUTTON": "📋 Мои тикеты",
"MY_TICKETS_TITLE": "📋 Ваши тикеты:",
"NOTIFICATION_CLOSED": "Уведомление закрыто.",
"NOTIFICATION_VALUE_INVALID": "❌ Некорректное значение, укажите число.",
"NOTIFICATION_VALUE_UPDATED": "✅ Настройки обновлены.",
"NOTIFY_PROMPT_SECOND_HOURS": "Введите количество часов действия скидки (1-168):",
"NOTIFY_PROMPT_SECOND_PERCENT": "Введите новый процент скидки для уведомления через 2-3 дня (0-100):",
"NOTIFY_PROMPT_THIRD_DAYS": "Через сколько дней после истечения отправлять предложение? (минимум 2):",
"NOTIFY_PROMPT_THIRD_HOURS": "Введите количество часов действия скидки (1-168):",
"NOTIFY_PROMPT_THIRD_PERCENT": "Введите новый процент скидки для позднего предложения (0-100):",
"NO_ATTACHMENTS": "Вложений нет.",
"NO_CLOSED_TICKETS": "Закрытых тикетов пока нет.",
"NO_TICKETS": "У вас пока нет тикетов.",
"NO_TICKETS_ADMIN": "Нет тикетов для отображения.",
"OPEN_TICKETS": "🔴 Открытые",
"OPEN_TICKETS_HEADER": "🔴 Открытые тикеты",
"PAL24_PAYMENT_ERROR": "❌ Ошибка создания платежа PayPalych. Попробуйте позже или обратитесь в поддержку.",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>Оплата через PayPalych (СБП)</b>\n\n💰 Сумма: {amount}\n🆔 ID счета: {bill_id}\n\n📱 <b>Инструкция:</b>\n1. Нажмите кнопку ‘Оплатить через PayPalych (СБП)’\n2. Следуйте подсказкам платежной системы\n3. Подтвердите перевод\n4. Средства зачислятся автоматически\n\n❓ Если возникнут проблемы, обратитесь в {support}",
"PAL24_PAY_BUTTON": "🏦 Оплатить через PayPalych (СБП)",
"PAL24_TOPUP_PROMPT": "🏦 <b>Оплата через PayPalych (СБП)</b>\n\nВведите сумму для пополнения от 100 до 1 000 000 ₽.\nОплата проходит через систему быстрых платежей PayPalych.",
"PAYMENT_CARD_MULENPAY": "💳 Банковская карта (Mulen Pay)",
"PAYMENT_CARD_PAL24": "🏦 СБП (PayPalych)",
"PAYMENT_METHOD_MULENPAY_DESCRIPTION": "через Mulen Pay",
"PAYMENT_METHOD_MULENPAY_NAME": "💳 <b>Банковская карта (Mulen Pay)</b>",
"PAYMENT_METHOD_PAL24_DESCRIPTION": "через систему быстрых платежей",
"PAYMENT_METHOD_PAL24_NAME": "🏦 <b>СБП (PayPalych)</b>",
"REPLY_TO_TICKET": "💬 Ответить",
"REPORT_CLOSE": "❌ Закрыть",
"REPORT_CLOSED": "✅ Отчет закрыт.",
"REPORT_CLOSE_ERROR": "❌ Не удалось закрыть отчет.",
"SENDING_ATTACHMENTS": "📎 Отправляю вложения...",
"SUBSCRIPTION_EXPIRED_1D": "⛔ <b>Подписка закончилась</b>\n\nДоступ был отключён {end_date}. Продлите подписку, чтобы вернуть полный доступ.\n\n💎 Стоимость продления: {price}",
"SUBSCRIPTION_EXPIRED_SECOND_WAVE": "🔥 <b>Скидка {percent}% на продление</b>\n\nНажмите «Получить скидку», и мы начислим {bonus} на ваш баланс. Предложение действительно до {expires_at}.",
"SUBSCRIPTION_EXPIRED_THIRD_WAVE": "🎁 <b>Индивидуальная скидка {percent}%</b>\n\nПрошло {trigger_days} дней без подписки. Вернитесь — нажмите «Получить скидку», и {bonus} поступит на баланс. Предложение действительно до {expires_at}.",
"SUBSCRIPTION_EXTEND": "💎 Продлить подписку",
"SUBSCRIPTION_HAPP_CRYPTOLINK_BLOCK": "<blockquote expandable><code>{crypto_link}</code></blockquote>",
"SUBSCRIPTION_HAPP_LINK_PROMPT": "🔒 Ссылка на подписку создана. Нажмите кнопку \"Подключиться\" ниже, чтобы открыть её в Happ.",
"SUBSCRIPTION_HAPP_OPEN_BUTTON_HINT": "▶️ Нажмите кнопку \"Подключиться\" ниже, чтобы открыть Happ и добавить подписку автоматически.",
"SUBSCRIPTION_HAPP_OPEN_HINT": "💡 Если ссылка не открывается автоматически, скопируйте её вручную:",
"SUBSCRIPTION_HAPP_OPEN_LINK": "<a href=\"{subscription_link}\">🔓 Открыть ссылку в Happ</a>",
"SUBSCRIPTION_HAPP_OPEN_TITLE": "🔗 <b>Подключение через Happ</b>",
"SUPPORT_BUTTON": "🆘 Поддержка",
"TICKET_ALREADY_OPEN": "У вас уже есть незакрытый тикет. Сначала закройте его.",
"TICKET_ATTACHMENTS": "📎 Вложения",
"TICKET_CLOSED": "✅ Тикет закрыт.",
"TICKET_CLOSED_NO_REPLY": "❌ Тикет закрыт, ответить невозможно.",
"TICKET_CLOSE_ERROR": "❌ Ошибка при закрытии тикета.",
"TICKET_CREATED_SUCCESS": "✅ Тикет #{ticket_id} успешно создан!\n\nЗаголовок: {title}\n\nМы ответим вам в ближайшее время.",
"TICKET_CREATE_ERROR": "❌ Произошла ошибка при создании тикета. Попробуйте позже.",
"TICKET_CREATION_CANCELLED": "Создание тикета отменено.",
"TICKET_CREATION_ERROR": "❌ Произошла ошибка при создании тикета. Попробуйте позже.",
"TICKET_MARKED_ANSWERED": "✅ Тикет отмечен как отвеченный.",
"TICKET_MESSAGE_INPUT": "Опишите проблему (до 500 символов) или отправьте фото c подписью:",
"TICKET_MESSAGE_TOO_SHORT": "Сообщение должно содержать минимум 10 символов. Попробуйте еще раз:",
"TICKET_NOT_FOUND": "Тикет не найден.",
"TICKET_PRIORITY_HIGH": "🟠 Высокий",
"TICKET_PRIORITY_LOW": "🟢 Низкий",
"TICKET_PRIORITY_NORMAL": "🟡 Обычный",
"TICKET_PRIORITY_SELECT": "Выберите приоритет тикета:",
"TICKET_PRIORITY_URGENT": "🔴 Срочный",
"TICKET_REPLY_CANCELLED": "Ответ отменен.",
"TICKET_REPLY_ERROR": "❌ Произошла ошибка при отправке ответа. Попробуйте позже.",
"TICKET_REPLY_INPUT": "Введите ваш ответ:",
"TICKET_REPLY_NOTIFICATION": "🎫 Получен ответ по тикету #{ticket_id}\n\n{reply_preview}\n\nНажмите кнопку ниже, чтобы перейти к тикету:",
"TICKET_REPLY_SENT": "✅ Ваш ответ отправлен!",
"TICKET_REPLY_TOO_SHORT": "Ответ должен содержать минимум 5 символов. Попробуйте еще раз:",
"TICKET_STATUS_ANSWERED": "Отвечен",
"TICKET_STATUS_CLOSED": "Закрыт",
"TICKET_STATUS_OPEN": "Открыт",
"TICKET_STATUS_PENDING": "В ожидании",
"TICKET_TITLE_INPUT": "Введите заголовок тикета:",
"TICKET_TITLE_TOO_LONG": "Заголовок слишком длинный. Максимум 255 символов. Попробуйте еще раз:",
"TICKET_TITLE_TOO_SHORT": "Заголовок должен содержать минимум 5 символов. Попробуйте еще раз:",
"TICKET_UPDATE_ERROR": "❌ Ошибка при обновлении тикета.",
"TRIAL_INACTIVE_1H": "⏳ <b>Прошёл час, а подключение не выполнено</b>\n\nЕсли возникли сложности — откройте инструкцию и следуйте шагам. Мы всегда готовы помочь!",
"TRIAL_INACTIVE_24H": "⏳ <b>Прошли сутки с начала теста</b>\n\nМы не видим трафика по вашей подписке. Загляните в инструкцию или напишите в поддержку — поможем подключиться!",
"UNBLOCK": "✅ Разблокировать",
"USER_BLOCKED_FOREVER": "Вы заблокированы для обращений в поддержку.",
"USER_BLOCKED_UNTIL": "Вы заблокированы до {time}",
"VIEW_CLOSED_TICKETS": "🟢 Закрытые тикеты",
"VIEW_TICKET": "👁️ Посмотреть тикет",
"ADMIN_USERS_SUBMENU_TITLE": "👥 **Управление пользователями и подписками**\n\n",
"ADMIN_PROMO_SUBMENU_TITLE": "💰 **Промокоды и статистика**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_TITLE": "📨 **Коммуникации**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_DESCRIPTION": "Управление рассылками и текстами интерфейса:",
"ADMIN_SUBMENU_SELECT_SECTION": "Выберите нужный раздел:",
"ADMIN_SUPPORT_SUBMENU_TITLE": "🛟 **Поддержка**\n\n",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION": "Управление тикетами и настройками поддержки:",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION_MODERATOR": "Доступ к тикетам.",
"ADMIN_SUPPORT_MODERATION_TITLE": "🧑‍⚖️ <b>Модерация поддержки</b>",
"ADMIN_SUPPORT_MODERATION_DESCRIPTION": "Доступ к тикетам поддержки.",
"ADMIN_SUPPORT_AUDIT_TITLE": "🧾 <b>Аудит модераторов</b>",
"ADMIN_SUPPORT_AUDIT_EMPTY": "Пока пусто",
"ADMIN_SUPPORT_AUDIT_ROLE_MODERATOR": "Модератор",
"ADMIN_SUPPORT_AUDIT_ROLE_ADMIN": "Админ",
"ADMIN_SUPPORT_AUDIT_ACTION_CLOSE_TICKET": "Закрытие тикета",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_TIMED": "Блокировка (время)",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_PERM": "Блокировка (навсегда)",
"ADMIN_SUPPORT_AUDIT_ACTION_UNBLOCK": "Снятие блока",
"ADMIN_SETTINGS_SUBMENU_TITLE": "⚙️ **Настройки системы**\n\n",
"ADMIN_SETTINGS_SUBMENU_DESCRIPTION": "Управление Remnawave, мониторингом и другими настройками:",
"ADMIN_SYSTEM_SUBMENU_TITLE": "🛠️ **Системные функции**\n\n",
"ADMIN_SYSTEM_SUBMENU_DESCRIPTION": "Отчеты, обновления, логи, резервные копии и системные операции:",
"ADMIN_SUPPORT_SETTINGS_STATUS_ENABLED": "Включены",
"ADMIN_SUPPORT_SETTINGS_STATUS_DISABLED": "Отключены",
"ADMIN_SUPPORT_SETTINGS_MENU_LABEL": "Пункт «Техподдержка» в меню",
"ADMIN_SUPPORT_SETTINGS_MODE_TICKETS": "Тикеты",
"ADMIN_SUPPORT_SETTINGS_MODE_CONTACT": "Контакт",
"ADMIN_SUPPORT_SETTINGS_MODE_BOTH": "Оба",
"ADMIN_SUPPORT_SETTINGS_EDIT_DESCRIPTION": "📝 Изменить описание",
"ADMIN_SUPPORT_SETTINGS_ADMIN_NOTIFICATIONS": "Админ-уведомления",
"ADMIN_SUPPORT_SETTINGS_USER_NOTIFICATIONS": "Пользовательские уведомления",
"ADMIN_SUPPORT_SETTINGS_SLA_LABEL": "SLA",
"ADMIN_SUPPORT_SETTINGS_SLA_TIME": "⏳ Время SLA: {minutes} мин",
"ADMIN_SUPPORT_SETTINGS_MODERATORS_COUNT": "🧑‍⚖️ Модераторы: {count}",
"ADMIN_SUPPORT_SETTINGS_ADD_MODERATOR": "➕ Назначить модератора",
"ADMIN_SUPPORT_SETTINGS_REMOVE_MODERATOR": "➖ Удалить модератора",
"ADMIN_SUPPORT_SETTINGS_TITLE": "🛟 <b>Настройки поддержки</b>",
"ADMIN_SUPPORT_SETTINGS_DESCRIPTION": "Режим работы и видимость в меню. Ниже текущее описание меню поддержки:",
"ADMIN_SUPPORT_SLA_SETUP_PROMPT": "⏳ <b>Настройка SLA</b>\n\nВведите количество минут ожидания ответа (целое число > 0):",
"ADMIN_SUPPORT_SLA_INVALID": "❌ Введите корректное число минут (1-1440)",
"ADMIN_SUPPORT_SLA_SAVED": "✅ Значение SLA сохранено",
"ADMIN_SUPPORT_ASSIGN_MODERATOR_PROMPT": "🧑‍⚖️ <b>Назначение модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
"ADMIN_SUPPORT_REMOVE_MODERATOR_PROMPT": "🧑‍⚖️ <b>Удаление модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
"ADMIN_SUPPORT_INVALID_TELEGRAM_ID": "❌ Введите корректный Telegram ID (число)",
"ADMIN_SUPPORT_MODERATOR_REMOVED_SUCCESS": "✅ Модератор {tid} удалён",
"ADMIN_SUPPORT_MODERATOR_REMOVED_FAIL": "❌ Не удалось удалить модератора",
"ADMIN_SUPPORT_MODERATOR_ADDED_SUCCESS": "✅ Пользователь {tid} назначен модератором",
"ADMIN_SUPPORT_MODERATOR_ADDED_FAIL": "❌ Не удалось назначить модератора",
"ADMIN_SUPPORT_MODERATORS_EMPTY": "Список пуст",
"ADMIN_SUPPORT_MODERATORS_TITLE": "🧑‍⚖️ <b>Модераторы</b>",
"ADMIN_SUPPORT_SEND_DESCRIPTION": "📨 Прислать текст",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_TITLE": "📝 <b>Редактирование описания поддержки</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CURRENT": "Текущее описание:",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_TITLE": "<b>Контакт для режима «Контакт»</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_HINT": "Добавьте в описание при необходимости.",
"ADMIN_SUPPORT_DESCRIPTION_UPDATED": "✅ Описание обновлено.",
"ADMIN_SUPPORT_DESCRIPTION_SENT": "Текст отправлен ниже",
"ADMIN_SUPPORT_MESSAGE_DELETED": "Сообщение удалено"
}
+1 -106
View File
@@ -701,7 +701,7 @@ class AdminNotificationService:
if not payment_method:
return '💰 С баланса'
return method_names.get(payment_method, f'💰 С баланса')
return method_names.get(payment_method, '💰 С баланса')
def _format_traffic(self, traffic_gb: int) -> str:
if traffic_gb == 0:
@@ -748,40 +748,32 @@ class AdminNotificationService:
if details.get("auto_enabled", False):
icon = "⚠️"
title = "АВТОМАТИЧЕСКОЕ ВКЛЮЧЕНИЕ ТЕХРАБОТ"
alert_type = "warning"
else:
icon = "🔧"
title = "ВКЛЮЧЕНИЕ ТЕХРАБОТ"
alert_type = "info"
elif event_type == "disable":
icon = ""
title = "ОТКЛЮЧЕНИЕ ТЕХРАБОТ"
alert_type = "success"
elif event_type == "api_status":
if status == "online":
icon = "🟢"
title = "API REMNAWAVE ВОССТАНОВЛЕНО"
alert_type = "success"
else:
icon = "🔴"
title = "API REMNAWAVE НЕДОСТУПНО"
alert_type = "error"
elif event_type == "monitoring":
if status == "started":
icon = "🔍"
title = "МОНИТОРИНГ ЗАПУЩЕН"
alert_type = "info"
else:
icon = "⏹️"
title = "МОНИТОРИНГ ОСТАНОВЛЕН"
alert_type = "info"
else:
icon = ""
title = "СИСТЕМА ТЕХРАБОТ"
alert_type = "info"
message_parts = [f"{icon} <b>{title}</b>", ""]
@@ -971,103 +963,6 @@ class AdminNotificationService:
logger.error(f"Ошибка отправки уведомления о статусе панели Remnawave: {e}")
return False
async def send_remnawave_panel_status_notification(
self,
status: str,
details: Dict[str, Any] = None
) -> bool:
if not self._is_enabled():
return False
try:
details = details or {}
status_config = {
"online": {"icon": "🟢", "title": "ПАНЕЛЬ REMNAWAVE ДОСТУПНА", "alert_type": "success"},
"offline": {"icon": "🔴", "title": "ПАНЕЛЬ REMNAWAVE НЕДОСТУПНА", "alert_type": "error"},
"degraded": {"icon": "🟡", "title": "ПАНЕЛЬ REMNAWAVE РАБОТАЕТ СО СБОЯМИ", "alert_type": "warning"},
"maintenance": {"icon": "🔧", "title": "ПАНЕЛЬ REMNAWAVE НА ОБСЛУЖИВАНИИ", "alert_type": "info"}
}
config = status_config.get(status, status_config["offline"])
message_parts = [
f"{config['icon']} <b>{config['title']}</b>",
""
]
if details.get("api_url"):
message_parts.append(f"🔗 <b>URL:</b> {details['api_url']}")
if details.get("response_time"):
message_parts.append(f"⚡ <b>Время отклика:</b> {details['response_time']} сек")
if details.get("last_check"):
last_check = details["last_check"]
if isinstance(last_check, str):
from datetime import datetime
last_check = datetime.fromisoformat(last_check)
message_parts.append(f"🕐 <b>Последняя проверка:</b> {last_check.strftime('%H:%M:%S')}")
if status == "online":
if details.get("uptime"):
message_parts.append(f"⏱️ <b>Время работы:</b> {details['uptime']}")
if details.get("users_online"):
message_parts.append(f"👥 <b>Пользователей онлайн:</b> {details['users_online']}")
message_parts.append("")
message_parts.append("✅ Все системы работают нормально.")
elif status == "offline":
if details.get("error"):
error_msg = str(details["error"])[:150]
message_parts.append(f"❌ <b>Ошибка:</b> {error_msg}")
if details.get("consecutive_failures"):
message_parts.append(f"🔄 <b>Неудачных попыток:</b> {details['consecutive_failures']}")
message_parts.append("")
message_parts.append("⚠️ Панель недоступна. Проверьте соединение и статус сервера.")
elif status == "degraded":
if details.get("issues"):
issues = details["issues"]
if isinstance(issues, list):
message_parts.append("⚠️ <b>Обнаруженные проблемы:</b>")
for issue in issues[:3]:
message_parts.append(f"{issue}")
else:
message_parts.append(f"⚠️ <b>Проблема:</b> {issues}")
message_parts.append("")
message_parts.append("Панель работает, но возможны задержки или сбои.")
elif status == "maintenance":
if details.get("maintenance_reason"):
message_parts.append(f"🔧 <b>Причина:</b> {details['maintenance_reason']}")
if details.get("estimated_duration"):
message_parts.append(f"⏰ <b>Ожидаемая длительность:</b> {details['estimated_duration']}")
if details.get("manual_message"):
message_parts.append(f"💬 <b>Сообщение:</b> {details['manual_message']}")
message_parts.append("")
message_parts.append("Панель временно недоступна для обслуживания.")
from datetime import datetime
message_parts.append("")
message_parts.append(f"⏰ <i>{datetime.now().strftime('%d.%m.%Y %H:%M:%S')}</i>")
message = "\n".join(message_parts)
return await self._send_message(message)
except Exception as e:
logger.error(f"Ошибка отправки уведомления о статусе панели Remnawave: {e}")
return False
async def send_subscription_update_notification(
self,
db: AsyncSession,
+90
View File
@@ -18,6 +18,7 @@ from app.database.crud.discount_offer import (
upsert_discount_offer,
)
from app.database.crud.notification import (
clear_notification_by_type,
notification_sent,
record_notification,
)
@@ -472,6 +473,10 @@ class MonitoringService:
try:
now = datetime.utcnow()
notifications_allowed = (
NotificationSettingsService.are_notifications_globally_enabled()
and NotificationSettingsService.is_trial_channel_unsubscribed_enabled()
)
result = await db.execute(
select(Subscription)
.options(selectinload(Subscription.user))
@@ -550,6 +555,22 @@ class MonitoringService:
user.remnawave_uuid,
api_error,
)
if notifications_allowed:
if not await notification_sent(
db,
user.id,
subscription.id,
"trial_channel_unsubscribed",
):
sent = await self._send_trial_channel_unsubscribed_notification(user)
if sent:
await record_notification(
db,
user.id,
subscription.id,
"trial_channel_unsubscribed",
)
elif subscription.status == SubscriptionStatus.DISABLED.value and is_member:
subscription.status = SubscriptionStatus.ACTIVE.value
subscription.updated_at = datetime.utcnow()
@@ -575,6 +596,12 @@ class MonitoringService:
api_error,
)
await clear_notification_by_type(
db,
subscription.id,
"trial_channel_unsubscribed",
)
if disabled_count or restored_count:
await self._log_monitoring_event(
db,
@@ -1040,6 +1067,69 @@ class MonitoringService:
)
return False
async def _send_trial_channel_unsubscribed_notification(self, user: User) -> bool:
try:
texts = get_texts(user.language)
template = texts.get(
"TRIAL_CHANNEL_UNSUBSCRIBED",
(
"🚫 <b>Доступ приостановлен</b>\n\n"
"Мы не нашли вашу подписку на наш канал, поэтому тестовая подписка отключена.\n\n"
"Подпишитесь на канал и нажмите «{check_button}», чтобы вернуть доступ."
),
)
check_button = texts.t("CHANNEL_CHECK_BUTTON", "✅ Я подписался")
message = template.format(check_button=check_button)
from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
buttons = []
if settings.CHANNEL_LINK:
buttons.append(
[
InlineKeyboardButton(
text=texts.t("CHANNEL_SUBSCRIBE_BUTTON", "🔗 Подписаться"),
url=settings.CHANNEL_LINK,
)
]
)
buttons.append(
[
InlineKeyboardButton(
text=check_button,
callback_data="sub_channel_check",
)
]
)
keyboard = InlineKeyboardMarkup(inline_keyboard=buttons)
await self._send_message_with_logo(
chat_id=user.telegram_id,
text=message,
parse_mode="HTML",
reply_markup=keyboard,
)
return True
except (TelegramForbiddenError, TelegramBadRequest) as exc:
if self._handle_unreachable_user(user, exc, "уведомление об отписке от канала"):
return True
logger.error(
"Ошибка Telegram API при отправке уведомления об отписке от канала пользователю %s: %s",
user.telegram_id,
exc,
)
return False
except Exception as error:
logger.error(
"Ошибка отправки уведомления об отписке от канала пользователю %s: %s",
user.telegram_id,
error,
)
return False
async def _send_expired_day1_notification(self, user: User, subscription: Subscription) -> bool:
try:
texts = get_texts(user.language)
@@ -1,5 +1,4 @@
import json
import json
import logging
from copy import deepcopy
from pathlib import Path
@@ -21,6 +20,7 @@ class NotificationSettingsService:
_DEFAULTS: Dict[str, Dict[str, Any]] = {
"trial_inactive_1h": {"enabled": True},
"trial_inactive_24h": {"enabled": True},
"trial_channel_unsubscribed": {"enabled": True},
"expired_1d": {"enabled": True},
"expired_second_wave": {
"enabled": True,
@@ -139,6 +139,14 @@ class NotificationSettingsService:
def set_trial_inactive_24h_enabled(cls, enabled: bool) -> bool:
return cls.set_enabled("trial_inactive_24h", enabled)
@classmethod
def is_trial_channel_unsubscribed_enabled(cls) -> bool:
return cls.is_enabled("trial_channel_unsubscribed")
@classmethod
def set_trial_channel_unsubscribed_enabled(cls, enabled: bool) -> bool:
return cls.set_enabled("trial_channel_unsubscribed", enabled)
# Expired subscription notifications
@classmethod
def is_expired_1d_enabled(cls) -> bool:
+55 -5
View File
@@ -872,9 +872,55 @@ class PaymentService:
logger.error("Pal24 не вернул bill_id: %s", response)
return None
link_url = response.get("link_url")
link_page_url = response.get("link_page_url")
primary_link = link_page_url or link_url
def _pick_url(*keys: str) -> Optional[str]:
for key in keys:
value = response.get(key)
if value:
return str(value)
return None
transfer_url = _pick_url(
"transfer_url",
"transferUrl",
"transfer_link",
"transferLink",
"transfer",
"sbp_url",
"sbpUrl",
"sbp_link",
"sbpLink",
)
card_url = _pick_url(
"link_url",
"linkUrl",
"link",
"card_url",
"cardUrl",
"card_link",
"cardLink",
"payment_url",
"paymentUrl",
"url",
)
link_page_url = _pick_url(
"link_page_url",
"linkPageUrl",
"page_url",
"pageUrl",
)
primary_link = transfer_url or link_page_url or card_url
secondary_link = link_page_url or card_url or transfer_url
metadata_links = {
key: value
for key, value in {
"sbp": transfer_url,
"card": card_url,
"page": link_page_url,
}.items()
if value
}
payment = await create_pal24_payment(
db,
@@ -887,11 +933,12 @@ class PaymentService:
type_=response.get("type", "normal"),
currency=response.get("currency", "RUB"),
link_url=primary_link,
link_page_url=link_page_url or link_url,
link_page_url=secondary_link,
ttl=ttl_seconds,
metadata={
"raw_response": response,
"language": language,
**({"links": metadata_links} if metadata_links else {}),
},
)
@@ -899,9 +946,12 @@ class PaymentService:
"bill_id": bill_id,
"order_id": order_id,
"link_url": primary_link,
"link_page_url": link_page_url or link_url,
"link_page_url": secondary_link,
"local_payment_id": payment.id,
"amount_kopeks": amount_kopeks,
"sbp_url": transfer_url or primary_link,
"card_url": card_url,
"transfer_url": transfer_url,
}
logger.info(
-18
View File
@@ -987,15 +987,6 @@ class RemnaWaveService:
logger.error(f"Error removing users from squad: {e}")
return False
async def delete_squad(self, squad_uuid: str) -> bool:
try:
async with self.get_api_client() as api:
response = await api.delete_internal_squad(squad_uuid)
return response
except Exception as e:
logger.error(f"Error deleting squad: {e}")
return False
async def get_all_inbounds(self) -> List[Dict]:
try:
async with self.get_api_client() as api:
@@ -1030,15 +1021,6 @@ class RemnaWaveService:
logger.error(f"Error renaming squad: {e}")
return False
async def create_squad(self, name: str, inbound_uuids: List[str]) -> bool:
try:
async with self.get_api_client() as api:
squad = await api.create_internal_squad(name, inbound_uuids)
return squad is not None
except Exception as e:
logger.error(f"Error creating squad: {e}")
return False
async def get_node_user_usage_by_range(self, node_uuid: str, start_date, end_date) -> List[Dict[str, Any]]:
try:
async with self.get_api_client() as api:
+2
View File
@@ -89,6 +89,7 @@ class BotConfigurationService:
"HAPP": "🅷 Happ настройки",
"SKIP": "⚡ Быстрый старт",
"ADDITIONAL": "📱 Приложения и DeepLinks",
"MINIAPP": "📱 Mini App",
"DATABASE": "🗄️ Режим БД",
"POSTGRES": "🐘 PostgreSQL",
"SQLITE": "💾 SQLite",
@@ -189,6 +190,7 @@ class BotConfigurationService:
"CONNECT_BUTTON_HAPP": "HAPP",
"HAPP_": "HAPP",
"SKIP_": "SKIP",
"MINIAPP_": "MINIAPP",
"MONITORING_": "MONITORING",
"NOTIFICATION_": "NOTIFICATIONS",
"SERVER_STATUS": "SERVER",
+124 -7
View File
@@ -2,13 +2,14 @@ import logging
from datetime import datetime, timedelta
from typing import Optional, List, Dict, Any, Tuple
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy import delete, select, update
from sqlalchemy import delete, select, update, func
from aiogram import Bot
from aiogram.exceptions import TelegramBadRequest, TelegramForbiddenError
from app.database.crud.user import (
get_user_by_id, get_user_by_telegram_id, get_users_list,
get_users_count, get_users_statistics, get_inactive_users,
add_user_balance, subtract_user_balance, update_user, delete_user
add_user_balance, subtract_user_balance, update_user, delete_user,
get_users_spending_stats
)
from app.database.crud.promo_group import get_promo_group_by_id
from app.database.crud.transaction import get_user_transactions_count
@@ -18,7 +19,8 @@ from app.database.models import (
ReferralEarning, SubscriptionServer, YooKassaPayment, BroadcastHistory,
CryptoBotPayment, SubscriptionConversion, UserMessage, WelcomeText,
SentNotification, PromoGroup, MulenPayPayment, Pal24Payment,
AdvertisingCampaign, PaymentMethod
AdvertisingCampaign, AdvertisingCampaignRegistration, PaymentMethod,
TransactionType
)
from app.config import settings
@@ -141,20 +143,32 @@ class UserService:
"has_next": False,
"has_prev": False
}
async def get_users_page(
self,
db: AsyncSession,
page: int = 1,
limit: int = 20,
status: Optional[UserStatus] = None,
order_by_balance: bool = False
order_by_balance: bool = False,
order_by_traffic: bool = False,
order_by_last_activity: bool = False,
order_by_total_spent: bool = False,
order_by_purchase_count: bool = False
) -> Dict[str, Any]:
try:
offset = (page - 1) * limit
users = await get_users_list(
db, offset=offset, limit=limit, status=status, order_by_balance=order_by_balance
db,
offset=offset,
limit=limit,
status=status,
order_by_balance=order_by_balance,
order_by_traffic=order_by_traffic,
order_by_last_activity=order_by_last_activity,
order_by_total_spent=order_by_total_spent,
order_by_purchase_count=order_by_purchase_count,
)
total_count = await get_users_count(db, status=status)
@@ -179,7 +193,110 @@ class UserService:
"has_next": False,
"has_prev": False
}
async def get_user_spending_stats_map(
self,
db: AsyncSession,
user_ids: List[int]
) -> Dict[int, Dict[str, int]]:
try:
return await get_users_spending_stats(db, user_ids)
except Exception as e:
logger.error(f"Ошибка получения статистики трат пользователей: {e}")
return {}
async def get_users_by_campaign_page(
self,
db: AsyncSession,
page: int = 1,
limit: int = 20
) -> Dict[str, Any]:
try:
offset = (page - 1) * limit
campaign_ranked = (
select(
AdvertisingCampaignRegistration.user_id.label("user_id"),
AdvertisingCampaignRegistration.campaign_id.label("campaign_id"),
AdvertisingCampaignRegistration.created_at.label("created_at"),
func.row_number()
.over(
partition_by=AdvertisingCampaignRegistration.user_id,
order_by=AdvertisingCampaignRegistration.created_at.desc(),
)
.label("rn"),
)
.cte("campaign_ranked")
)
latest_campaign = (
select(
campaign_ranked.c.user_id,
campaign_ranked.c.campaign_id,
campaign_ranked.c.created_at,
)
.where(campaign_ranked.c.rn == 1)
.subquery()
)
query = (
select(
User,
AdvertisingCampaign.name.label("campaign_name"),
latest_campaign.c.created_at,
)
.join(latest_campaign, latest_campaign.c.user_id == User.id)
.join(
AdvertisingCampaign,
AdvertisingCampaign.id == latest_campaign.c.campaign_id,
)
.order_by(
AdvertisingCampaign.name.asc(),
latest_campaign.c.created_at.desc(),
)
.offset(offset)
.limit(limit)
)
result = await db.execute(query)
rows = result.all()
users = [row[0] for row in rows]
campaign_map = {
row[0].id: {
"campaign_name": row[1],
"registered_at": row[2],
}
for row in rows
}
total_stmt = select(func.count()).select_from(latest_campaign)
total_result = await db.execute(total_stmt)
total_count = total_result.scalar() or 0
total_pages = (total_count + limit - 1) // limit if total_count else 1
return {
"users": users,
"campaigns": campaign_map,
"current_page": page,
"total_pages": total_pages,
"total_count": total_count,
"has_next": page < total_pages,
"has_prev": page > 1,
}
except Exception as e:
logger.error(f"Ошибка получения пользователей по кампаниям: {e}")
return {
"users": [],
"campaigns": {},
"current_page": 1,
"total_pages": 1,
"total_count": 0,
"has_next": False,
"has_prev": False,
}
async def update_user_balance(
self,
db: AsyncSession,
+5
View File
@@ -108,6 +108,11 @@ class AdminStates(StatesGroup):
# Состояния для отслеживания источника перехода
viewing_user_from_balance_list = State()
viewing_user_from_traffic_list = State()
viewing_user_from_last_activity_list = State()
viewing_user_from_spending_list = State()
viewing_user_from_purchases_list = State()
viewing_user_from_campaign_list = State()
class SupportStates(StatesGroup):
waiting_for_message = State()
+44 -25
View File
@@ -28,7 +28,7 @@ def format_date(dt: Union[datetime, str], format_str: str = "%d.%m.%Y") -> str:
return dt.strftime(format_str)
def format_time_ago(dt: Union[datetime, str]) -> str:
def format_time_ago(dt: Union[datetime, str], language: str = "ru") -> str:
if isinstance(dt, str):
if dt == "now" or dt == "":
dt = datetime.now()
@@ -40,32 +40,51 @@ def format_time_ago(dt: Union[datetime, str]) -> str:
now = datetime.utcnow()
diff = now - dt
language_code = (language or "ru").split("-")[0].lower()
if diff.days > 0:
if diff.days == 1:
return "вчера"
elif diff.days < 7:
return f"{diff.days} дн. назад"
elif diff.days < 30:
weeks = diff.days // 7
return f"{weeks} нед. назад"
elif diff.days < 365:
months = diff.days // 30
return f"{months} мес. назад"
else:
years = diff.days // 365
return f"{years} г. назад"
elif diff.seconds > 3600:
hours = diff.seconds // 3600
return f"{hours} ч. назад"
elif diff.seconds > 60:
minutes = diff.seconds // 60
return f"{minutes} мин. назад"
else:
return "только что"
return "yesterday" if language_code == "en" else "вчера"
if diff.days < 7:
value = diff.days
if language_code == "en":
suffix = "day" if value == 1 else "days"
return f"{value} {suffix} ago"
return f"{value} дн. назад"
if diff.days < 30:
value = diff.days // 7
if language_code == "en":
suffix = "week" if value == 1 else "weeks"
return f"{value} {suffix} ago"
return f"{value} нед. назад"
if diff.days < 365:
value = diff.days // 30
if language_code == "en":
suffix = "month" if value == 1 else "months"
return f"{value} {suffix} ago"
return f"{value} мес. назад"
value = diff.days // 365
if language_code == "en":
suffix = "year" if value == 1 else "years"
return f"{value} {suffix} ago"
return f"{value} г. назад"
if diff.seconds > 3600:
value = diff.seconds // 3600
if language_code == "en":
suffix = "hour" if value == 1 else "hours"
return f"{value} {suffix} ago"
return f"{value} ч. назад"
if diff.seconds > 60:
value = diff.seconds // 60
if language_code == "en":
suffix = "minute" if value == 1 else "minutes"
return f"{value} {suffix} ago"
return f"{value} мин. назад"
return "just now" if language_code == "en" else "только что"
def format_days_declension(days: int, language: str = "ru") -> str:
if language != "ru":
+91
View File
@@ -0,0 +1,91 @@
"""Utilities for validating Telegram WebApp initialization data."""
from __future__ import annotations
import hashlib
import hmac
import json
import time
from typing import Any, Dict
from urllib.parse import parse_qsl
class TelegramWebAppAuthError(Exception):
"""Raised when Telegram WebApp init data fails validation."""
def parse_webapp_init_data(
init_data: str,
bot_token: str,
*,
max_age_seconds: int = 86400,
) -> Dict[str, Any]:
"""Validate and parse Telegram WebApp init data.
Args:
init_data: Raw init data string provided by Telegram WebApp.
bot_token: Bot token used to verify the signature.
max_age_seconds: Maximum allowed age for the payload. Defaults to 24 hours.
Returns:
Parsed init data as a dictionary.
Raises:
TelegramWebAppAuthError: If validation fails.
"""
if not init_data:
raise TelegramWebAppAuthError("Missing init data")
if not bot_token:
raise TelegramWebAppAuthError("Bot token is not configured")
parsed_pairs = parse_qsl(init_data, strict_parsing=True, keep_blank_values=True)
data: Dict[str, Any] = {key: value for key, value in parsed_pairs}
received_hash = data.pop("hash", None)
if not received_hash:
raise TelegramWebAppAuthError("Missing init data signature")
data_check_string = "\n".join(
f"{key}={value}" for key, value in sorted(data.items())
)
secret_key = hmac.new(
key=b"WebAppData",
msg=bot_token.encode("utf-8"),
digestmod=hashlib.sha256,
).digest()
computed_hash = hmac.new(
key=secret_key,
msg=data_check_string.encode("utf-8"),
digestmod=hashlib.sha256,
).hexdigest()
if not hmac.compare_digest(computed_hash, received_hash):
raise TelegramWebAppAuthError("Invalid init data signature")
auth_date_raw = data.get("auth_date")
if auth_date_raw is not None:
try:
auth_date = int(auth_date_raw)
except (TypeError, ValueError):
raise TelegramWebAppAuthError("Invalid auth_date value") from None
if max_age_seconds and auth_date:
current_ts = int(time.time())
if current_ts - auth_date > max_age_seconds:
raise TelegramWebAppAuthError("Init data is too old")
data["auth_date"] = auth_date
user_payload = data.get("user")
if user_payload is not None:
try:
data["user"] = json.loads(user_payload)
except json.JSONDecodeError as error:
raise TelegramWebAppAuthError("Invalid user payload") from error
return data
+1 -1
View File
@@ -189,7 +189,7 @@ async def get_detailed_referral_list(db: AsyncSession, user_id: int, limit: int
and_(
Transaction.user_id == referral.id,
Transaction.type == TransactionType.DEPOSIT.value,
Transaction.is_completed == True
Transaction.is_completed.is_(True)
)
)
)
+6
View File
@@ -13,6 +13,7 @@ from .routes import (
config,
health,
promocodes,
miniapp,
promo_groups,
remnawave,
stats,
@@ -68,6 +69,10 @@ OPENAPI_TAGS = [
"данных между ботом и панелью."
),
},
{
"name": "miniapp",
"description": "Endpoint для Telegram Mini App с информацией о подписке пользователя.",
},
]
@@ -110,5 +115,6 @@ def create_web_api_app() -> FastAPI:
app.include_router(campaigns.router, prefix="/campaigns", tags=["campaigns"])
app.include_router(tokens.router, prefix="/tokens", tags=["auth"])
app.include_router(remnawave.router, prefix="/remnawave", tags=["remnawave"])
app.include_router(miniapp.router, prefix="/miniapp", tags=["miniapp"])
return app
+2
View File
@@ -1,6 +1,7 @@
from . import (
config,
health,
miniapp,
promo_groups,
remnawave,
stats,
@@ -14,6 +15,7 @@ from . import (
__all__ = [
"config",
"health",
"miniapp",
"promo_groups",
"remnawave",
"stats",
+396
View File
@@ -0,0 +1,396 @@
from __future__ import annotations
import logging
from typing import Any, Dict, List, Optional, Tuple, Union
from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from app.config import settings
from app.database.crud.server_squad import get_server_squad_by_uuid
from app.database.crud.user import get_user_by_telegram_id
from app.database.models import Subscription, Transaction, User
from app.services.remnawave_service import (
RemnaWaveConfigurationError,
RemnaWaveService,
)
from app.services.subscription_service import SubscriptionService
from app.utils.subscription_utils import get_happ_cryptolink_redirect_link
from app.utils.telegram_webapp import (
TelegramWebAppAuthError,
parse_webapp_init_data,
)
from ..dependencies import get_db_session
from ..schemas.miniapp import (
MiniAppConnectedServer,
MiniAppDevice,
MiniAppPromoGroup,
MiniAppSubscriptionRequest,
MiniAppSubscriptionResponse,
MiniAppSubscriptionUser,
MiniAppTransaction,
)
logger = logging.getLogger(__name__)
router = APIRouter()
def _format_gb(value: Optional[float]) -> float:
if value is None:
return 0.0
try:
return float(value)
except (TypeError, ValueError):
return 0.0
def _format_gb_label(value: float) -> str:
absolute = abs(value)
if absolute >= 100:
return f"{value:.0f} GB"
if absolute >= 10:
return f"{value:.1f} GB"
return f"{value:.2f} GB"
def _format_limit_label(limit: Optional[int]) -> str:
if not limit:
return "Unlimited"
return f"{limit} GB"
def _bytes_to_gb(bytes_value: Optional[int]) -> float:
if not bytes_value:
return 0.0
return round(bytes_value / (1024 ** 3), 2)
def _status_label(status: str) -> str:
mapping = {
"active": "Active",
"trial": "Trial",
"expired": "Expired",
"disabled": "Disabled",
}
return mapping.get(status, status.title())
def _parse_datetime_string(value: Optional[str]) -> Optional[str]:
if not value:
return None
try:
cleaned = value.strip()
if cleaned.endswith("Z"):
cleaned = f"{cleaned[:-1]}+00:00"
# Normalize duplicated timezone suffixes like +00:00+00:00
if "+00:00+00:00" in cleaned:
cleaned = cleaned.replace("+00:00+00:00", "+00:00")
datetime.fromisoformat(cleaned)
return cleaned
except Exception: # pragma: no cover - defensive
return value
async def _resolve_connected_servers(
db: AsyncSession,
squad_uuids: List[str],
) -> List[MiniAppConnectedServer]:
if not squad_uuids:
return []
resolved: Dict[str, str] = {}
missing: List[str] = []
for squad_uuid in squad_uuids:
if squad_uuid in resolved:
continue
server = await get_server_squad_by_uuid(db, squad_uuid)
if server and server.display_name:
resolved[squad_uuid] = server.display_name
else:
missing.append(squad_uuid)
if missing:
try:
service = RemnaWaveService()
if service.is_configured:
squads = await service.get_all_squads()
for squad in squads:
uuid = squad.get("uuid")
name = squad.get("name")
if uuid in missing and name:
resolved[uuid] = name
except RemnaWaveConfigurationError:
logger.debug("RemnaWave is not configured; skipping server name enrichment")
except Exception as error: # pragma: no cover - defensive logging
logger.warning("Failed to resolve server names from RemnaWave: %s", error)
connected_servers: List[MiniAppConnectedServer] = []
for squad_uuid in squad_uuids:
name = resolved.get(squad_uuid, squad_uuid)
connected_servers.append(MiniAppConnectedServer(uuid=squad_uuid, name=name))
return connected_servers
async def _load_devices_info(user: User) -> Tuple[int, List[MiniAppDevice]]:
remnawave_uuid = getattr(user, "remnawave_uuid", None)
if not remnawave_uuid:
return 0, []
try:
service = RemnaWaveService()
except Exception as error: # pragma: no cover - defensive logging
logger.warning("Failed to initialise RemnaWave service: %s", error)
return 0, []
if not service.is_configured:
return 0, []
try:
async with service.get_api_client() as api:
response = await api.get_user_devices(remnawave_uuid)
except RemnaWaveConfigurationError:
logger.debug("RemnaWave configuration missing while loading devices")
return 0, []
except Exception as error: # pragma: no cover - defensive logging
logger.warning("Failed to load devices from RemnaWave: %s", error)
return 0, []
total_devices = int(response.get("total") or 0)
devices_payload = response.get("devices") or []
devices: List[MiniAppDevice] = []
for device in devices_payload:
platform = device.get("platform") or device.get("platformType")
model = device.get("deviceModel") or device.get("model") or device.get("name")
app_version = device.get("appVersion") or device.get("version")
last_seen_raw = (
device.get("updatedAt")
or device.get("lastSeen")
or device.get("lastActiveAt")
or device.get("createdAt")
)
last_ip = device.get("ip") or device.get("ipAddress")
devices.append(
MiniAppDevice(
platform=platform,
device_model=model,
app_version=app_version,
last_seen=_parse_datetime_string(last_seen_raw),
last_ip=last_ip,
)
)
if total_devices == 0:
total_devices = len(devices)
return total_devices, devices
def _resolve_display_name(user_data: Dict[str, Any]) -> str:
username = user_data.get("username")
if username:
return username
first = user_data.get("first_name")
last = user_data.get("last_name")
parts = [part for part in [first, last] if part]
if parts:
return " ".join(parts)
telegram_id = user_data.get("telegram_id")
return f"User {telegram_id}" if telegram_id else "User"
def _is_remnawave_configured() -> bool:
params = settings.get_remnawave_auth_params()
return bool(params.get("base_url") and params.get("api_key"))
def _serialize_transaction(transaction: Transaction) -> MiniAppTransaction:
return MiniAppTransaction(
id=transaction.id,
type=transaction.type,
amount_kopeks=transaction.amount_kopeks,
amount_rubles=round(transaction.amount_kopeks / 100, 2),
description=transaction.description,
payment_method=transaction.payment_method,
external_id=transaction.external_id,
is_completed=transaction.is_completed,
created_at=transaction.created_at,
completed_at=transaction.completed_at,
)
async def _load_subscription_links(
subscription: Subscription,
) -> Dict[str, Any]:
if not subscription.remnawave_short_uuid or not _is_remnawave_configured():
return {}
try:
service = SubscriptionService()
info = await service.get_subscription_info(subscription.remnawave_short_uuid)
except Exception as error: # pragma: no cover - defensive logging
logger.warning("Failed to load subscription info from RemnaWave: %s", error)
return {}
if not info:
return {}
payload: Dict[str, Any] = {
"links": list(info.links or []),
"ss_conf_links": dict(info.ss_conf_links or {}),
"subscription_url": info.subscription_url,
"happ": info.happ,
"happ_link": getattr(info, "happ_link", None),
"happ_crypto_link": getattr(info, "happ_crypto_link", None),
}
return payload
@router.post("/subscription", response_model=MiniAppSubscriptionResponse)
async def get_subscription_details(
payload: MiniAppSubscriptionRequest,
db: AsyncSession = Depends(get_db_session),
) -> MiniAppSubscriptionResponse:
try:
webapp_data = parse_webapp_init_data(payload.init_data, settings.BOT_TOKEN)
except TelegramWebAppAuthError as error:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail=str(error),
) from error
telegram_user = webapp_data.get("user")
if not isinstance(telegram_user, dict) or "id" not in telegram_user:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Invalid Telegram user payload",
)
try:
telegram_id = int(telegram_user["id"])
except (TypeError, ValueError):
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Invalid Telegram user identifier",
) from None
user = await get_user_by_telegram_id(db, telegram_id)
purchase_url = (settings.MINIAPP_PURCHASE_URL or "").strip()
if not user or not user.subscription:
detail: Union[str, Dict[str, str]] = "Subscription not found"
if purchase_url:
detail = {
"message": "Subscription not found",
"purchase_url": purchase_url,
}
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail=detail,
)
subscription = user.subscription
traffic_used = _format_gb(subscription.traffic_used_gb)
traffic_limit = subscription.traffic_limit_gb or 0
lifetime_used = _bytes_to_gb(getattr(user, "lifetime_used_traffic_bytes", 0))
status_actual = subscription.actual_status
links_payload = await _load_subscription_links(subscription)
subscription_url = links_payload.get("subscription_url") or subscription.subscription_url
subscription_crypto_link = (
links_payload.get("happ_crypto_link")
or subscription.subscription_crypto_link
)
happ_redirect_link = get_happ_cryptolink_redirect_link(subscription_crypto_link)
connected_squads: List[str] = list(subscription.connected_squads or [])
connected_servers = await _resolve_connected_servers(db, connected_squads)
devices_count, devices = await _load_devices_info(user)
links: List[str] = links_payload.get("links") or connected_squads
ss_conf_links: Dict[str, str] = links_payload.get("ss_conf_links") or {}
transactions_query = (
select(Transaction)
.where(Transaction.user_id == user.id)
.order_by(Transaction.created_at.desc())
.limit(10)
)
transactions_result = await db.execute(transactions_query)
transactions = list(transactions_result.scalars().all())
balance_currency = getattr(user, "balance_currency", None)
if isinstance(balance_currency, str):
balance_currency = balance_currency.upper()
promo_group = getattr(user, "promo_group", None)
response_user = MiniAppSubscriptionUser(
telegram_id=user.telegram_id,
username=user.username,
first_name=user.first_name,
last_name=user.last_name,
display_name=_resolve_display_name(
{
"username": user.username,
"first_name": user.first_name,
"last_name": user.last_name,
"telegram_id": user.telegram_id,
}
),
language=user.language,
status=user.status,
subscription_status=subscription.status,
subscription_actual_status=status_actual,
status_label=_status_label(status_actual),
expires_at=subscription.end_date,
device_limit=subscription.device_limit,
traffic_used_gb=round(traffic_used, 2),
traffic_used_label=_format_gb_label(traffic_used),
traffic_limit_gb=traffic_limit,
traffic_limit_label=_format_limit_label(traffic_limit),
lifetime_used_traffic_gb=lifetime_used,
has_active_subscription=status_actual in {"active", "trial"},
)
return MiniAppSubscriptionResponse(
subscription_id=subscription.id,
remnawave_short_uuid=subscription.remnawave_short_uuid,
user=response_user,
subscription_url=subscription_url,
subscription_crypto_link=subscription_crypto_link,
subscription_purchase_url=purchase_url or None,
links=links,
ss_conf_links=ss_conf_links,
connected_squads=connected_squads,
connected_servers=connected_servers,
connected_devices_count=devices_count,
connected_devices=devices,
happ=links_payload.get("happ"),
happ_link=links_payload.get("happ_link"),
happ_crypto_link=links_payload.get("happ_crypto_link"),
happ_cryptolink_redirect_link=happ_redirect_link,
balance_kopeks=user.balance_kopeks,
balance_rubles=round(user.balance_rubles, 2),
balance_currency=balance_currency,
transactions=[_serialize_transaction(tx) for tx in transactions],
promo_group=MiniAppPromoGroup(id=promo_group.id, name=promo_group.name)
if promo_group
else None,
subscription_type="trial" if subscription.is_trial else "paid",
autopay_enabled=bool(subscription.autopay_enabled),
branding=settings.get_miniapp_branding(),
)
+96
View File
@@ -0,0 +1,96 @@
from __future__ import annotations
from datetime import datetime
from typing import Any, Dict, List, Optional
from pydantic import BaseModel, Field
class MiniAppBranding(BaseModel):
service_name: Dict[str, Optional[str]] = Field(default_factory=dict)
service_description: Dict[str, Optional[str]] = Field(default_factory=dict)
class MiniAppSubscriptionRequest(BaseModel):
init_data: str = Field(..., alias="initData")
class MiniAppSubscriptionUser(BaseModel):
telegram_id: int
username: Optional[str] = None
first_name: Optional[str] = None
last_name: Optional[str] = None
display_name: str
language: Optional[str] = None
status: str
subscription_status: str
subscription_actual_status: str
status_label: str
expires_at: Optional[datetime] = None
device_limit: Optional[int] = None
traffic_used_gb: float = 0.0
traffic_used_label: str
traffic_limit_gb: Optional[int] = None
traffic_limit_label: str
lifetime_used_traffic_gb: float = 0.0
has_active_subscription: bool = False
class MiniAppPromoGroup(BaseModel):
id: int
name: str
class MiniAppConnectedServer(BaseModel):
uuid: str
name: str
class MiniAppDevice(BaseModel):
platform: Optional[str] = None
device_model: Optional[str] = None
app_version: Optional[str] = None
last_seen: Optional[str] = None
last_ip: Optional[str] = None
class MiniAppTransaction(BaseModel):
id: int
type: str
amount_kopeks: int
amount_rubles: float
description: Optional[str] = None
payment_method: Optional[str] = None
external_id: Optional[str] = None
is_completed: bool
created_at: datetime
completed_at: Optional[datetime] = None
class MiniAppSubscriptionResponse(BaseModel):
success: bool = True
subscription_id: int
remnawave_short_uuid: Optional[str] = None
user: MiniAppSubscriptionUser
subscription_url: Optional[str] = None
subscription_crypto_link: Optional[str] = None
subscription_purchase_url: Optional[str] = None
links: List[str] = Field(default_factory=list)
ss_conf_links: Dict[str, str] = Field(default_factory=dict)
connected_squads: List[str] = Field(default_factory=list)
connected_servers: List[MiniAppConnectedServer] = Field(default_factory=list)
connected_devices_count: int = 0
connected_devices: List[MiniAppDevice] = Field(default_factory=list)
happ: Optional[Dict[str, Any]] = None
happ_link: Optional[str] = None
happ_crypto_link: Optional[str] = None
happ_cryptolink_redirect_link: Optional[str] = None
balance_kopeks: int = 0
balance_rubles: float = 0.0
balance_currency: Optional[str] = None
transactions: List[MiniAppTransaction] = Field(default_factory=list)
promo_group: Optional[MiniAppPromoGroup] = None
subscription_type: str
autopay_enabled: bool = False
branding: Optional[MiniAppBranding] = None
+116
View File
@@ -0,0 +1,116 @@
# Настройка мини-приложения Telegram подписки
Эта инструкция описывает, как запустить статическую страницу из каталога `miniapp/index.html`, подключить её к административному API бота и опубликовать через reverse-proxy (nginx или Caddy). Страница отображает текущую подписку пользователя и использует Telegram WebApp init data для авторизации.
## 1. Требования
- Развёрнутый бот Bedolaga c актуальной базой данных.
- Включённое административное API (`WEB_API_ENABLED=true`).
- Доменное имя с действующим TLS-сертификатом (Telegram открывает веб-приложения только по HTTPS).
- Возможность разместить статические файлы (`miniapp/index.html` и `miniapp/app-config.json`) и проксировать запросы `/miniapp/*` к боту.
## 2. Настройка окружения
1. Скопируйте пример конфигурации и включите веб-API:
2. Задайте как минимум следующие переменные:
```env
WEB_API_ENABLED=true # включает FastAPI
WEB_API_HOST=0.0.0.0
WEB_API_PORT=8080
WEB_API_ALLOWED_ORIGINS=https://miniapp.example.com
WEB_API_DEFAULT_TOKEN=super-secret-token
```
- `WEB_API_ALLOWED_ORIGINS` должен содержать домен, с которого будет открываться мини-приложение.
- `WEB_API_DEFAULT_TOKEN` создаёт bootstrap-токен для запросов от страницы. Его можно заменить на токен, созданный через `POST /tokens`.
## 3. Запуск административного API
После старта проверьте доступность:
```bash
curl -H "X-API-Key: super-secret-token" https://miniapp.example.com/miniapp/health || \
curl -H "X-API-Key: super-secret-token" http://127.0.0.1:8080/health
```
## 4. Подготовка статических файлов
1. При необходимости отредактируйте `miniapp/app-config.json`, чтобы настроить инструкции и ссылки на нужные клиенты.
2. Убедитесь, что файлы доступны для чтения пользователем веб-сервера.
## 5. Настройка кнопки в Telegram
1. В дминке бота настраиваем параметры - Конфигурации бота - Прочее - Miniapp
2. Перезапустите бота.
3. При необходимости задайте кастомную кнопку на миниапп через `@BotFather` (команда `/setmenu` -> Web App URL).
## 6. Конфигурация nginx
```nginx
server {
listen 80;
listen 443 ssl http2;
server_name miniapp.example.com;
ssl_certificate /etc/letsencrypt/live/miniapp.example.com/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/miniapp.example.com/privkey.pem;
# Статические файлы мини-приложения
root /var/www/remnawave-miniapp;
index index.html;
location = /miniapp/app-config.json {
add_header Access-Control-Allow-Origin "*";
try_files $uri =404;
}
location / {
try_files $uri /index.html =404;
}
# Проксирование запросов к административному API
location /miniapp/ {
proxy_pass http://127.0.0.1:8080/miniapp/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
# Если нужно проксировать другие эндпоинты API, добавьте аналогичные location-блоки.
}
```
## 7. Конфигурация Caddy
```caddy
miniapp.example.com {
encode gzip zstd
root * /var/www/remnawave-miniapp
file_server
@config path /app-config.json
header @config Access-Control-Allow-Origin "*"
reverse_proxy /miniapp/* 127.0.0.1:8080 {
header_up Host {host}
header_up X-Real-IP {remote_host}
}
}
```
Caddy автоматически выпустит сертификаты через ACME. Убедитесь, что порт 443 проброшен и домен указывает на сервер.
## 8. Проверка работы
1. Откройте мини-приложение прямо в Telegram или через браузер: `https://miniapp.example.com`.
2. В консоли разработчика убедитесь, что запрос к `https://miniapp.example.com/miniapp/subscription` возвращает JSON с данными подписки.
3. Проверьте, что ссылки из блока «Подключить подписку» открываются и копируются без ошибок.
## 9. Диагностика
| Симптом | Возможная причина | Проверка |
|---------|------------------|----------|
| Белый экран и ошибка 401 | Неверный `X-API-Key` или `WEB_API_ALLOWED_ORIGINS`. | Проверьте токен и заголовки запроса, перегенерируйте токен через `/tokens`. |
| Ошибка 404 на `/miniapp/subscription` | Прокси не пробрасывает запросы или API не запущено. | Проверьте лог nginx/Caddy и убедитесь, что бот запущен с `WEB_API_ENABLED=true`. |
| Mini App не открывается в Telegram | URL не соответствует HTTPS или отсутствует сертификат. | Обновите сертификаты и убедитесь, что домен доступен по HTTPS. |
| Нет ссылок подписки | Не настроена интеграция с RemnaWave или у пользователя нет активной подписки. | Проверьте `REMNAWAVE_API_URL/KEY` и статус подписки пользователя. |
После настройки вы сможете использовать мини-приложение в бот-меню и отправлять ссылку пользователям напрямую.
+283 -3
View File
@@ -15,6 +15,7 @@
"CHANNEL_SUBSCRIBE_BUTTON": "🔗 Subscribe",
"CHANNEL_SUBSCRIBE_REQUIRED_ALERT": "❌ You haven't joined the channel!",
"CHANNEL_SUBSCRIBE_THANKS": "✅ Thanks for subscribing",
"TRIAL_CHANNEL_UNSUBSCRIBED": "\n🚫 <b>Access paused</b>\n\nWe couldn't find your subscription to our channel, so the trial plan has been disabled.\n\nJoin the channel and tap “{check_button}” to restore access.",
"CHECK_STATUS_BUTTON": "📊 Check status",
"CHOOSE_ANOTHER_DEVICE": "📱 Choose another device",
"CONFIRM": "✅ Confirm",
@@ -85,7 +86,13 @@
"PAL24_TOPUP_PROMPT": "🏦 <b>PayPalych (SBP) payment</b>\n\nEnter an amount between 100 and 1,000,000 ₽.\nThe payment is processed via the PayPalych Faster Payments System.",
"PAL24_PAYMENT_ERROR": "❌ Failed to create a PayPalych payment. Please try again later or contact support.",
"PAL24_PAY_BUTTON": "🏦 Pay with PayPalych (SBP)",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>PayPalych (SBP) payment</b>\n\n💰 Amount: {amount}\n🆔 Invoice ID: {bill_id}\n\n📱 <b>How to pay:</b>\n1. Press Pay with PayPalych (SBP)\n2. Follow the system prompts\n3. Confirm the transfer\n4. Funds will be credited automatically\n\n❓ Need help? Contact {support}",
"PAL24_SBP_PAY_BUTTON": "🏦 Pay with PayPalych (SBP)",
"PAL24_CARD_PAY_BUTTON": "💳 Pay with a bank card (PayPalych)",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>PayPalych payment</b>\n\n💰 Amount: {amount}\n🆔 Invoice ID: {bill_id}\n\n📱 <b>How to pay:</b>\n{steps}\n\n❓ Need help? Contact {support}",
"PAL24_INSTRUCTION_BUTTON": "{step}. Press “{button}”",
"PAL24_INSTRUCTION_FOLLOW": "{step}. Follow the payment page instructions",
"PAL24_INSTRUCTION_CONFIRM": "{step}. Confirm the transfer",
"PAL24_INSTRUCTION_COMPLETE": "{step}. The funds will be credited automatically",
"PENDING_CANCEL_BUTTON": "⌛ Cancel",
"POST_REGISTRATION_TRIAL_BUTTON": "🚀 Activate free trial 🚀",
"REFERRAL_ANALYTICS_BUTTON": "📊 Analytics",
@@ -207,7 +214,6 @@
"NO_TICKETS_ADMIN": "No tickets to display.",
"ADMIN_TICKETS_TITLE": "🎫 All support tickets:",
"ADMIN_TICKET_REPLY_INPUT": "Enter support reply:",
"ADMIN_TICKET_REPLY_SENT": "✅ Reply sent!",
"TICKET_MARKED_ANSWERED": "✅ Ticket marked as answered.",
"TICKET_UPDATE_ERROR": "❌ Error updating ticket.",
@@ -535,5 +541,279 @@
"NOTIFY_PROMPT_SECOND_HOURS": "Enter the number of hours the discount is active (1-168):",
"NOTIFY_PROMPT_THIRD_PERCENT": "Enter a new discount percentage for the late offer (0-100):",
"NOTIFY_PROMPT_THIRD_HOURS": "Enter the number of hours the late discount is active (1-168):",
"NOTIFY_PROMPT_THIRD_DAYS": "After how many days without a subscription should we send the offer? (minimum 2):"
"NOTIFY_PROMPT_THIRD_DAYS": "After how many days without a subscription should we send the offer? (minimum 2):",
"ADMIN_MAIN_USERS_SUBSCRIPTIONS": "👥 Users / Subscriptions",
"ADMIN_MAIN_PROMO_STATS": "💰 Promo codes / Stats",
"ADMIN_MAIN_SUPPORT": "🛟 Support",
"ADMIN_MAIN_MESSAGES": "📨 Messages",
"ADMIN_MAIN_SETTINGS": "⚙️ Settings",
"ADMIN_MAIN_SYSTEM": "🛠️ System",
"ADMIN_USERS_SUBMENU_TITLE": "👥 **User and subscription management**\n\n",
"ADMIN_PROMO_SUBMENU_TITLE": "💰 **Promo codes and statistics**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_TITLE": "📨 **Communications**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_DESCRIPTION": "Manage broadcasts and interface texts:",
"ADMIN_SUBMENU_SELECT_SECTION": "Choose a section:",
"ADMIN_COMMUNICATIONS_WELCOME_TEXT": "👋 Welcome message",
"ADMIN_COMMUNICATIONS_MENU_MESSAGES": "📢 Menu messages",
"ADMIN_SUPPORT_TICKETS": "🎫 Support tickets",
"ADMIN_SUPPORT_AUDIT": "🧾 Moderator audit",
"ADMIN_SUPPORT_SETTINGS": "🛟 Support settings",
"ADMIN_SUPPORT_SETTINGS_STATUS_ENABLED": "Enabled",
"ADMIN_SUPPORT_SETTINGS_STATUS_DISABLED": "Disabled",
"ADMIN_SUPPORT_SETTINGS_MENU_LABEL": "\"Support\" menu item",
"ADMIN_SUPPORT_SETTINGS_MODE_TICKETS": "Tickets",
"ADMIN_SUPPORT_SETTINGS_MODE_CONTACT": "Contact",
"ADMIN_SUPPORT_SETTINGS_MODE_BOTH": "Both",
"ADMIN_SUPPORT_SETTINGS_EDIT_DESCRIPTION": "📝 Edit description",
"ADMIN_SUPPORT_SETTINGS_ADMIN_NOTIFICATIONS": "Admin notifications",
"ADMIN_SUPPORT_SETTINGS_USER_NOTIFICATIONS": "User notifications",
"ADMIN_SUPPORT_SETTINGS_SLA_LABEL": "SLA",
"ADMIN_SUPPORT_SETTINGS_SLA_TIME": "⏳ SLA time: {minutes} min",
"ADMIN_SUPPORT_SETTINGS_MODERATORS_COUNT": "🧑‍⚖️ Moderators: {count}",
"ADMIN_SUPPORT_SETTINGS_ADD_MODERATOR": " Assign moderator",
"ADMIN_SUPPORT_SETTINGS_REMOVE_MODERATOR": " Remove moderator",
"ADMIN_SUPPORT_SETTINGS_TITLE": "🛟 <b>Support settings</b>",
"ADMIN_SUPPORT_SETTINGS_DESCRIPTION": "Working hours and menu visibility. Current support menu description:",
"ADMIN_SUPPORT_SLA_SETUP_PROMPT": "⏳ <b>SLA configuration</b>\n\nEnter the response wait time in minutes (integer > 0):",
"ADMIN_SUPPORT_SLA_INVALID": "❌ Enter a valid number of minutes (1-1440)",
"ADMIN_SUPPORT_SLA_SAVED": "✅ SLA value saved",
"ADMIN_SUPPORT_ASSIGN_MODERATOR_PROMPT": "🧑‍⚖️ <b>Assign moderator</b>\n\nSend the user's Telegram ID (number)",
"ADMIN_SUPPORT_REMOVE_MODERATOR_PROMPT": "🧑‍⚖️ <b>Remove moderator</b>\n\nSend the user's Telegram ID (number)",
"ADMIN_SUPPORT_INVALID_TELEGRAM_ID": "❌ Enter a valid Telegram ID (number)",
"ADMIN_SUPPORT_MODERATOR_REMOVED_SUCCESS": "✅ Moderator {tid} removed",
"ADMIN_SUPPORT_MODERATOR_REMOVED_FAIL": "❌ Failed to remove moderator",
"ADMIN_SUPPORT_MODERATOR_ADDED_SUCCESS": "✅ User {tid} assigned as moderator",
"ADMIN_SUPPORT_MODERATOR_ADDED_FAIL": "❌ Failed to assign moderator",
"ADMIN_SUPPORT_MODERATORS_EMPTY": "List is empty",
"ADMIN_SUPPORT_MODERATORS_TITLE": "🧑‍⚖️ <b>Moderators</b>",
"ADMIN_SUPPORT_SEND_DESCRIPTION": "📨 Send description",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_TITLE": "📝 <b>Editing support description</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CURRENT": "Current description:",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_TITLE": "<b>Contact for \"Contact\" mode</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_HINT": "Add to the description if needed.",
"ADMIN_SUPPORT_DESCRIPTION_UPDATED": "✅ Description updated.",
"ADMIN_SUPPORT_DESCRIPTION_SENT": "Description sent below",
"ADMIN_SUPPORT_MESSAGE_DELETED": "Message deleted",
"ADMIN_SUPPORT_SUBMENU_TITLE": "🛟 **Support**\n\n",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION": "Manage tickets and support settings:",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION_MODERATOR": "Ticket access only.",
"ADMIN_SUPPORT_MODERATION_TITLE": "🧑‍⚖️ <b>Support moderation</b>",
"ADMIN_SUPPORT_MODERATION_DESCRIPTION": "Access to support tickets.",
"ADMIN_SUPPORT_AUDIT_TITLE": "🧾 <b>Moderator audit</b>",
"ADMIN_SUPPORT_AUDIT_EMPTY": "Nothing here yet",
"ADMIN_SUPPORT_AUDIT_ROLE_MODERATOR": "Moderator",
"ADMIN_SUPPORT_AUDIT_ROLE_ADMIN": "Admin",
"ADMIN_SUPPORT_AUDIT_ACTION_CLOSE_TICKET": "Ticket closed",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_TIMED": "Timed block",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_PERM": "Permanent block",
"ADMIN_SUPPORT_AUDIT_ACTION_UNBLOCK": "Unblock",
"ADMIN_SETTINGS_SUBMENU_TITLE": "⚙️ **System settings**\n\n",
"ADMIN_SETTINGS_SUBMENU_DESCRIPTION": "Manage Remnawave, monitoring and other settings:",
"ADMIN_SYSTEM_SUBMENU_TITLE": "🛠️ **System tools**\n\n",
"ADMIN_SYSTEM_SUBMENU_DESCRIPTION": "Reports, updates, logs, backups and system operations:",
"ADMIN_SETTINGS_BOT_CONFIG": "🧩 Bot configuration",
"ADMIN_SETTINGS_MAINTENANCE": "🔧 Maintenance",
"ADMIN_SYSTEM_UPDATES": "📄 Updates",
"ADMIN_SYSTEM_BACKUPS": "🗄️ Backups",
"ADMIN_SYSTEM_LOGS": "🧾 Logs",
"ADMIN_REPORTS_PREVIOUS_DAY": "📆 Previous day",
"ADMIN_REPORTS_LAST_WEEK": "🗓️ Last week",
"ADMIN_REPORTS_LAST_MONTH": "📅 Last month",
"ADMIN_USERS_ALL": "👥 All users",
"ADMIN_USERS_SEARCH": "🔍 Search",
"ADMIN_USERS_INACTIVE": "🗑️ Inactive",
"ADMIN_USERS_FILTERS": "⚙️ Filters",
"ADMIN_USERS_FILTER_BALANCE": "💰 By balance",
"ADMIN_USERS_FILTER_TRAFFIC": "📶 By traffic",
"ADMIN_USERS_FILTER_ACTIVITY": "🕒 By activity",
"ADMIN_USERS_FILTER_SPENDING": "💳 By spending",
"ADMIN_USERS_FILTER_PURCHASES": "🛒 By purchases",
"ADMIN_USERS_FILTER_CAMPAIGN": "📢 By campaign",
"ADMIN_SUBSCRIPTIONS_ALL": "📱 All subscriptions",
"ADMIN_SUBSCRIPTIONS_EXPIRING": "⏰ Expiring soon",
"ADMIN_SUBSCRIPTIONS_PRICING": "⚙️ Pricing settings",
"ADMIN_SUBSCRIPTIONS_COUNTRIES": "🌍 Manage countries",
"ADMIN_PROMOCODES_ALL": "🎫 All promo codes",
"ADMIN_PROMOCODES_CREATE": " Create",
"ADMIN_PROMOCODES_GENERAL_STATS": "📊 Overall statistics",
"ADMIN_CAMPAIGNS_LIST": "📋 Campaign list",
"ADMIN_CAMPAIGNS_CREATE": " Create",
"ADMIN_CAMPAIGNS_GENERAL_STATS": "📊 Overall statistics",
"ADMIN_CAMPAIGN_DISABLE": "🔴 Disable",
"ADMIN_CAMPAIGN_ENABLE": "🟢 Enable",
"ADMIN_CAMPAIGN_STATS": "📊 Statistics",
"ADMIN_CAMPAIGN_EDIT": "✏️ Edit",
"ADMIN_CAMPAIGN_DELETE": "🗑️ Delete",
"ADMIN_BACK_TO_LIST": "⬅️ Back to list",
"ADMIN_CAMPAIGN_EDIT_NAME": "✏️ Name",
"ADMIN_CAMPAIGN_EDIT_START": "🔗 Parameter",
"ADMIN_CAMPAIGN_BONUS_BALANCE": "💰 Balance bonus",
"ADMIN_CAMPAIGN_DURATION": "📅 Duration",
"ADMIN_CAMPAIGN_TRAFFIC": "🌐 Traffic",
"ADMIN_CAMPAIGN_DEVICES": "📱 Devices",
"ADMIN_CAMPAIGN_SERVERS": "🌍 Servers",
"ADMIN_CAMPAIGN_BONUS_SUBSCRIPTION": "📱 Subscription bonus",
"ADMIN_PROMOCODE_EDIT": "✏️ Edit",
"ADMIN_PROMOCODE_TOGGLE": "🔄 Status",
"ADMIN_PROMOCODE_STATS": "📊 Statistics",
"ADMIN_PROMOCODE_DELETE": "🗑️ Delete",
"ADMIN_MESSAGES_ALL_USERS": "📨 All users",
"ADMIN_MESSAGES_BY_SUBSCRIPTIONS": "🎯 By subscriptions",
"ADMIN_MESSAGES_BY_CRITERIA": "🔍 By criteria",
"ADMIN_MESSAGES_HISTORY": "📋 History",
"ADMIN_MONITORING_START": "▶️ Start",
"ADMIN_MONITORING_STOP": "⏸️ Stop",
"ADMIN_MONITORING_STATUS": "📊 Status",
"ADMIN_MONITORING_LOGS": "📋 Logs",
"ADMIN_MONITORING_SETTINGS_BUTTON": "⚙️ Settings",
"ADMIN_REMNAWAVE_SYSTEM_STATS": "📊 System statistics",
"ADMIN_REMNAWAVE_MANAGE_NODES": "🖥️ Manage nodes",
"ADMIN_REMNAWAVE_SYNC": "🔄 Synchronization",
"ADMIN_REMNAWAVE_MANAGE_SQUADS": "🌐 Manage squads",
"ADMIN_REMNAWAVE_TRAFFIC": "📈 Traffic",
"ADMIN_STATS_USERS": "👥 Users",
"ADMIN_STATS_SUBSCRIPTIONS": "📱 Subscriptions",
"ADMIN_STATS_REVENUE": "💰 Revenue",
"ADMIN_STATS_REFERRALS": "🤝 Referrals",
"ADMIN_STATS_SUMMARY": "📊 Summary",
"ADMIN_STATS_BUTTON": "📊 Statistics",
"ADMIN_USER_BALANCE": "💰 Balance",
"ADMIN_USER_SUBSCRIPTION_SETTINGS": "📱 Subscription & settings",
"ADMIN_USER_STATISTICS": "📊 Statistics",
"ADMIN_USER_TRANSACTIONS": "📋 Transactions",
"ADMIN_USER_BLOCK": "🚫 Block",
"ADMIN_USER_DELETE": "🗑️ Delete",
"ADMIN_USER_UNBLOCK": "✅ Unblock",
"ADMIN_USER_ALREADY_DELETED": "❌ User deleted",
"ADMIN_USER_MANAGEMENT_PROFILE": "👤 <b>User management</b>\n\n<b>Main information:</b>\n• Name: {name}\n• ID: <code>{telegram_id}</code>\n• Username: {username}\n• Status: {status}\n• Language: {language}\n\n<b>Finances:</b>\n• Balance: {balance}\n• Transactions: {transactions}\n\n<b>Activity:</b>\n• Registration: {registration}\n• Last activity: {last_activity}\n• Days since registration: {registration_days}",
"ADMIN_USER_USERNAME_NOT_SET": "not set",
"ADMIN_USER_STATUS_ACTIVE": "✅ Active",
"ADMIN_USER_STATUS_BLOCKED": "🚫 Blocked",
"ADMIN_USER_STATUS_DELETED": "🗑️ Deleted",
"ADMIN_USER_STATUS_UNKNOWN": "❓ Unknown",
"ADMIN_USER_LAST_ACTIVITY_UNKNOWN": "Unknown",
"ADMIN_USER_SUBSCRIPTION_TYPE_TRIAL": "🎁 Trial",
"ADMIN_USER_SUBSCRIPTION_TYPE_PAID": "💎 Paid",
"ADMIN_USER_SUBSCRIPTION_STATUS_ACTIVE": "✅ Active",
"ADMIN_USER_SUBSCRIPTION_STATUS_INACTIVE": "❌ Inactive",
"ADMIN_USER_TRAFFIC_USAGE": "{used}/{limit} GB",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION": "<b>Subscription:</b>\n• Type: {type}\n• Status: {status}\n• Until: {end_date}\n• Traffic: {traffic}\n• Devices: {devices}\n• Countries: {countries}",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION_NONE": "<b>Subscription:</b> None",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP": "<b>Promo group:</b>\n• Name: {name}\n• Server discount: {server_discount}%\n• Traffic discount: {traffic_discount}%\n• Device discount: {device_discount}%",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP_NONE": "<b>Promo group:</b> Not assigned",
"ADMIN_PROMOCODE_TYPE_BALANCE": "💰 Balance",
"ADMIN_PROMOCODE_TYPE_DAYS": "📅 Subscription days",
"ADMIN_PROMOCODE_TYPE_TRIAL": "🎁 Trial",
"ADMIN_BROADCAST_TARGET_ALL": "👥 Everyone",
"ADMIN_BROADCAST_TARGET_ACTIVE": "📱 With subscription",
"ADMIN_BROADCAST_TARGET_TRIAL": "🎁 Trial",
"ADMIN_BROADCAST_TARGET_NO_SUB": "❌ No subscription",
"ADMIN_BROADCAST_TARGET_EXPIRING": "⏰ Expiring",
"ADMIN_BROADCAST_TARGET_EXPIRED": "🔚 Expired",
"ADMIN_BROADCAST_TARGET_ACTIVE_ZERO": "🧊 Active 0 GB",
"ADMIN_BROADCAST_TARGET_TRIAL_ZERO": "🥶 Trial 0 GB",
"ADMIN_CRITERIA_TODAY": "📅 Today",
"ADMIN_CRITERIA_WEEK": "📅 Last 7 days",
"ADMIN_CRITERIA_MONTH": "📅 Last month",
"ADMIN_CRITERIA_ACTIVE_TODAY": "⚡ Active today",
"ADMIN_CRITERIA_INACTIVE_WEEK": "💤 Inactive 7+ days",
"ADMIN_CRITERIA_INACTIVE_MONTH": "💤 Inactive 30+ days",
"ADMIN_CRITERIA_REFERRALS": "🤝 Via referrals",
"ADMIN_CRITERIA_PROMOCODES": "🎫 Used promo codes",
"ADMIN_CRITERIA_DIRECT": "🎯 Direct registration",
"ADMIN_HISTORY_REFRESH": "🔄 Refresh",
"ADMIN_SYNC_FULL": "🔄 Full sync",
"ADMIN_SYNC_ONLY_NEW": "🆕 Only new",
"ADMIN_SYNC_UPDATE": "📈 Update data",
"ADMIN_SYNC_VALIDATE": "🔍 Validate",
"ADMIN_SYNC_CLEANUP": "🧹 Cleanup",
"ADMIN_SYNC_RECOMMENDATIONS": "💡 Recommendations",
"ADMIN_SYNC_CONFIRM": "✅ Confirm",
"ADMIN_SYNC_RETRY": "🔄 Retry",
"ADMIN_SYNC_BACK": "⬅️ Back to sync",
"ADMIN_BACK_TO_MAIN": "🏠 Back to main menu",
"ADMIN_CANCEL": "❌ Cancel",
"ADMIN_CONTINUE": "✅ Continue",
"ADMIN_PERIOD_TODAY": "📅 Today",
"ADMIN_PERIOD_YESTERDAY": "📅 Yesterday",
"ADMIN_PERIOD_WEEK": "📅 Week",
"ADMIN_PERIOD_MONTH": "📅 Month",
"ADMIN_PERIOD_ALL": "📅 All time",
"ADMIN_NODE_ENABLE": "▶️ Enable",
"ADMIN_NODE_DISABLE": "⏸️ Disable",
"ADMIN_NODE_RESTART": "🔄 Restart",
"ADMIN_NODE_STATS": "📊 Statistics",
"ADMIN_SQUAD_ADD_ALL": "👥 Add all users",
"ADMIN_SQUAD_REMOVE_ALL": "❌ Remove all users",
"ADMIN_SQUAD_EDIT": "✏️ Edit",
"ADMIN_SQUAD_DELETE": "🗑️ Delete squad",
"ADMIN_SQUAD_EDIT_INBOUNDS": "🔧 Edit inbounds",
"ADMIN_SQUAD_RENAME": "✏️ Rename",
"ADMIN_BACK_TO_SQUADS": "⬅️ Back to squads",
"ADMIN_MONITORING_STOP_HARD": "⏹️ Stop",
"ADMIN_MONITORING_FORCE_CHECK": "🔄 Force check",
"ADMIN_MONITORING_TEST_NOTIFICATIONS": "🧪 Test notifications",
"ADMIN_MONITORING_STATISTICS": "📊 Statistics",
"ADMIN_BACK_TO_ADMIN": "⬅️ Back to admin",
"ADMIN_MONITORING_CLEAR_OLD": "🗑️ Clear old",
"ADMIN_MONITORING_CLEAR": "🗑️ Clear",
"ADMIN_BACK_TO_MONITORING": "⬅️ Back to monitoring",
"ADMIN_MONITORING_DELETE_LOG": "🗑️ Delete this log",
"ADMIN_MONITORING_BACK_TO_LOGS": "⬅️ Back to log list",
"ADMIN_MONITORING_CONFIRM_CLEAR": "✅ Yes, clear",
"ADMIN_MONITORING_CLEAR_ALL": "🗑️ Clear ALL logs",
"ADMIN_MONITORING_RESTART": "🔄 Restart",
"ADMIN_MONITORING_CHECK_NOW": "🔄 Check now",
"ADMIN_MONITORING_SET_INTERVAL": "⏱️ Check interval",
"ADMIN_MONITORING_NOTIFICATIONS": "🔔 Notifications",
"ADMIN_MONITORING_AUTOPAY_SETTINGS": "💳 Auto-pay settings",
"ADMIN_MONITORING_AUTO_CLEANUP": "🧹 Auto-clean logs",
"ADMIN_MONITORING_FILTER_SUCCESS": "✅ Success",
"ADMIN_MONITORING_FILTER_ERRORS": "❌ Errors",
"ADMIN_MONITORING_FILTER_CYCLES": "🔄 Monitoring cycles",
"ADMIN_MONITORING_FILTER_AUTOPAY": "💳 Auto-payments",
"ADMIN_MONITORING_ALL_LOGS": "📋 All logs",
"ADMIN_SERVERS_LIST": "📋 Server list",
"ADMIN_SERVERS_SYNC": "🔄 Synchronization",
"ADMIN_SERVERS_ADD": " Add server",
"ADMIN_SERVERS_STATS": "📊 Statistics",
"ADMIN_SERVER_DISABLE": "❌ Disable",
"ADMIN_SERVER_ENABLE": "✅ Enable",
"ADMIN_SERVER_EDIT_NAME": "✏️ Name",
"ADMIN_SERVER_EDIT_PRICE": "💰 Price",
"ADMIN_SERVER_EDIT_COUNTRY": "🌍 Country",
"ADMIN_SERVER_EDIT_LIMIT": "👥 Limit",
"ADMIN_SERVER_EDIT_DESCRIPTION": "📝 Description",
"ADMIN_SERVER_DELETE": "🗑️ Delete",
"ADMIN_MAINTENANCE_DISABLE": "🟢 Disable maintenance",
"ADMIN_MAINTENANCE_ENABLE": "🔧 Enable maintenance",
"ADMIN_MAINTENANCE_STOP_MONITORING": "⏹️ Stop monitoring",
"ADMIN_MAINTENANCE_START_MONITORING": "▶️ Start monitoring",
"ADMIN_MAINTENANCE_CHECK_API": "🔍 Check API",
"ADMIN_MAINTENANCE_PANEL_STATUS": "🌐 Panel status",
"ADMIN_MAINTENANCE_SEND_NOTIFICATION": "📢 Send notification",
"ADMIN_REFRESH": "🔄 Refresh",
"ADMIN_WELCOME_DISABLE": "🔴 Disable",
"ADMIN_WELCOME_ENABLE": "🟢 Enable",
"ADMIN_WELCOME_EDIT": "📝 Edit text",
"ADMIN_WELCOME_SHOW": "👁️ Show current",
"ADMIN_WELCOME_PREVIEW": "👁️ Preview",
"ADMIN_WELCOME_RESET": "🔄 Reset",
"ADMIN_WELCOME_HTML": "🏷️ HTML formatting",
"ADMIN_WELCOME_PLACEHOLDERS": "💡 Placeholders",
"ADMIN_BROADCAST_ADD_PHOTO": "📷 Add photo",
"ADMIN_BROADCAST_ADD_VIDEO": "🎥 Add video",
"ADMIN_BROADCAST_ADD_DOCUMENT": "📄 Add document",
"ADMIN_BROADCAST_SKIP_MEDIA": "⏭️ Skip media",
"ADMIN_BROADCAST_USE_MEDIA": "✅ Use this media",
"ADMIN_BROADCAST_REPLACE_MEDIA": "🔄 Replace media",
"ADMIN_BROADCAST_NO_MEDIA": "⏭️ No media",
"ADMIN_BROADCAST_CHANGE_MEDIA": "🖼️ Change media",
"ADMIN_BROADCAST_BUTTON_BALANCE": "💰 Top up balance",
"ADMIN_BROADCAST_BUTTON_REFERRALS": "🤝 Referrals",
"ADMIN_BROADCAST_BUTTON_PROMOCODE": "🎫 Promo code",
"ADMIN_BROADCAST_BUTTON_CONNECT": "🔗 Connect",
"ADMIN_BROADCAST_BUTTON_SUBSCRIPTION": "📱 Subscription",
"ADMIN_BROADCAST_BUTTON_SUPPORT": "🛠️ Support",
"ADMIN_BROADCAST_BUTTON_HOME": "🏠 Main menu"
}
+283 -3
View File
@@ -72,7 +72,6 @@
"NO_TICKETS_ADMIN": "Нет тикетов для отображения.",
"ADMIN_TICKETS_TITLE": "🎫 Все тикеты поддержки:",
"ADMIN_TICKET_REPLY_INPUT": "Введите ответ от поддержки:",
"ADMIN_TICKET_REPLY_SENT": "✅ Ответ отправлен!",
"TICKET_MARKED_ANSWERED": "✅ Тикет отмечен как отвеченный.",
"TICKET_UPDATE_ERROR": "❌ Ошибка при обновлении тикета.",
@@ -187,6 +186,7 @@
"CHANNEL_SUBSCRIBE_BUTTON": "🔗 Подписаться",
"CHANNEL_SUBSCRIBE_REQUIRED_ALERT": "❌ Вы не подписались на канал!",
"CHANNEL_SUBSCRIBE_THANKS": "✅ Спасибо за подписку",
"TRIAL_CHANNEL_UNSUBSCRIBED": "\n🚫 <b>Доступ приостановлен</b>\n\nМы не нашли вашу подписку на наш канал, поэтому тестовая подписка отключена.\n\nПодпишитесь на канал и нажмите «{check_button}», чтобы вернуть доступ.",
"CHECK_STATUS_BUTTON": "📊 Проверить статус",
"CHOOSE_ANOTHER_DEVICE": "📱 Выбрать другое устройство",
"CONFIRM": "✅ Подтвердить",
@@ -275,7 +275,13 @@
"PAL24_TOPUP_PROMPT": "🏦 <b>Оплата через PayPalych (СБП)</b>\n\nВведите сумму для пополнения от 100 до 1 000 000 ₽.\nОплата проходит через систему быстрых платежей PayPalych.",
"PAL24_PAYMENT_ERROR": "❌ Ошибка создания платежа PayPalych. Попробуйте позже или обратитесь в поддержку.",
"PAL24_PAY_BUTTON": "🏦 Оплатить через PayPalych (СБП)",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>Оплата через PayPalych (СБП)</b>\n\n💰 Сумма: {amount}\n🆔 ID счета: {bill_id}\n\n📱 <b>Инструкция:</b>\n1. Нажмите кнопку ‘Оплатить через PayPalych (СБП)’\n2. Следуйте подсказкам платежной системы\n3. Подтвердите перевод\n4. Средства зачислятся автоматически\n\n❓ Если возникнут проблемы, обратитесь в {support}",
"PAL24_SBP_PAY_BUTTON": "🏦 Оплатить через PayPalych (СБП)",
"PAL24_CARD_PAY_BUTTON": "💳 Оплатить банковской картой (PayPalych)",
"PAL24_PAYMENT_INSTRUCTIONS": "🏦 <b>Оплата через PayPalych</b>\n\n💰 Сумма: {amount}\n🆔 ID счета: {bill_id}\n\n📱 <b>Инструкция:</b>\n{steps}\n\n❓ Если возникнут проблемы, обратитесь в {support}",
"PAL24_INSTRUCTION_BUTTON": "{step}. Нажмите кнопку «{button}»",
"PAL24_INSTRUCTION_FOLLOW": "{step}. Следуйте подсказкам платёжной системы",
"PAL24_INSTRUCTION_CONFIRM": "{step}. Подтвердите перевод",
"PAL24_INSTRUCTION_COMPLETE": "{step}. Средства зачислятся автоматически",
"PENDING_CANCEL_BUTTON": "⌛ Отмена",
"PERIOD_14_DAYS": "📅 14 дней - {settings.format_price(settings.PRICE_14_DAYS)}",
"PERIOD_180_DAYS": "📅 180 дней - {settings.format_price(settings.PRICE_180_DAYS)}",
@@ -535,5 +541,279 @@
"NOTIFY_PROMPT_SECOND_HOURS": "Введите количество часов действия скидки (1-168):",
"NOTIFY_PROMPT_THIRD_PERCENT": "Введите новый процент скидки для позднего предложения (0-100):",
"NOTIFY_PROMPT_THIRD_HOURS": "Введите количество часов действия скидки (1-168):",
"NOTIFY_PROMPT_THIRD_DAYS": "Через сколько дней после истечения отправлять предложение? (минимум 2):"
"NOTIFY_PROMPT_THIRD_DAYS": "Через сколько дней после истечения отправлять предложение? (минимум 2):",
"ADMIN_MAIN_USERS_SUBSCRIPTIONS": "👥 Юзеры/Подписки",
"ADMIN_MAIN_PROMO_STATS": "💰 Промокоды/Статистика",
"ADMIN_MAIN_SUPPORT": "🛟 Поддержка",
"ADMIN_MAIN_MESSAGES": "📨 Сообщения",
"ADMIN_MAIN_SETTINGS": "⚙️ Настройки",
"ADMIN_MAIN_SYSTEM": "🛠️ Система",
"ADMIN_USERS_SUBMENU_TITLE": "👥 **Управление пользователями и подписками**\n\n",
"ADMIN_PROMO_SUBMENU_TITLE": "💰 **Промокоды и статистика**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_TITLE": "📨 **Коммуникации**\n\n",
"ADMIN_COMMUNICATIONS_SUBMENU_DESCRIPTION": "Управление рассылками и текстами интерфейса:",
"ADMIN_SUBMENU_SELECT_SECTION": "Выберите нужный раздел:",
"ADMIN_COMMUNICATIONS_WELCOME_TEXT": "👋 Приветственный текст",
"ADMIN_COMMUNICATIONS_MENU_MESSAGES": "📢 Сообщения в меню",
"ADMIN_SUPPORT_TICKETS": "🎫 Тикеты поддержки",
"ADMIN_SUPPORT_AUDIT": "🧾 Аудит модераторов",
"ADMIN_SUPPORT_SETTINGS": "🛟 Настройки поддержки",
"ADMIN_SUPPORT_SETTINGS_STATUS_ENABLED": "Включены",
"ADMIN_SUPPORT_SETTINGS_STATUS_DISABLED": "Отключены",
"ADMIN_SUPPORT_SETTINGS_MENU_LABEL": "Пункт «Техподдержка» в меню",
"ADMIN_SUPPORT_SETTINGS_MODE_TICKETS": "Тикеты",
"ADMIN_SUPPORT_SETTINGS_MODE_CONTACT": "Контакт",
"ADMIN_SUPPORT_SETTINGS_MODE_BOTH": "Оба",
"ADMIN_SUPPORT_SETTINGS_EDIT_DESCRIPTION": "📝 Изменить описание",
"ADMIN_SUPPORT_SETTINGS_ADMIN_NOTIFICATIONS": "Админ-уведомления",
"ADMIN_SUPPORT_SETTINGS_USER_NOTIFICATIONS": "Пользовательские уведомления",
"ADMIN_SUPPORT_SETTINGS_SLA_LABEL": "SLA",
"ADMIN_SUPPORT_SETTINGS_SLA_TIME": "⏳ Время SLA: {minutes} мин",
"ADMIN_SUPPORT_SETTINGS_MODERATORS_COUNT": "🧑‍⚖️ Модераторы: {count}",
"ADMIN_SUPPORT_SETTINGS_ADD_MODERATOR": "➕ Назначить модератора",
"ADMIN_SUPPORT_SETTINGS_REMOVE_MODERATOR": "➖ Удалить модератора",
"ADMIN_SUPPORT_SETTINGS_TITLE": "🛟 <b>Настройки поддержки</b>",
"ADMIN_SUPPORT_SETTINGS_DESCRIPTION": "Режим работы и видимость в меню. Ниже текущее описание меню поддержки:",
"ADMIN_SUPPORT_SLA_SETUP_PROMPT": "⏳ <b>Настройка SLA</b>\n\nВведите количество минут ожидания ответа (целое число > 0):",
"ADMIN_SUPPORT_SLA_INVALID": "❌ Введите корректное число минут (1-1440)",
"ADMIN_SUPPORT_SLA_SAVED": "✅ Значение SLA сохранено",
"ADMIN_SUPPORT_ASSIGN_MODERATOR_PROMPT": "🧑‍⚖️ <b>Назначение модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
"ADMIN_SUPPORT_REMOVE_MODERATOR_PROMPT": "🧑‍⚖️ <b>Удаление модератора</b>\n\nОтправьте Telegram ID пользователя (число)",
"ADMIN_SUPPORT_INVALID_TELEGRAM_ID": "❌ Введите корректный Telegram ID (число)",
"ADMIN_SUPPORT_MODERATOR_REMOVED_SUCCESS": "✅ Модератор {tid} удалён",
"ADMIN_SUPPORT_MODERATOR_REMOVED_FAIL": "❌ Не удалось удалить модератора",
"ADMIN_SUPPORT_MODERATOR_ADDED_SUCCESS": "✅ Пользователь {tid} назначен модератором",
"ADMIN_SUPPORT_MODERATOR_ADDED_FAIL": "❌ Не удалось назначить модератора",
"ADMIN_SUPPORT_MODERATORS_EMPTY": "Список пуст",
"ADMIN_SUPPORT_MODERATORS_TITLE": "🧑‍⚖️ <b>Модераторы</b>",
"ADMIN_SUPPORT_SEND_DESCRIPTION": "📨 Прислать текст",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_TITLE": "📝 <b>Редактирование описания поддержки</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CURRENT": "Текущее описание:",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_TITLE": "<b>Контакт для режима «Контакт»</b>",
"ADMIN_SUPPORT_EDIT_DESCRIPTION_CONTACT_HINT": "Добавьте в описание при необходимости.",
"ADMIN_SUPPORT_DESCRIPTION_UPDATED": "✅ Описание обновлено.",
"ADMIN_SUPPORT_DESCRIPTION_SENT": "Текст отправлен ниже",
"ADMIN_SUPPORT_MESSAGE_DELETED": "Сообщение удалено",
"ADMIN_SUPPORT_SUBMENU_TITLE": "🛟 **Поддержка**\n\n",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION": "Управление тикетами и настройками поддержки:",
"ADMIN_SUPPORT_SUBMENU_DESCRIPTION_MODERATOR": "Доступ к тикетам.",
"ADMIN_SUPPORT_MODERATION_TITLE": "🧑‍⚖️ <b>Модерация поддержки</b>",
"ADMIN_SUPPORT_MODERATION_DESCRIPTION": "Доступ к тикетам поддержки.",
"ADMIN_SUPPORT_AUDIT_TITLE": "🧾 <b>Аудит модераторов</b>",
"ADMIN_SUPPORT_AUDIT_EMPTY": "Пока пусто",
"ADMIN_SUPPORT_AUDIT_ROLE_MODERATOR": "Модератор",
"ADMIN_SUPPORT_AUDIT_ROLE_ADMIN": "Админ",
"ADMIN_SUPPORT_AUDIT_ACTION_CLOSE_TICKET": "Закрытие тикета",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_TIMED": "Блокировка (время)",
"ADMIN_SUPPORT_AUDIT_ACTION_BLOCK_PERM": "Блокировка (навсегда)",
"ADMIN_SUPPORT_AUDIT_ACTION_UNBLOCK": "Снятие блока",
"ADMIN_SETTINGS_SUBMENU_TITLE": "⚙️ **Настройки системы**\n\n",
"ADMIN_SETTINGS_SUBMENU_DESCRIPTION": "Управление Remnawave, мониторингом и другими настройками:",
"ADMIN_SYSTEM_SUBMENU_TITLE": "🛠️ **Системные функции**\n\n",
"ADMIN_SYSTEM_SUBMENU_DESCRIPTION": "Отчеты, обновления, логи, резервные копии и системные операции:",
"ADMIN_SETTINGS_BOT_CONFIG": "🧩 Конфигурация бота",
"ADMIN_SETTINGS_MAINTENANCE": "🔧 Техработы",
"ADMIN_SYSTEM_UPDATES": "📄 Обновления",
"ADMIN_SYSTEM_BACKUPS": "🗄️ Резервные копии",
"ADMIN_SYSTEM_LOGS": "🧾 Логи",
"ADMIN_REPORTS_PREVIOUS_DAY": "📆 За вчера",
"ADMIN_REPORTS_LAST_WEEK": "🗓️ За неделю",
"ADMIN_REPORTS_LAST_MONTH": "📅 За месяц",
"ADMIN_USERS_ALL": "👥 Все пользователи",
"ADMIN_USERS_SEARCH": "🔍 Поиск",
"ADMIN_USERS_INACTIVE": "🗑️ Неактивные",
"ADMIN_USERS_FILTERS": "⚙️ Фильтры",
"ADMIN_USERS_FILTER_BALANCE": "💰 По балансу",
"ADMIN_USERS_FILTER_TRAFFIC": "📶 По трафику",
"ADMIN_USERS_FILTER_ACTIVITY": "🕒 По активности",
"ADMIN_USERS_FILTER_SPENDING": "💳 По сумме трат",
"ADMIN_USERS_FILTER_PURCHASES": "🛒 По количеству покупок",
"ADMIN_USERS_FILTER_CAMPAIGN": "📢 По кампании",
"ADMIN_SUBSCRIPTIONS_ALL": "📱 Все подписки",
"ADMIN_SUBSCRIPTIONS_EXPIRING": "⏰ Истекающие",
"ADMIN_SUBSCRIPTIONS_PRICING": "⚙️ Настройки цен",
"ADMIN_SUBSCRIPTIONS_COUNTRIES": "🌍 Управление странами",
"ADMIN_PROMOCODES_ALL": "🎫 Все промокоды",
"ADMIN_PROMOCODES_CREATE": " Создать",
"ADMIN_PROMOCODES_GENERAL_STATS": "📊 Общая статистика",
"ADMIN_CAMPAIGNS_LIST": "📋 Список кампаний",
"ADMIN_CAMPAIGNS_CREATE": " Создать",
"ADMIN_CAMPAIGNS_GENERAL_STATS": "📊 Общая статистика",
"ADMIN_CAMPAIGN_DISABLE": "🔴 Выключить",
"ADMIN_CAMPAIGN_ENABLE": "🟢 Включить",
"ADMIN_CAMPAIGN_STATS": "📊 Статистика",
"ADMIN_CAMPAIGN_EDIT": "✏️ Редактировать",
"ADMIN_CAMPAIGN_DELETE": "🗑️ Удалить",
"ADMIN_BACK_TO_LIST": "⬅️ К списку",
"ADMIN_CAMPAIGN_EDIT_NAME": "✏️ Название",
"ADMIN_CAMPAIGN_EDIT_START": "🔗 Параметр",
"ADMIN_CAMPAIGN_BONUS_BALANCE": "💰 Бонус на баланс",
"ADMIN_CAMPAIGN_DURATION": "📅 Длительность",
"ADMIN_CAMPAIGN_TRAFFIC": "🌐 Трафик",
"ADMIN_CAMPAIGN_DEVICES": "📱 Устройства",
"ADMIN_CAMPAIGN_SERVERS": "🌍 Серверы",
"ADMIN_CAMPAIGN_BONUS_SUBSCRIPTION": "📱 Бонус на подписку",
"ADMIN_PROMOCODE_EDIT": "✏️ Редактировать",
"ADMIN_PROMOCODE_TOGGLE": "🔄 Статус",
"ADMIN_PROMOCODE_STATS": "📊 Статистика",
"ADMIN_PROMOCODE_DELETE": "🗑️ Удалить",
"ADMIN_MESSAGES_ALL_USERS": "📨 Всем пользователям",
"ADMIN_MESSAGES_BY_SUBSCRIPTIONS": "🎯 По подпискам",
"ADMIN_MESSAGES_BY_CRITERIA": "🔍 По критериям",
"ADMIN_MESSAGES_HISTORY": "📋 История",
"ADMIN_MONITORING_START": "▶️ Запустить",
"ADMIN_MONITORING_STOP": "⏸️ Остановить",
"ADMIN_MONITORING_STATUS": "📊 Статус",
"ADMIN_MONITORING_LOGS": "📋 Логи",
"ADMIN_MONITORING_SETTINGS_BUTTON": "⚙️ Настройки",
"ADMIN_REMNAWAVE_SYSTEM_STATS": "📊 Системная статистика",
"ADMIN_REMNAWAVE_MANAGE_NODES": "🖥️ Управление нодами",
"ADMIN_REMNAWAVE_SYNC": "🔄 Синхронизация",
"ADMIN_REMNAWAVE_MANAGE_SQUADS": "🌐 Управление сквадами",
"ADMIN_REMNAWAVE_TRAFFIC": "📈 Трафик",
"ADMIN_STATS_USERS": "👥 Пользователи",
"ADMIN_STATS_SUBSCRIPTIONS": "📱 Подписки",
"ADMIN_STATS_REVENUE": "💰 Доходы",
"ADMIN_STATS_REFERRALS": "🤝 Партнерка",
"ADMIN_STATS_SUMMARY": "📊 Общая сводка",
"ADMIN_STATS_BUTTON": "📊 Статистика",
"ADMIN_USER_BALANCE": "💰 Баланс",
"ADMIN_USER_SUBSCRIPTION_SETTINGS": "📱 Подписка и настройки",
"ADMIN_USER_STATISTICS": "📊 Статистика",
"ADMIN_USER_TRANSACTIONS": "📋 Транзакции",
"ADMIN_USER_BLOCK": "🚫 Заблокировать",
"ADMIN_USER_DELETE": "🗑️ Удалить",
"ADMIN_USER_UNBLOCK": "✅ Разблокировать",
"ADMIN_USER_ALREADY_DELETED": "❌ Пользователь удален",
"ADMIN_USER_MANAGEMENT_PROFILE": "👤 <b>Управление пользователем</b>\n\n<b>Основная информация:</b>\n• Имя: {name}\n• ID: <code>{telegram_id}</code>\n• Username: {username}\n• Статус: {status}\n• Язык: {language}\n\n<b>Финансы:</b>\n• Баланс: {balance}\n• Транзакций: {transactions}\n\n<b>Активность:</b>\n• Регистрация: {registration}\n• Последняя активность: {last_activity}\n• Дней с регистрации: {registration_days}",
"ADMIN_USER_USERNAME_NOT_SET": "не указан",
"ADMIN_USER_STATUS_ACTIVE": "✅ Активен",
"ADMIN_USER_STATUS_BLOCKED": "🚫 Заблокирован",
"ADMIN_USER_STATUS_DELETED": "🗑️ Удален",
"ADMIN_USER_STATUS_UNKNOWN": "❓ Неизвестно",
"ADMIN_USER_LAST_ACTIVITY_UNKNOWN": "Неизвестно",
"ADMIN_USER_SUBSCRIPTION_TYPE_TRIAL": "🎁 Триал",
"ADMIN_USER_SUBSCRIPTION_TYPE_PAID": "💎 Платная",
"ADMIN_USER_SUBSCRIPTION_STATUS_ACTIVE": "✅ Активна",
"ADMIN_USER_SUBSCRIPTION_STATUS_INACTIVE": "❌ Неактивна",
"ADMIN_USER_TRAFFIC_USAGE": "{used}/{limit} ГБ",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION": "<b>Подписка:</b>\n• Тип: {type}\n• Статус: {status}\n• До: {end_date}\n• Трафик: {traffic}\n• Устройства: {devices}\n• Стран: {countries}",
"ADMIN_USER_MANAGEMENT_SUBSCRIPTION_NONE": "<b>Подписка:</b> Отсутствует",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP": "<b>Промогруппа:</b>\n• Название: {name}\n• Скидка на сервера: {server_discount}%\n• Скидка на трафик: {traffic_discount}%\n• Скидка на устройства: {device_discount}%",
"ADMIN_USER_MANAGEMENT_PROMO_GROUP_NONE": "<b>Промогруппа:</b> Не назначена",
"ADMIN_PROMOCODE_TYPE_BALANCE": "💰 Баланс",
"ADMIN_PROMOCODE_TYPE_DAYS": "📅 Дни подписки",
"ADMIN_PROMOCODE_TYPE_TRIAL": "🎁 Триал",
"ADMIN_BROADCAST_TARGET_ALL": "👥 Всем",
"ADMIN_BROADCAST_TARGET_ACTIVE": "📱 С подпиской",
"ADMIN_BROADCAST_TARGET_TRIAL": "🎁 Триал",
"ADMIN_BROADCAST_TARGET_NO_SUB": "❌ Без подписки",
"ADMIN_BROADCAST_TARGET_EXPIRING": "⏰ Истекающие",
"ADMIN_BROADCAST_TARGET_EXPIRED": "🔚 Истекшие",
"ADMIN_BROADCAST_TARGET_ACTIVE_ZERO": "🧊 Активна 0 ГБ",
"ADMIN_BROADCAST_TARGET_TRIAL_ZERO": "🥶 Триал 0 ГБ",
"ADMIN_CRITERIA_TODAY": "📅 Сегодня",
"ADMIN_CRITERIA_WEEK": "📅 За неделю",
"ADMIN_CRITERIA_MONTH": "📅 За месяц",
"ADMIN_CRITERIA_ACTIVE_TODAY": "⚡ Активные сегодня",
"ADMIN_CRITERIA_INACTIVE_WEEK": "💤 Неактивные 7+ дней",
"ADMIN_CRITERIA_INACTIVE_MONTH": "💤 Неактивные 30+ дней",
"ADMIN_CRITERIA_REFERRALS": "🤝 Через рефералов",
"ADMIN_CRITERIA_PROMOCODES": "🎫 Использовали промокоды",
"ADMIN_CRITERIA_DIRECT": "🎯 Прямая регистрация",
"ADMIN_HISTORY_REFRESH": "🔄 Обновить",
"ADMIN_SYNC_FULL": "🔄 Полная синхронизация",
"ADMIN_SYNC_ONLY_NEW": "🆕 Только новые",
"ADMIN_SYNC_UPDATE": "📈 Обновить данные",
"ADMIN_SYNC_VALIDATE": "🔍 Валидация",
"ADMIN_SYNC_CLEANUP": "🧹 Очистка",
"ADMIN_SYNC_RECOMMENDATIONS": "💡 Рекомендации",
"ADMIN_SYNC_CONFIRM": "✅ Подтвердить",
"ADMIN_SYNC_RETRY": "🔄 Повторить",
"ADMIN_SYNC_BACK": "⬅️ К синхронизации",
"ADMIN_BACK_TO_MAIN": "🏠 В главное меню",
"ADMIN_CANCEL": "❌ Отмена",
"ADMIN_CONTINUE": "✅ Продолжить",
"ADMIN_PERIOD_TODAY": "📅 Сегодня",
"ADMIN_PERIOD_YESTERDAY": "📅 Вчера",
"ADMIN_PERIOD_WEEK": "📅 Неделя",
"ADMIN_PERIOD_MONTH": "📅 Месяц",
"ADMIN_PERIOD_ALL": "📅 Все время",
"ADMIN_NODE_ENABLE": "▶️ Включить",
"ADMIN_NODE_DISABLE": "⏸️ Отключить",
"ADMIN_NODE_RESTART": "🔄 Перезагрузить",
"ADMIN_NODE_STATS": "📊 Статистика",
"ADMIN_SQUAD_ADD_ALL": "👥 Добавить всех пользователей",
"ADMIN_SQUAD_REMOVE_ALL": "❌ Удалить всех пользователей",
"ADMIN_SQUAD_EDIT": "✏️ Редактировать",
"ADMIN_SQUAD_DELETE": "🗑️ Удалить сквад",
"ADMIN_SQUAD_EDIT_INBOUNDS": "🔧 Изменить инбаунды",
"ADMIN_SQUAD_RENAME": "✏️ Переименовать",
"ADMIN_BACK_TO_SQUADS": "⬅️ Назад к сквадам",
"ADMIN_MONITORING_STOP_HARD": "⏹️ Остановить",
"ADMIN_MONITORING_FORCE_CHECK": "🔄 Принудительная проверка",
"ADMIN_MONITORING_TEST_NOTIFICATIONS": "🧪 Тест уведомлений",
"ADMIN_MONITORING_STATISTICS": "📊 Статистика",
"ADMIN_BACK_TO_ADMIN": "⬅️ Назад в админку",
"ADMIN_MONITORING_CLEAR_OLD": "🗑️ Очистить старые",
"ADMIN_MONITORING_CLEAR": "🗑️ Очистить",
"ADMIN_BACK_TO_MONITORING": "⬅️ Назад к мониторингу",
"ADMIN_MONITORING_DELETE_LOG": "🗑️ Удалить этот лог",
"ADMIN_MONITORING_BACK_TO_LOGS": "⬅️ К списку логов",
"ADMIN_MONITORING_CONFIRM_CLEAR": "✅ Да, очистить",
"ADMIN_MONITORING_CLEAR_ALL": "🗑️ Очистить ВСЕ логи",
"ADMIN_MONITORING_RESTART": "🔄 Перезапустить",
"ADMIN_MONITORING_CHECK_NOW": "🔄 Проверить сейчас",
"ADMIN_MONITORING_SET_INTERVAL": "⏱️ Интервал проверки",
"ADMIN_MONITORING_NOTIFICATIONS": "🔔 Уведомления",
"ADMIN_MONITORING_AUTOPAY_SETTINGS": "💳 Настройки автооплаты",
"ADMIN_MONITORING_AUTO_CLEANUP": "🧹 Автоочистка логов",
"ADMIN_MONITORING_FILTER_SUCCESS": "✅ Успешные",
"ADMIN_MONITORING_FILTER_ERRORS": "❌ Ошибки",
"ADMIN_MONITORING_FILTER_CYCLES": "🔄 Циклы мониторинга",
"ADMIN_MONITORING_FILTER_AUTOPAY": "💳 Автооплаты",
"ADMIN_MONITORING_ALL_LOGS": "📋 Все логи",
"ADMIN_SERVERS_LIST": "📋 Список серверов",
"ADMIN_SERVERS_SYNC": "🔄 Синхронизация",
"ADMIN_SERVERS_ADD": "➕ Добавить сервер",
"ADMIN_SERVERS_STATS": "📊 Статистика",
"ADMIN_SERVER_DISABLE": "❌ Отключить",
"ADMIN_SERVER_ENABLE": "✅ Включить",
"ADMIN_SERVER_EDIT_NAME": "✏️ Название",
"ADMIN_SERVER_EDIT_PRICE": "💰 Цена",
"ADMIN_SERVER_EDIT_COUNTRY": "🌍 Страна",
"ADMIN_SERVER_EDIT_LIMIT": "👥 Лимит",
"ADMIN_SERVER_EDIT_DESCRIPTION": "📝 Описание",
"ADMIN_SERVER_DELETE": "🗑️ Удалить",
"ADMIN_MAINTENANCE_DISABLE": "🟢 Выключить техработы",
"ADMIN_MAINTENANCE_ENABLE": "🔧 Включить техработы",
"ADMIN_MAINTENANCE_STOP_MONITORING": "⏹️ Остановить мониторинг",
"ADMIN_MAINTENANCE_START_MONITORING": "▶️ Запустить мониторинг",
"ADMIN_MAINTENANCE_CHECK_API": "🔍 Проверить API",
"ADMIN_MAINTENANCE_PANEL_STATUS": "🌐 Статус панели",
"ADMIN_MAINTENANCE_SEND_NOTIFICATION": "📢 Отправить уведомление",
"ADMIN_REFRESH": "🔄 Обновить",
"ADMIN_WELCOME_DISABLE": "🔴 Отключить",
"ADMIN_WELCOME_ENABLE": "🟢 Включить",
"ADMIN_WELCOME_EDIT": "📝 Изменить текст",
"ADMIN_WELCOME_SHOW": "👁️ Показать текущий",
"ADMIN_WELCOME_PREVIEW": "👁️ Предпросмотр",
"ADMIN_WELCOME_RESET": "🔄 Сбросить",
"ADMIN_WELCOME_HTML": "🏷️ HTML форматирование",
"ADMIN_WELCOME_PLACEHOLDERS": "💡 Плейсхолдеры",
"ADMIN_BROADCAST_ADD_PHOTO": "📷 Добавить фото",
"ADMIN_BROADCAST_ADD_VIDEO": "🎥 Добавить видео",
"ADMIN_BROADCAST_ADD_DOCUMENT": "📄 Добавить документ",
"ADMIN_BROADCAST_SKIP_MEDIA": "⏭️ Пропустить медиа",
"ADMIN_BROADCAST_USE_MEDIA": "✅ Использовать это медиа",
"ADMIN_BROADCAST_REPLACE_MEDIA": "🔄 Заменить медиа",
"ADMIN_BROADCAST_NO_MEDIA": "⏭️ Без медиа",
"ADMIN_BROADCAST_CHANGE_MEDIA": "🖼️ Изменить медиа",
"ADMIN_BROADCAST_BUTTON_BALANCE": "💰 Пополнить баланс",
"ADMIN_BROADCAST_BUTTON_REFERRALS": "🤝 Партнерка",
"ADMIN_BROADCAST_BUTTON_PROMOCODE": "🎫 Промокод",
"ADMIN_BROADCAST_BUTTON_CONNECT": "🔗 Подключиться",
"ADMIN_BROADCAST_BUTTON_SUBSCRIPTION": "📱 Подписка",
"ADMIN_BROADCAST_BUTTON_SUPPORT": "🛠️ Техподдержка",
"ADMIN_BROADCAST_BUTTON_HOME": "🏠 На главную"
}
+2839
View File
File diff suppressed because it is too large Load Diff