UPDATE: some ui in commands

Author: BaggerFast

misc/path.py

@@ -1,8 +1,9 @@
 import os
+from abc import ABC
 from typing import Final
 
 
-class PathManager:
+class PathManager(ABC):
     ROOT: Final = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
     @classmethod

telegram_bot/handlers/__init__.py

@@ -1,3 +1 @@
-from .user import register_users_handlers
-from .admin import register_admin_handlers
-from .other import register_other_handlers
+from .main import register_all_handlers

telegram_bot/handlers/admin/auth.py

@@ -46,12 +46,21 @@ async def __cancel(msg: Message, state: FSMContext):
 
 
 def _get_auth_handlers(dp: Dispatcher) -> None:
+
+    # region Msg handlers
+
     dp.register_message_handler(__cancel, 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, content_types=['text'], text='Admin 🤡', state=None)
+
+    # endregion
+
+    # region Callback handlers
+
     dp.register_callback_query_handler(__admin_exit, lambda c: c.data == "admin_exit", state=AdminStates.ADMIN)
 
+    # endregion

telegram_bot/handlers/admin/main.py

@@ -72,8 +72,6 @@ async def __do_advertising(query: Message, state: FSMContext):
 
 # endregion
 
-# region Analytics
-
 async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
     bot: Bot = query.bot
     user_id = query.from_user.id
@@ -95,17 +93,23 @@ async def __analytic(query: CallbackQuery, state: FSMContext) -> None:
     await bot.send_message(user_id, '\n'.join(text))
 
 
-# endregion
-
-
 def register_admin_handlers(dp: Dispatcher) -> None:
-    _get_auth_handlers(dp)
-    _get_vip_handlers(dp)
 
-    dp.register_callback_query_handler(__add_admin, lambda c: c.data == "add_admin", state=AdminStates.ADMIN)
+    # region Msg handlers
+
     dp.register_message_handler(__admin_insert_tg_id, content_types=['text'], state=AdminStates.INSERT_NEW_ADMIN)
 
-    dp.register_callback_query_handler(__advertising, lambda c: c.data == "advertising", state=AdminStates.ADMIN)
     dp.register_message_handler(__do_advertising, content_types=['text'], state=AdminStates.INSERT_ADVERT_TEXT)
 
+    # endregion
+
+    # region Callback handlers
+
     dp.register_callback_query_handler(__analytic, lambda c: c.data == "analytics", state=AdminStates.ADMIN)
+    dp.register_callback_query_handler(__add_admin, lambda c: c.data == "add_admin", state=AdminStates.ADMIN)
+    dp.register_callback_query_handler(__advertising, lambda c: c.data == "advertising", state=AdminStates.ADMIN)
+
+    # endregion
+
+    _get_auth_handlers(dp)
+    _get_vip_handlers(dp)

telegram_bot/handlers/admin/vip.py

@@ -1,8 +1,7 @@
-import loguru
+from loguru import logger
 from aiogram import Dispatcher, Bot
 from aiogram.dispatcher import FSMContext
 from aiogram.types import Message, CallbackQuery
-
 from telegram_bot.database.methods.other import switch_vip
 from telegram_bot.database.methods.update import set_vip
 from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists, check_process
@@ -38,14 +37,25 @@ async def __vip_insert_tg_id(msg: Message, state: FSMContext):
         await bot.send_message(other_user_id, "Администратор выдал вам vip доступ. ✨",
                                reply_markup=get_main_keyboard(other_user_id))
         await bot.send_message(user_id, "Успешно: выдан VIP доступ ✅")
-        loguru.logger.info(f'{other_user_id} got VIP access from {user_id}')
-    except Exception:
+        logger.info(f'{other_user_id} got VIP access from {user_id}')
+    except Exception as e:
+        logger.critical(e)
         await bot.send_message(user_id, "Произошел сбой ⚠️")
     await bot.send_message(user_id, 'Админ панель', reply_markup=get_admin_keyboard(user_id))
     await state.set_state(AdminStates.ADMIN)
 
 
 def _get_vip_handlers(dp: Dispatcher) -> None:
+
+    # region Msg handlers
+
+    dp.register_message_handler(__vip_insert_tg_id, content_types=['text'], state=AdminStates.SET_VIP)
+
+    # endregion
+
+    # region Callback handlers
+
     dp.register_callback_query_handler(__vip_switcher, lambda c: c.data == "vip_switcher", state=AdminStates.ADMIN)
     dp.register_callback_query_handler(__set_vip, lambda c: c.data == "give_vip", state=AdminStates.ADMIN)
-    dp.register_message_handler(__vip_insert_tg_id, content_types=['text'], state=AdminStates.SET_VIP)
+
+    # endregion

telegram_bot/handlers/main.py

