From ff51a984effb9affbb1e70d20b7337e7b1176c14 Mon Sep 17 00:00:00 2001 From: gy9vin Date: Wed, 31 Dec 2025 10:16:14 +0300 Subject: [PATCH] =?UTF-8?q?fix=20=D0=9F=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20callback=5Fd?= =?UTF-8?q?ata=20=D0=B2=20get=5Fback=5Fkeyboard=20+=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=D0=BC=D0=B0=20=D0=B2=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. app/keyboards/inline.py - Добавлен параметр callback_data: str = "back_to_menu" в get_back_keyboard() - Позволяет использовать кнопку "Назад" с разными callback'ами 2. app/services/admin_notification_service.py - Добавлен тип "modem" в update_types с заголовком "📡 ИЗМЕНЕНИЕ МОД --- app/keyboards/inline.py | 4 ++-- app/services/admin_notification_service.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/keyboards/inline.py b/app/keyboards/inline.py index d0976afc..8ac064d0 100644 --- a/app/keyboards/inline.py +++ b/app/keyboards/inline.py @@ -807,10 +807,10 @@ def get_happ_download_link_keyboard(language: str, link: str) -> InlineKeyboardM return InlineKeyboardMarkup(inline_keyboard=buttons) -def get_back_keyboard(language: str = DEFAULT_LANGUAGE) -> InlineKeyboardMarkup: +def get_back_keyboard(language: str = DEFAULT_LANGUAGE, callback_data: str = "back_to_menu") -> InlineKeyboardMarkup: texts = get_texts(language) return InlineKeyboardMarkup(inline_keyboard=[ - [InlineKeyboardButton(text=texts.BACK, callback_data="back_to_menu")] + [InlineKeyboardButton(text=texts.BACK, callback_data=callback_data)] ]) diff --git a/app/services/admin_notification_service.py b/app/services/admin_notification_service.py index 95224e34..8de820a1 100644 --- a/app/services/admin_notification_service.py +++ b/app/services/admin_notification_service.py @@ -1364,7 +1364,8 @@ class AdminNotificationService: update_types = { "traffic": ("📊 ИЗМЕНЕНИЕ ТРАФИКА", "трафик"), "devices": ("📱 ИЗМЕНЕНИЕ УСТРОЙСТВ", "количество устройств"), - "servers": ("🌐 ИЗМЕНЕНИЕ СЕРВЕРОВ", "серверы") + "servers": ("🌐 ИЗМЕНЕНИЕ СЕРВЕРОВ", "серверы"), + "modem": ("📡 ИЗМЕНЕНИЕ МОДЕМА", "модем") } title, param_name = update_types.get(update_type, ("⚙️ ИЗМЕНЕНИЕ ПОДПИСКИ", "параметры")) @@ -1449,6 +1450,8 @@ class AdminNotificationService: if isinstance(value, list): return f"{len(value)} серверов" return str(value) + elif update_type == "modem": + return "✅ Включён" if value else "❌ Выключен" return str(value) async def send_bulk_ban_notification(