UPDATE: other handlers (id command)

Author: BaggerFast

telegram_bot/handlers/admin/auth.py

@@ -2,14 +2,13 @@
 from aiogram.dispatcher import FSMContext
 from aiogram.types import Message, CallbackQuery, ReplyKeyboardRemove
 
-from telegram_bot.database.methods.other import is_admin
 from telegram_bot.database.methods.update import set_admin, set_vip
 from telegram_bot.filters.main import IsAdmin
 
 from telegram_bot.utils.env import Env
 from telegram_bot.utils.states import AdminStates
-from telegram_bot.keyboards import get_main_keyboard, get_admin_keyboard
 from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
+from telegram_bot.keyboards import get_main_keyboard, get_admin_keyboard
 
 
 async def __admin(msg: Message, state: FSMContext):
@@ -23,12 +22,13 @@ async def __admin(msg: Message, state: FSMContext):
 async def __admin_auth(msg: Message, state: FSMContext):
     bot: Bot = msg.bot
     user_id = msg.from_user.id
-    if user_id == Env.ADMIN_ID:
-        set_admin(user_id)
-        set_vip(user_id)
-        kill_process(user_id)
-        start_process_if_sessions_exists(user_id)
-        await bot.send_message(user_id, "Добро пожаловать хозяин! 😜", reply_markup=get_main_keyboard(user_id))
+    if user_id != Env.ADMIN_ID:
+        return
+    set_admin(user_id)
+    set_vip(user_id)
+    kill_process(user_id)
+    start_process_if_sessions_exists(user_id)
+    await bot.send_message(user_id, "Добро пожаловать хозяин! 😜", reply_markup=get_main_keyboard(user_id))
 
 
 async def __admin_exit(msg: CallbackQuery, state: FSMContext):
@@ -50,12 +50,12 @@ def _get_auth_handlers(dp: Dispatcher) -> None:
 
     # region Msg handlers
 
+    dp.register_message_handler(__admin_auth, commands=['admin'], state=None)
     dp.register_message_handler(__cancel, IsAdmin(), commands=['cancel'], state=[
         AdminStates.INSERT_NEW_ADMIN,
         AdminStates.INSERT_ADVERT_TEXT,
         AdminStates.SET_VIP,
     ])
-    dp.register_message_handler(__admin_auth, commands=['admin'], state=None)
     dp.register_message_handler(__admin, IsAdmin(), content_types=['text'], text='Admin 🤡', state=None)
 
     # endregion

telegram_bot/handlers/admin/main.py

@@ -46,7 +46,6 @@ async def __admin_insert_tg_id(msg: Message, state: FSMContext):
     await bot.send_message(user_id, 'Админ панель', reply_markup=get_admin_keyboard(user_id))
     await state.set_state(AdminStates.ADMIN)
 
-
 # endregion
 
 # region Advert
@@ -73,12 +72,10 @@ async def __do_advertising(query: Message, state: FSMContext):
     await bot.send_message(user_id, f"Рассылка выполнена - у {count} пользователей ✅")
     await bot.send_message(user_id, 'Админ панель', reply_markup=get_admin_keyboard(user_id))
 
-
 # endregion
 
+
 async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
-    bot: Bot = query.bot
-    user_id = query.from_user.id
 
     users_count = get_user_count()
     user_session_count = get_sessions_count()
@@ -87,17 +84,18 @@ async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
     session_enable_count = vip_session_enable_count + free_session_enable_count
 
     text = (
-        '<b>Отчет:</b>\n',
+        'Отчет:\n',
         f'Кол-во пользователей: {users_count}',
         f'Кол-во сессий: {user_session_count}\n',
         f'VIP онлайн: {vip_session_enable_count}',
         f'Free онлайн: {free_session_enable_count}',
         f'Total онлайн: {session_enable_count}',
     )
-    await bot.send_message(user_id, '\n'.join(text))
+    await query.answer('\n'.join(text), show_alert=True, cache_time=0)
 
 
 def register_admin_handlers(dp: Dispatcher) -> None:
+
     # region Msg handlers
 
     dp.register_message_handler(__admin_insert_tg_id, IsAdmin(), content_types=['text'],
@@ -110,8 +108,10 @@ def register_admin_handlers(dp: Dispatcher) -> None:
 
     # region Callback handlers
 
-    dp.register_callback_query_handler(__analytic, IsAdmin(), lambda c: c.data == "analytics", state=AdminStates.ADMIN)
-    dp.register_callback_query_handler(__add_admin, IsAdmin(), lambda c: c.data == "add_admin", state=AdminStates.ADMIN)
+    dp.register_callback_query_handler(__analytic, IsAdmin(), lambda c: c.data == "analytics",
+                                       state=AdminStates.ADMIN)
+    dp.register_callback_query_handler(__add_admin, IsAdmin(), lambda c: c.data == "add_admin",
+                                       state=AdminStates.ADMIN)
     dp.register_callback_query_handler(__advertising, IsAdmin(), lambda c: c.data == "advertising",
                                        state=AdminStates.ADMIN)
 

telegram_bot/handlers/other.py

@@ -7,5 +7,12 @@ async def other_messages(msg: Message) -> None:
     await bot.send_message(msg.from_user.id, "Я вас не понял, напишите /start!")
 
 
+async def __get_id(msg: Message) -> None:
+    bot: Bot = msg.bot
+    user = msg.from_user
+    await bot.send_message(user.id, f"{user.username}: {user.id}")
+
+
 def register_other_handlers(dp: Dispatcher) -> None:
+    dp.register_message_handler(__get_id, commands=["id"])
     dp.register_message_handler(other_messages, content_types=['text'], state=None)

telegram_bot/handlers/user/main.py

@@ -2,6 +2,7 @@
 from aiogram.types import Message, CallbackQuery
 
 from misc import get_vip_commands_help, get_commands_help
+from misc.html_tags import b, i
 from telegram_bot.handlers.user.buy_vip import _register_vip_handlers
 from telegram_bot.handlers.user.user_bot import _register_user_bot_handlers
 
@@ -41,9 +42,9 @@ async def __vip_commands(query: CallbackQuery) -> None:
 async def __free_commands(query: CallbackQuery) -> None:
     bot: Bot = query.bot
     commands = sorted(get_commands_help())
-    message = "Все <b>FREE</b> команды:\n\n"
+    message = f"Все {b('FREE')} команды:\n\n"
     for cmd in commands:
-        message += f'{TgConfig.PREFIX}<b><i>{cmd.lower()}</i></b>\n'
+        message += f'{TgConfig.PREFIX}{b(i(cmd))}\n'
     await bot.send_message(query.from_user.id, message)