@@ -0,0 +1,15 @@
+from aiogram import Dispatcher
+
+from telegram_bot.handlers.user import register_users_handlers
+from telegram_bot.handlers.admin import register_admin_handlers
+from telegram_bot.handlers.other import register_other_handlers
+
+
+def register_all_handlers(dp: Dispatcher) -> None:
+    handlers = (
+        register_admin_handlers,
+        register_users_handlers,
+        register_other_handlers
+    )
+    for handler in handlers:
+        handler(dp)

telegram_bot/handlers/other.py

@@ -2,7 +2,7 @@
 from aiogram.types import Message
 
 
-async def other_messages(msg: Message):
+async def other_messages(msg: Message) -> None:
     bot: Bot = msg.bot
     await bot.send_message(msg.from_user.id, "Я вас не понял, напишите /start!")
 

telegram_bot/handlers/user/buy_vip.py

@@ -1,10 +1,11 @@
 from aiogram import Dispatcher, Bot
-from aiogram.types import Message
+from aiogram.types import Message, CallbackQuery
 from yookassa import Payment
 from uuid import uuid4
 from telegram_bot.database.methods.create import create_user_payment
 from telegram_bot.database.methods.get import get_user_by_telegram_id
 from telegram_bot.database.methods.update import set_vip
+from telegram_bot.handlers.user.util import _buy_vip_text
 from telegram_bot.utils import TgConfig
 from telegram_bot.utils.process import kill_process, start_process_if_sessions_exists
 from telegram_bot.utils.util import get_main_keyboard, get_payment_keyboard, get_payment_info
@@ -28,16 +29,15 @@ async def __buy_vip(msg: Message) -> None:
         create_user_payment(user, payment.id)
     if payment.status != 'succeeded':
         keyboard = get_payment_keyboard(payment.confirmation.confirmation_url)
-        await bot.send_message(user_id, f'Вы приобретаете <b>VIP</b> доступ.\nК оплате <b>{TgConfig.PRICE}</b> рублей',
-                               reply_markup=keyboard)
+        await bot.send_message(user_id, _buy_vip_text(), reply_markup=keyboard)
     else:
         keyboard = get_payment_keyboard()
         await bot.send_message(user_id, '<b>VIP</b> доступ уже оплачен. Проверьте оплату', reply_markup=keyboard)
 
 
-async def __check_buy(msg: Message) -> None:
-    bot: Bot = msg.bot
-    user_id = msg.from_user.id
+async def __check_buy(query: CallbackQuery) -> None:
+    bot: Bot = query.bot
+    user_id = query.from_user.id
     user = get_user_by_telegram_id(user_id)
     payment = Payment.find_one(user.payment.key)
     if payment.status == 'succeeded':
@@ -46,9 +46,19 @@ async def __check_buy(msg: Message) -> None:
         start_process_if_sessions_exists(user_id)
         await bot.send_message(user_id, "Вы успешно оформили вип доступ!🥳\n", reply_markup=get_main_keyboard(user_id))
     else:
-        await bot.send_message(user_id, "Оплата еще не проведена!\n")
+        await query.answer("Оплата еще не проведена!\n")
 
 
 def _register_vip_handlers(dp: Dispatcher) -> None:
+
+    # region Msg handlers
+
     dp.register_message_handler(__buy_vip, content_types=['text'], text="Купить полную версию 💸")
+
+    # endregion
+
+    # region Callback handlers
+
     dp.register_callback_query_handler(__check_buy, lambda c: c.data == "check_payment")
+
+    # endregion

telegram_bot/handlers/user/main.py

@@ -20,17 +20,17 @@ async def __start(msg: Message) -> None:
                            parse_mode="HTML")
 
 
-async def __teh_support(msg: Message):
+async def __teh_support(msg: Message) -> None:
     bot: Bot = msg.bot
     await bot.send_message(msg.from_user.id, f"Если у вас возникли проблемы. Напишите нам - {TgConfig.HELPER_URL}")
 
 
-async def __help(msg: Message):
+async def __help(msg: Message) -> None:
     bot: Bot = msg.bot
-    await bot.send_message(msg.from_user.id, "Выберите категорию комманд:", reply_markup=KB_INFO)
+    await bot.send_message(msg.from_user.id, "Выберите категорию команд:", reply_markup=KB_INFO)
 
 
-async def __vip_commands(query: CallbackQuery):
+async def __vip_commands(query: CallbackQuery) -> None:
     bot: Bot = query.bot
     commands = sorted(get_vip_commands_help())
     message = "Все <b>VIP</b> команды:\n\n"
@@ -39,7 +39,7 @@ async def __vip_commands(query: CallbackQuery):
     await bot.send_message(query.from_user.id, message)
 
 
-async def __free_commands(query: CallbackQuery):
+async def __free_commands(query: CallbackQuery) -> None:
     bot: Bot = query.bot
     commands = sorted(get_commands_help())
     message = "Все <b>FREE</b> команды:\n\n"
