From 80f2314c9e0c381bd8d940dd83529eae8ac6a183 Mon Sep 17 00:00:00 2001
From: Zakhar Izmaylov <ptdev@kedruss.ru>
Date: Tue, 26 Nov 2024 03:21:43 +0300
Subject: [PATCH] Fix start

---
 handlers/admin/admin_user_editor.py |  8 ++++++--
 handlers/notifications.py           |  1 +
 middlewares/delete.py               | 11 ++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/handlers/admin/admin_user_editor.py b/handlers/admin/admin_user_editor.py
index 4e758f2d..a9605053 100644
--- a/handlers/admin/admin_user_editor.py
+++ b/handlers/admin/admin_user_editor.py
@@ -29,13 +29,17 @@ class UserEditorState(StatesGroup):
 
 @router.callback_query(F.data == "search_by_tg_id", IsAdminFilter())
 async def prompt_tg_id(callback_query: CallbackQuery, state: FSMContext):
-    await callback_query.message.answer("🔍 Введите Telegram ID клиента:")
+    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):
-    await callback_query.message.answer("🔍 Введите Username клиента:")
+    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)
 
 
diff --git a/handlers/notifications.py b/handlers/notifications.py
index c83a8c6b..42e11761 100644
--- a/handlers/notifications.py
+++ b/handlers/notifications.py
@@ -328,6 +328,7 @@ async def process_key(record, bot, conn):
                         password=ADMIN_PASSWORD,
                     )
                     await delete_client(xui, email, client_id)
+                    # await xui.client.delete_depleted(-1)
             await delete_key(client_id)
     except Exception as e:
         logger.error(f"Ошибка при обработке ключа для клиента {tg_id}: {e}")
diff --git a/middlewares/delete.py b/middlewares/delete.py
index e3911cf8..ae3d7198 100644
--- a/middlewares/delete.py
+++ b/middlewares/delete.py
@@ -13,11 +13,12 @@ class DeleteMessageMiddleware(BaseMiddleware):
     ) -> Any:
         if isinstance(event, (Message, CallbackQuery)):
             if isinstance(event, Message):
-                try:
-                    await event.bot.delete_message(event.chat.id, event.message_id - 1)
-                except Exception:
-                    pass
-                await event.delete()
+                if not event.entities[0].type == "bot_command" and event.text == "/start":
+                    try:
+                        await event.bot.delete_message(event.chat.id, event.message_id - 1)
+                    except Exception:
+                        pass
+                    await event.delete()
             elif isinstance(event, CallbackQuery):
                 await event.answer()
                 await event.message.delete()