Refactor notification service and enhance user management features

- Replaced legacy payment notification functions with a new NotificationService for improved code organization and maintainability. - Updated user management handlers to utilize the new notification system for payment confirmations. - Enhanced user card formatting with localized labels for better clarity and user experience. - Introduced context management for the PanelApiService to ensure proper session handling. - Updated localization files to include new labels and messages for user management and notifications.
2025-08-03 18:58:50 +03:00
parent 973e97c54e
commit aa97618165
12 changed files with 215 additions and 145 deletions
@@ -142,56 +142,53 @@ async def show_statistics_handler(callback: types.CallbackQuery,
    stats_text_parts.append(f"\n<b>🖥 {_('admin_panel_stats_header', default='Статистика панели')}</b>")
    
    try:
-        panel_service = PanelApiService(settings)
-        
-        # Get panel system statistics
-        logging.info("Fetching panel statistics...")
-        panel_stats = await panel_service.get_panel_statistics()
-        nodes_stats = await panel_service.get_nodes_statistics()
-        online_count = await panel_service.get_online_users_count()
-        users_activity = await panel_service.get_users_activity_stats()
-        
-        logging.info(f"Panel stats response: panel_stats={panel_stats}, nodes_stats={nodes_stats}, online_count={online_count}, users_activity={users_activity}")
-        
-        # Online users
-        if online_count is not None:
-            stats_text_parts.append(f"🟢 Онлайн сейчас: <b>{online_count}</b>")
-        else:
-            stats_text_parts.append(f"🟢 Онлайн сейчас: <b>N/A</b>")
-        
-        # Users activity
-        if users_activity:
-            today_connected = users_activity.get('today_connected', 'N/A')
-            week_connected = users_activity.get('week_connected', 'N/A')
-            never_connected = users_activity.get('never_connected', 'N/A')
-            stats_text_parts.append(f"📅 Подключались сегодня: <b>{today_connected}</b>")
-            stats_text_parts.append(f"📅 Подключались за неделю: <b>{week_connected}</b>")
-            stats_text_parts.append(f"❌ Никогда не подключались: <b>{never_connected}</b>")
-        else:
-            stats_text_parts.append(f"📅 Активность пользователей: <b>N/A</b>")
-        
-        # Nodes statistics
-        if nodes_stats:
-            active_nodes = len([node for node in nodes_stats if node.get('status') == 'active'])
-            total_nodes = len(nodes_stats)
-            stats_text_parts.append(f"🔗 Активных нод: <b>{active_nodes}/{total_nodes}</b>")
-        else:
-            stats_text_parts.append(f"🔗 Ноды: <b>N/A</b>")
-        
-        # System statistics
-        if panel_stats:
-            system_info = panel_stats.get('system', {})
-            if system_info:
-                memory_usage = system_info.get('memory_usage_percent', 'N/A')
-                cpu_usage = system_info.get('cpu_usage_percent', 'N/A')
-                stats_text_parts.append(f"💾 Использование RAM: <b>{memory_usage}%</b>")
-                stats_text_parts.append(f"🔄 Загрузка CPU: <b>{cpu_usage}%</b>")
+        async with PanelApiService(settings) as panel_service:
+            # Get panel system statistics
+            logging.info("Fetching panel statistics...")
+            panel_stats = await panel_service.get_panel_statistics()
+            nodes_stats = await panel_service.get_nodes_statistics()
+            online_count = await panel_service.get_online_users_count()
+            users_activity = await panel_service.get_users_activity_stats()
+            
+            logging.info(f"Panel stats response: panel_stats={panel_stats}, nodes_stats={nodes_stats}, online_count={online_count}, users_activity={users_activity}")
+            
+            # Online users
+            if online_count is not None:
+                stats_text_parts.append(f"🟢 Онлайн сейчас: <b>{online_count}</b>")
            else:
-                stats_text_parts.append(f"💾 Системная информация: <b>N/A</b>")
-        else:
-            stats_text_parts.append(f"💾 Системная статистика: <b>N/A</b>")
-        
-        await panel_service.close()
+                stats_text_parts.append(f"🟢 Онлайн сейчас: <b>N/A</b>")
+            
+            # Users activity
+            if users_activity:
+                today_connected = users_activity.get('today_connected', 'N/A')
+                week_connected = users_activity.get('week_connected', 'N/A')
+                never_connected = users_activity.get('never_connected', 'N/A')
+                stats_text_parts.append(f"📅 Подключались сегодня: <b>{today_connected}</b>")
+                stats_text_parts.append(f"📅 Подключались за неделю: <b>{week_connected}</b>")
+                stats_text_parts.append(f"❌ Никогда не подключались: <b>{never_connected}</b>")
+            else:
+                stats_text_parts.append(f"📅 Активность пользователей: <b>N/A</b>")
+            
+            # Nodes statistics
+            if nodes_stats:
+                active_nodes = len([node for node in nodes_stats if node.get('status') == 'active'])
+                total_nodes = len(nodes_stats)
+                stats_text_parts.append(f"🔗 Активных нод: <b>{active_nodes}/{total_nodes}</b>")
+            else:
+                stats_text_parts.append(f"🔗 Ноды: <b>N/A</b>")
+            
+            # System statistics
+            if panel_stats:
+                system_info = panel_stats.get('system', {})
+                if system_info:
+                    memory_usage = system_info.get('memory_usage_percent', 'N/A')
+                    cpu_usage = system_info.get('cpu_usage_percent', 'N/A')
+                    stats_text_parts.append(f"💾 Использование RAM: <b>{memory_usage}%</b>")
+                    stats_text_parts.append(f"🔄 Загрузка CPU: <b>{cpu_usage}%</b>")
+                else:
+                    stats_text_parts.append(f"💾 Системная информация: <b>N/A</b>")
+            else:
+                stats_text_parts.append(f"💾 Системная статистика: <b>N/A</b>")
        
    except Exception as e:
        logging.error(f"Failed to fetch panel statistics: {e}", exc_info=True)