@@ -49,10 +49,21 @@ async def __free_commands(query: CallbackQuery):
 
 
 def register_users_handlers(dp: Dispatcher) -> None:
+
+    # region Msg handlers
+
     dp.register_message_handler(__start, commands=["start"])
     dp.register_message_handler(__teh_support, content_types=["text"], text="Тех-поддержка ⚙")
     dp.register_message_handler(__help, content_types=['text'], text="Узнать команды 📌")
+
+    # endregion
+
+    # region Callback handlers
+
     dp.register_callback_query_handler(__vip_commands, lambda c: c.data == "vip_commands")
     dp.register_callback_query_handler(__free_commands, lambda c: c.data == "free_commands")
+
+    # endregion
+
     _register_vip_handlers(dp)
     _register_user_bot_handlers(dp)

telegram_bot/handlers/user/user_bot.py

@@ -15,39 +15,14 @@
 from telegram_bot.utils import Env, CreateUserBotState
 from telegram_bot.utils.util import get_main_keyboard
 from telegram_bot.keyboards import KB_CONTACT, KB_CANCEL_SETUP
+from .util import _user_agreement_text
 from ...utils.process import start_process_if_sessions_exists, check_process, kill_process
 
 __sessions: dict[int, Client] = {}
 
 
 # region with State
 
-async def __start_input_user_settings(msg: Message, state: FSMContext) -> None:
-    bot: Bot = msg.bot
-    user_id = msg.from_user.id
-
-    user = get_user_by_telegram_id(user_id)
-
-    if check_process(user_id):
-        keyboard = get_main_keyboard(user_id)
-        await bot.send_message(user_id, "Ваш бот уже запущен!", reply_markup=keyboard)
-        return
-    if user and user.session:
-        start_process_if_sessions_exists(user_id)
-        keyboard = get_main_keyboard(user_id)
-        await state.finish()
-        await bot.send_message(
-            user_id,
-            "Бот запущен! ✅\n",
-            reply_markup=keyboard
-        )
-        return
-
-    await bot.send_document(user_id, open(PathManager.get('UserAgreement.pdf'), 'rb'), reply_markup=KB_CONTACT)
-    await bot.send_message(user_id, "Отправляя контакт, вы соглашаетесь с пользовательским соглашением!️",
-                           reply_markup=KB_CANCEL_SETUP)
-    await state.set_state(CreateUserBotState.PHONE)
-
 
 async def __input_phone(msg: Message, state: FSMContext) -> None:
     bot: Bot = msg.bot
@@ -158,6 +133,32 @@ async def __input_2fa_password(msg: Message, state: FSMContext) -> None:
     await state.finish()
 
 
+async def __start_input_user_settings(msg: Message, state: FSMContext) -> None:
+    bot: Bot = msg.bot
+    user_id = msg.from_user.id
+
+    user = get_user_by_telegram_id(user_id)
+
+    if check_process(user_id):
+        keyboard = get_main_keyboard(user_id)
+        await bot.send_message(user_id, "Ваш бот уже запущен!", reply_markup=keyboard)
+        return
+    if user and user.session:
+        start_process_if_sessions_exists(user_id)
+        keyboard = get_main_keyboard(user_id)
+        await state.finish()
+        await bot.send_message(
+            user_id,
+            "Бот запущен! ✅\n",
+            reply_markup=keyboard
+        )
+        return
+    await bot.send_document(user_id, open(PathManager.get('UserAgreement.pdf'), 'rb'), reply_markup=KB_CONTACT)
+    await bot.send_message(user_id, _user_agreement_text(msg.from_user.first_name), reply_markup=KB_CANCEL_SETUP)
+
+    await state.set_state(CreateUserBotState.PHONE)
+
+
 async def __stop_register_user_bot(query: CallbackQuery, state: FSMContext) -> None:
     bot: Bot = query.bot
     user_id = query.from_user.id
@@ -188,7 +189,8 @@ async def __delete_session(msg: Message) -> None:
 
 
 def _register_user_bot_handlers(dp: Dispatcher) -> None:
-    dp.register_callback_query_handler(__stop_register_user_bot, lambda c: c.data == "cancel_setup", state="*")
+
+    # region Msg handlers
 
     dp.register_message_handler(__input_phone, content_types=[types.ContentType.CONTACT],
                                 state=CreateUserBotState.PHONE)
@@ -198,3 +200,11 @@ def _register_user_bot_handlers(dp: Dispatcher) -> None:
     dp.register_message_handler(__start_input_user_settings, content_types=['text'], text="Запустить бота ✅")
     dp.register_message_handler(__stop_bot, content_types=['text'], text="Остановить бота ❌")
     dp.register_message_handler(__delete_session, content_types=['text'], text="Удалить свои данные ⚠️")
+
+    # endregion
+
+    # region Callback handlers
+
+    dp.register_callback_query_handler(__stop_register_user_bot, lambda c: c.data == "cancel_setup", state="*")
+
+    # endregion