From 73fbc223245bcba4c155e63da76716bdb54be753 Mon Sep 17 00:00:00 2001 From: Vladless Date: Sat, 1 Feb 2025 19:15:47 +0300 Subject: [PATCH] fix coupons error --- handlers/admin/admin_coupons.py | 10 +- handlers/admin/admin_user_editor.py | 592 ---------------------------- 2 files changed, 9 insertions(+), 593 deletions(-) delete mode 100644 handlers/admin/admin_user_editor.py diff --git a/handlers/admin/admin_coupons.py b/handlers/admin/admin_coupons.py index 559f336e..77f45797 100644 --- a/handlers/admin/admin_coupons.py +++ b/handlers/admin/admin_coupons.py @@ -101,7 +101,15 @@ async def handle_coupon_data_input(message: Message, state: FSMContext, session: ) async def handle_coupons_list(callback_query: CallbackQuery, session: Any): try: - page = int(callback_query.data.split(":")[1]) if ":" in callback_query.data else 1 + if ":" in callback_query.data: + parts = callback_query.data.split(":") + if len(parts) > 1 and parts[1].isdigit(): + page = int(parts[1]) + else: + page = 1 + else: + page = 1 + per_page = 10 result = await get_all_coupons(session, page, per_page) coupons = result["coupons"] diff --git a/handlers/admin/admin_user_editor.py b/handlers/admin/admin_user_editor.py deleted file mode 100644 index 37026123..00000000 --- a/handlers/admin/admin_user_editor.py +++ /dev/null @@ -1,592 +0,0 @@ -import asyncio -from datetime import datetime -from typing import Any - -import pytz -from aiogram import Bot, F, Router, types -from aiogram.fsm.context import FSMContext -from aiogram.fsm.state import State, StatesGroup -from aiogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup, Message -from aiogram.utils.keyboard import InlineKeyboardBuilder - -from config import TOTAL_GB -from database import ( - delete_key, - delete_user_data, - get_client_id_by_email, - get_key_details, - get_keys, - get_servers, - update_key_expiry, - update_trial, -) -from filters.admin import IsAdminFilter -from handlers.keys.key_utils import ( - delete_key_from_cluster, - renew_key_in_cluster, -) -from handlers.utils import sanitize_key_name -from logger import logger - -router = Router() - - -class UserEditorState(StatesGroup): - waiting_for_tg_id = State() - waiting_for_username = State() - displaying_user_info = State() - waiting_for_new_balance = State() - waiting_for_key_name = State() - waiting_for_expiry_time = State() - waiting_for_message_text = State() - - -@router.callback_query(F.data == "search_by_tg_id", IsAdminFilter()) -async def prompt_tg_id(callback_query: CallbackQuery, state: FSMContext): - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer("🔍 Введите Telegram ID клиента:", reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.waiting_for_tg_id) - - -@router.callback_query(F.data == "search_by_username", IsAdminFilter()) -async def prompt_username(callback_query: CallbackQuery, state: FSMContext): - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer("🔍 Введите Username клиента:", reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.waiting_for_username) - - -@router.message(UserEditorState.waiting_for_username, IsAdminFilter()) -async def handle_username_input(message: Message, state: FSMContext, session: Any): - username = message.text.strip().lstrip("@").replace("https://t.me/", "") - user_record = await session.fetchrow("SELECT tg_id FROM users WHERE username = $1", username) - - if not user_record: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "🔍 Пользователь с указанным username не найден. 🚫", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - tg_id = int(user_record["tg_id"]) - username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id) - balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id) - key_records = await get_keys(tg_id, session) - referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id) - - if balance is None: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "🚫 Пользователь с указанным tg_id не найден. 🔍", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - builder = InlineKeyboardBuilder() - - for key in key_records: - builder.row(InlineKeyboardButton(text=f"🔑 {key['email']}", callback_data=f"edit_key_{key['email']}")) - - builder.row( - InlineKeyboardButton( - text="📝 Изменить баланс", - callback_data=f"change_balance_{tg_id}", - ) - ) - - builder.row( - InlineKeyboardButton( - text="🔄 Восстановить пробник", - callback_data=f"restore_trial_{tg_id}", - ) - ) - builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}")) - builder.row(InlineKeyboardButton(text="🔄 Обновить клиента", callback_data=f"user_info|{tg_id}")) - builder.row(InlineKeyboardButton(text="✉️ Отправить сообщение", callback_data=f"send_message_{tg_id}")) - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - - user_info = ( - f"📊 Информация о пользователе:\n\n" - f"🆔 ID пользователя: {tg_id}\n" - f"👤 Логин пользователя: @{username}\n" - f"💰 Баланс: {balance}\n" - f"👥 Количество рефералов: {referral_count}\n" - f"🔑 Ключи (для редактирования нажмите на ключ):" - ) - await message.answer(user_info, reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.displaying_user_info) - - -@router.callback_query(F.data.startswith("send_message_")) -async def handle_send_message(callback_query: CallbackQuery, state: FSMContext): - tg_id = callback_query.data.split("_")[2] - await state.update_data(target_tg_id=tg_id) - await callback_query.message.answer("✉️ Введите текст сообщения, которое вы хотите отправить пользователю.") - await state.set_state(UserEditorState.waiting_for_message_text) - - -@router.message(UserEditorState.waiting_for_message_text, IsAdminFilter()) -async def process_send_message(message: Message, state: FSMContext, bot: Bot): - data = await state.get_data() - target_tg_id = data.get("target_tg_id") - - if not target_tg_id: - await message.answer("🚫 Ошибка: ID пользователя не найден.") - await state.clear() - return - - try: - await bot.send_message(chat_id=target_tg_id, text=message.text) - await message.answer("✅ Сообщение успешно отправлено.") - except Exception as e: - await message.answer(f"❌ Не удалось отправить сообщение: {e}") - - await state.clear() - - -@router.message(UserEditorState.waiting_for_tg_id, F.text.isdigit(), IsAdminFilter()) -async def handle_tg_id_input(message: Message, state: FSMContext, session: Any): - tg_id = int(message.text) - username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id) - balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id) - key_records = await get_keys(tg_id, session) - referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id) - - if balance is None: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "❌ Пользователь с указанным tg_id не найден. 🔍", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - builder = InlineKeyboardBuilder() - - for key in key_records: - builder.row(InlineKeyboardButton(text=f"🔑 {key['email']}", callback_data=f"edit_key_{key['email']}")) - - builder.row( - InlineKeyboardButton( - text="📝 Изменить баланс", - callback_data=f"change_balance_{tg_id}", - ) - ) - builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}")) - builder.row(InlineKeyboardButton(text="🔄 Обновить клиента", callback_data=f"user_info|{tg_id}")) - builder.row( - InlineKeyboardButton( - text="🔄 Восстановить пробник", - callback_data=f"restore_trial_{tg_id}", - ) - ) - builder.row(InlineKeyboardButton(text="✉️ Отправить сообщение", callback_data=f"send_message_{tg_id}")) - - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - - user_info = ( - f"📊 Информация о пользователе:\n\n" - f"🆔 ID пользователя: {tg_id}\n" - f"👤 Логин пользователя: @{username}\n" - f"💰 Баланс: {balance}\n" - f"👥 Количество рефералов: {referral_count}\n" - f"🔑 Ключи (для редактирования нажмите на ключ):" - ) - await message.answer(user_info, reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.displaying_user_info) - - -@router.callback_query(F.data.startswith("restore_trial_"), IsAdminFilter()) -async def handle_restore_trial(callback_query: CallbackQuery, session: Any): - tg_id = int(callback_query.data.split("_")[2]) - - await update_trial(tg_id, 0, session) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад в меню администратора", callback_data="admin")) - - await callback_query.message.answer("✅ Триал успешно восстановлен.", reply_markup=builder.as_markup()) - - -@router.callback_query(F.data.startswith("change_balance_"), IsAdminFilter()) -async def process_balance_change(callback_query: CallbackQuery, state: FSMContext): - tg_id = int(callback_query.data.split("_")[2]) - await state.update_data(tg_id=tg_id) - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer("💸 Введите новую сумму баланса:", reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.waiting_for_new_balance) - - -@router.message(UserEditorState.waiting_for_new_balance, IsAdminFilter()) -async def handle_new_balance_input(message: Message, state: FSMContext, session: Any): - if not message.text.isdigit() or int(message.text) < 0: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "❌ Пожалуйста, введите корректную сумму для изменения баланса.", - reply_markup=builder.as_markup(), - ) - return - - new_balance = int(message.text) - user_data = await state.get_data() - tg_id = user_data.get("tg_id") - - await session.execute( - "UPDATE connections SET balance = $1 WHERE tg_id = $2", - new_balance, - tg_id, - ) - - response_message = f"✅ Баланс успешно изменен на {new_balance}." - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton( - text="⬅️ Назад в меню администратора", - callback_data="admin", - ) - ) - await message.answer(response_message, reply_markup=builder.as_markup()) - await state.clear() - - -@router.callback_query(F.data.startswith("edit_key_"), IsAdminFilter()) -async def process_key_edit(callback_query: CallbackQuery, session: Any): - email = callback_query.data.split("_", 2)[2] - key_details = await get_key_details(email, session) - - if not key_details: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer( - "🔍 Информация о ключе не найдена. 🚫", - reply_markup=builder.as_markup(), - ) - return - - response_message = ( - f"🔑 Ключ: {key_details['key']}\n" - f"⏰ Дата истечения: {key_details['expiry_date']}\n" - f"💰 Баланс пользователя: {key_details['balance']}\n" - f"🌐 Кластер: {key_details['server_name']}" - ) - - builder = InlineKeyboardBuilder() - builder.row( - InlineKeyboardButton( - text="ℹ️ Получить информацию о юзере", - callback_data=f"user_info|{key_details['tg_id']}", - ) - ) - builder.row( - InlineKeyboardButton( - text="⏳ Изменить время истечения", - callback_data=f"change_expiry|{email}", - ) - ) - builder.row( - InlineKeyboardButton( - text="❌ Удалить ключ", - callback_data=f"delete_key_admin|{email}", - ) - ) - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - - await callback_query.message.answer(response_message, reply_markup=builder.as_markup()) - - -@router.callback_query(F.data == "search_by_key_name", IsAdminFilter()) -async def prompt_key_name(callback_query: CallbackQuery, state: FSMContext): - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer("🔑 Введите имя ключа:", reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.waiting_for_key_name) - - -@router.message(UserEditorState.waiting_for_key_name, IsAdminFilter()) -async def handle_key_name_input(message: Message, state: FSMContext, session: Any): - key_name = sanitize_key_name(message.text) - key_details = await get_key_details(key_name, session) - - if not key_details: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "🚫 Пользователь с указанным именем ключа не найден.", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - response_message = ( - f"🔑 Ключ: {key_details['key']}\n" - f"⏰ Дата истечения: {key_details['expiry_date']}\n" - f"💰 Баланс пользователя: {key_details['balance']}\n" - f"🌐 Сервер: {key_details['server_name']}" - ) - - key_buttons = InlineKeyboardBuilder() - key_buttons.row( - InlineKeyboardButton( - text="ℹ️ Получить информацию о юзере", - callback_data=f"user_info|{key_details['tg_id']}", - ) - ) - key_buttons.row( - InlineKeyboardButton( - text="⏳ Изменить время истечения", - callback_data=f"change_expiry|{key_name}", - ) - ) - key_buttons.row( - InlineKeyboardButton( - text="❌ Удалить ключ", - callback_data=f"delete_key_admin|{key_name}", - ) - ) - key_buttons.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - - await message.answer(response_message, reply_markup=key_buttons.as_markup()) - await state.clear() - - -@router.callback_query(F.data.startswith("change_expiry|"), IsAdminFilter()) -async def prompt_expiry_change(callback_query: CallbackQuery, state: FSMContext): - email = callback_query.data.split("|")[1] - await callback_query.message.answer( - f"⏳ Введите новое время истечения для ключа {email} в формате YYYY-MM-DD HH:MM:SS:" - ) - await state.update_data(email=email) - await state.set_state(UserEditorState.waiting_for_expiry_time) - - -@router.message(UserEditorState.waiting_for_expiry_time, IsAdminFilter()) -async def handle_expiry_time_input(message: Message, state: FSMContext, session: Any): - user_data = await state.get_data() - email = user_data.get("email") - - if not email: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer("📧 Email не найден в состоянии. 🚫", reply_markup=builder.as_markup()) - await state.clear() - return - - try: - expiry_time_str = message.text - moscow_tz = pytz.timezone("Europe/Moscow") - expiry_time = int( - datetime.strptime(expiry_time_str, "%Y-%m-%d %H:%M:%S").replace(tzinfo=moscow_tz).timestamp() * 1000 - ) - - client_id = await get_client_id_by_email(email) - if client_id is None: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - f"🚫 Клиент с email {email} не найден. 🔍", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - record = await get_key_details(email, session) - if not record: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "🚫 Клиент не найден в базе данных. 🔍", - reply_markup=builder.as_markup(), - ) - await state.clear() - return - - clusters = await get_servers(session) - - async def update_key_on_all_servers(): - tasks = [] - for cluster_name, cluster_servers in clusters.items(): - for _server in cluster_servers: - tasks.append( - asyncio.create_task( - renew_key_in_cluster( - cluster_name, - email, - client_id, - expiry_time, - total_gb=TOTAL_GB, - ) - ) - ) - await asyncio.gather(*tasks) - - await update_key_on_all_servers() - - await update_key_expiry(client_id, expiry_time, session) - - response_message = ( - f"✅ Время истечения ключа для клиента {client_id} ({email}) успешно обновлено на всех серверах." - ) - - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="admin")) - await message.answer(response_message, reply_markup=builder.as_markup()) - except ValueError: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await message.answer( - "❌ Пожалуйста, используйте формат: YYYY-MM-DD HH:MM:SS.", - reply_markup=builder.as_markup(), - ) - except Exception as e: - logger.error(e) - await state.clear() - - -@router.callback_query(F.data.startswith("delete_key_admin|"), IsAdminFilter()) -async def process_callback_delete_key(callback_query: CallbackQuery, session: Any): - email = callback_query.data.split("|")[1] - key_details = await get_key_details(email, session) - - if key_details is None: - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - await callback_query.message.answer("🔍 Ключ не найден. 🚫", reply_markup=builder.as_markup()) - return - - builder = InlineKeyboardBuilder() - builder.row( - types.InlineKeyboardButton( - text="✅ Да, удалить", - callback_data=f"confirm_delete_admin|{key_details['client_id']}", - ) - ) - builder.row(types.InlineKeyboardButton(text="❌ Нет, отменить", callback_data="user_editor")) - await callback_query.message.answer( - "❓ Вы уверены, что хотите удалить ключ?", - reply_markup=builder.as_markup(), - ) - - -@router.callback_query(F.data.startswith("confirm_delete_admin|"), IsAdminFilter()) -async def process_callback_confirm_delete(callback_query: CallbackQuery, session: Any): - client_id = callback_query.data.split("|")[1] - record = await session.fetchrow("SELECT email FROM keys WHERE client_id = $1", client_id) - - if record: - email = record["email"] - response_message = "✅ Ключ успешно удален." - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys")) - - clusters = await get_servers(session) - - async def delete_key_from_servers(email, client_id): - tasks = [] - for cluster_name, cluster_servers in clusters.items(): - for _server in cluster_servers: - tasks.append(delete_key_from_cluster(cluster_name, email, client_id)) - await asyncio.gather(*tasks) - - await delete_key_from_servers(email, client_id) - await delete_key(client_id, session) - - await callback_query.message.answer(response_message, reply_markup=builder.as_markup()) - else: - response_message = "🚫 Ключ не найден или уже удален." - builder = InlineKeyboardBuilder() - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="view_keys")) - await callback_query.message.answer(response_message, reply_markup=builder.as_markup()) - - -@router.callback_query(F.data.startswith("user_info|"), IsAdminFilter()) -async def handle_user_info(callback_query: CallbackQuery, state: FSMContext, session: Any): - tg_id = int(callback_query.data.split("|")[1]) - username = await session.fetchval("SELECT username FROM users WHERE tg_id = $1", tg_id) - balance = await session.fetchval("SELECT balance FROM connections WHERE tg_id = $1", tg_id) - key_records = await get_keys(tg_id, session) - referral_count = await session.fetchval("SELECT COUNT(*) FROM referrals WHERE referrer_tg_id = $1", tg_id) - - builder = InlineKeyboardBuilder() - - for key in key_records: - builder.row(InlineKeyboardButton(text=f"🔑 {key['email']}", callback_data=f"edit_key_{key['email']}")) - - builder.row(InlineKeyboardButton(text="📝 Изменить баланс", callback_data=f"change_balance_{tg_id}")) - builder.row(InlineKeyboardButton(text="🔄 Восстановить пробник", callback_data=f"restore_trial_{tg_id}")) - builder.row(InlineKeyboardButton(text="❌ Удалить клиента", callback_data=f"confirm_delete_user_{tg_id}")) - builder.row(InlineKeyboardButton(text="🔄 Обновить клиента", callback_data=f"user_info|{tg_id}")) - builder.row(InlineKeyboardButton(text="✉️ Отправить сообщение", callback_data=f"send_message_{tg_id}")) - builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor")) - - user_info = ( - f"📊 Информация о пользователе:\n\n" - f"🆔 ID пользователя: {tg_id}\n" - f"👤 Логин пользователя: @{username}\n" - f"💰 Баланс: {balance}\n" - f"👥 Количество рефералов: {referral_count}\n" - f"🔑 Ключи (для редактирования нажмите на ключ):" - ) - - await callback_query.message.answer(user_info, reply_markup=builder.as_markup()) - await state.set_state(UserEditorState.displaying_user_info) - - -@router.callback_query(F.data.startswith("confirm_delete_user_"), IsAdminFilter()) -async def confirm_delete_user(callback_query: CallbackQuery, state: FSMContext, session: Any): - tg_id = int(callback_query.data.split("_")[3]) - - confirmation_markup = InlineKeyboardMarkup( - row_width=2, - inline_keyboard=[ - [InlineKeyboardButton(text="✅ Подтвердить", callback_data=f"delete_user_{tg_id}")], - [InlineKeyboardButton(text="❌ Отменить", callback_data="user_editor")], - ], - ) - - await callback_query.message.answer( - f"Вы уверены, что хотите удалить пользователя с ID {tg_id}?", - reply_markup=confirmation_markup, - ) - - -@router.callback_query(F.data.startswith("delete_user_"), IsAdminFilter()) -async def delete_user(callback_query: CallbackQuery, session: Any): - tg_id = int(callback_query.data.split("_")[2]) - - key_records = await session.fetch("SELECT email, client_id FROM keys WHERE tg_id = $1", tg_id) - - async def delete_keys_from_servers(): - try: - tasks = [] - for email, client_id in key_records: - servers = await get_servers(session) - for cluster_id, _cluster in servers.items(): - tasks.append(delete_key_from_cluster(cluster_id, email, client_id)) - await asyncio.gather(*tasks) - except Exception as e: - logger.error(f"Ошибка при удалении ключей с серверов для пользователя {tg_id}: {e}") - - await delete_keys_from_servers() - - try: - await delete_user_data(session, tg_id) - - back_button = InlineKeyboardButton(text="⬅️ Назад", callback_data="user_editor") - keyboard = InlineKeyboardMarkup(inline_keyboard=[[back_button]]) - - await callback_query.message.answer(f"🗑️ Пользователь с ID {tg_id} был удален.", reply_markup=keyboard) - except Exception as e: - logger.error(f"Ошибка при удалении данных из базы данных для пользователя {tg_id}: {e}") - await callback_query.message.answer( - f"❌ Произошла ошибка при удалении пользователя с ID {tg_id}. Попробуйте снова." - )