FIx: message text, edit admin panel, localization

Author: devvsima

app/handlers/admin/admin.py

@@ -2,12 +2,12 @@
 from aiogram.filters import Command
 from aiogram.filters.state import StateFilter
 
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
 from app.keyboards.default.admin import admin_menu_kb
 from app.routers import admin_router as router
 
 
 @router.message(Command("admin"), StateFilter(None))
 async def _admin_command(message: types.Message) -> None:
     """Админ панель"""
-    await message.answer(text=msg_text.ADMIN_WELCOME, reply_markup=admin_menu_kb())
+    await message.answer(text=amt.ADMIN_WELCOME, reply_markup=admin_menu_kb)

app/handlers/admin/ban_user.py

@@ -2,7 +2,7 @@
 from aiogram.filters.state import StateFilter
 
 from app.filters.kb_filter import BlockUserCallback
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
 from app.routers import admin_router as router
 from database.services import Profile, User
 
@@ -14,5 +14,5 @@ async def _complaint_user_callback(callback: types.CallbackQuery, callback_data,
         user = await User.get_with_profile(session, user_id)
         await User.update_isbanned(session, user, True)
         await Profile.update_isactive(session, user.profile, False)
-        await callback.message.edit_text(msg_text.USER_BANNED.format(user.id))
-    await callback.message.edit_text(msg_text.USER_BANNED_CANCEL)
+        await callback.message.edit_text(amt.USER_BANNED.format(user.id))
+    await callback.message.edit_text(amt.USER_BANNED_CANCEL)

app/handlers/admin/mailing.py

@@ -1,14 +1,14 @@
 from aiogram import F, types
 from aiogram.filters.state import StateFilter
 
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
 from app.routers import admin_router as router
 
 
-@router.message(F.text.in_(("📩 Рассылка", "📩 Mailing list", "📩 Розсилка")), StateFilter(None))
+@router.message(F.text == "📩 Mailing to users", StateFilter(None))
 async def _users_mailing_panel(message: types.Message) -> None:
     """Админ панель для рассылки пользователям"""
-    await message.answer(msg_text.MAILING_PANEL)
+    await message.answer(amt.MAILING_PANEL)
 
 
 """unfinished"""

app/handlers/admin/stats.py

@@ -4,7 +4,7 @@
 from aiogram.filters import Command
 from aiogram.filters.state import StateFilter
 
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
 from app.keyboards.inline.admin import stats_ikb
 from app.routers import admin_router as router
 from database.services.stats import (
@@ -16,13 +16,13 @@
 
 
 @router.message(Command("stats"), StateFilter(None))
-@router.message(F.text.in_(("📊 Статистика", "📊 Statistics")), StateFilter(None))
+@router.message(F.text == "📊 Statistics", StateFilter(None))
 async def _stats_command(message: types.Message, session) -> None:
     """Отправляет администратору меню статистики"""
     graph_path = await get_or_create_registration_graph(session)
     photo = types.FSInputFile(graph_path)
     users_stats = await get_user_statistics(session)
-    text = msg_text.USER_STATS.format(
+    text = amt.USER_STATS.format(
         users_stats["count"],
         users_stats["banned_count"],
         users_stats["total_referrals"],
@@ -40,7 +40,7 @@ async def _stats_callback(callback: types.CallbackQuery, session) -> None:
     photo = types.FSInputFile(graph_path)
     if callback.data == "stats_User":
         users_stats = await get_user_statistics(session)
-        text = msg_text.USER_STATS.format(
+        text = amt.USER_STATS.format(
             users_stats["count"],
             users_stats["banned_count"],
             users_stats["total_referrals"],
@@ -50,7 +50,7 @@ async def _stats_callback(callback: types.CallbackQuery, session) -> None:
     elif callback.data == "stats_Profile":
         match_stats = await get_match_statistics(session)
         profile_stats = await get_profile_statistics(session)
-        text = msg_text.PROFILE_STATS.format(
+        text = amt.PROFILE_STATS.format(
             profile_stats["count"],
             profile_stats["inactive_profile"],
             profile_stats["male_count"],

app/handlers/admin/users.py

@@ -1,36 +1,30 @@
 from aiogram import F, types
 from aiogram.filters.state import StateFilter
 
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
 from app.keyboards.default.admin import user_ban_or_unban_kb
 from app.routers import admin_router as router
 
 
-@router.message(F.text.in_(("👤 Пользователи", "👤 Користувачі", "👤 Users")), StateFilter(None))
+@router.message(F.text == "👤 Users", StateFilter(None))
 async def _users_admin_panel(message: types.Message) -> None:
     """Админ панель управление пользователями"""
     await message.answer(
-        text=msg_text.USER_PANEL,
-        reply_markup=user_ban_or_unban_kb(),
+        text=amt.USER_PANEL,
+        reply_markup=user_ban_or_unban_kb,
     )
 
 
-@router.message(
-    F.text.in_(("⚔️ Забанить пользователей", "⚔️ Забанити користувачів", "⚔️ Ban users")),
-    StateFilter(None),
-)
+@router.message(F.text == "⚔️ Ban users", StateFilter(None))
 async def _ban_users_command(message: types.Message) -> None:
     """Запрашивает список пользоветелей которых нужно заблокировать"""
-    await message.answer(msg_text.BAN_USERS_PANEL)
+    await message.answer(amt.BAN_USERS_PANEL)
 
 
-@router.message(
-    F.text.in_(("💊 Разбанить пользователей", "💊 Розбанити користувачів", "💊 Unban users")),
-    StateFilter(None),
-)
+@router.message(F.text == "💊 Unban users", StateFilter(None))
 async def _unban_users_commad(message: types.Message) -> None:
     """Запрашивает список пользоветелей которых нужно разблокировать"""
-    await message.answer(msg_text.UNBAN_USERS_PANEL)
+    await message.answer(amt.UNBAN_USERS_PANEL)
 
 
 """unfinished"""

app/handlers/bot_utils.py

@@ -1,6 +1,7 @@
 import html
 
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import admin_message_text as amt
+from app.handlers.message_text import user_message_text as umt
 from app.keyboards.default.base import menu_kb
 from app.keyboards.inline.report import block_user_ikb
 from data.config import MODERATOR_GROUP
@@ -22,7 +23,7 @@ async def menu(chat_id: int) -> None:
     """Отправляет меню пользователю"""
     await bot.send_message(
         chat_id=chat_id,
-        text=msg_text.MENU,
+        text=umt.MENU,
         reply_markup=menu_kb,
     )
 
@@ -35,7 +36,7 @@ async def complaint_to_profile(user: UserModel, profile: ProfileModel, session)
             await send_profile(MODERATOR_GROUP, profile)
             reported_user = await User.get(session, profile.user_id)
 
-            text = msg_text.REPORT_TO_USER.format(
+            text = umt.REPORT_TO_USER.format(
                 user.id, user.username, profile.user_id, reported_user.username
             )
 
@@ -66,7 +67,7 @@ async def new_user_alert_to_group(user: UserModel) -> None:
     if MODERATOR_GROUP:
         try:
             await bot.send_message(
-                chat_id=MODERATOR_GROUP, text=msg_text.NEW_USER.format(user.id, user.username)
+                chat_id=MODERATOR_GROUP, text=amt.NEW_USER.format(user.id, user.username)
             )
         except:
             logger.error("Сообщение в модераторскую группу не отправленно")
@@ -88,6 +89,6 @@ async def sending_user_contact(chat_id: int, name: str, language: str, user_link
 
     await bot.send_message(
         chat_id=chat_id,
-        text=msg_text.LIKE_ACCEPT(language).format(user_link, html.escape(name)),
+        text=umt.LIKE_ACCEPT(language).format(user_link, html.escape(name)),
         message_effect_id=effect_dict["🎉"],
     )

app/handlers/msg_text.py app/handlers/message_text.pyapp/handlers/msg_text.py renamed to app/handlers/message_text.py

@@ -5,7 +5,7 @@
 """
 
 
-class MsgText:
+class UserMessageText:
     @property
     def WELCOME(self):
         return _(
@@ -108,9 +108,7 @@ def DESCRIPTION(self):
 
     @property
     def DISABLE_PROFILE(self):
-        return _(
-            "Твоя анкета временно отключена. Чтобы снова её активировать, просто нажми на кнопку. 😊"
-        )
+        return _("Твоя анкета отключена.\n\n🔙 Чтобы активировать анкету")
 
     @property
     def ACTIVATE_PROFILE_ALERT(self):
@@ -141,47 +139,45 @@ def INVITE_FRIENDS(self):
         )
 
     @property
-    def ADMIN_WELCOME(self):
-        return _("Ты администратор!")
+    def CHANGE_LANG(self):
+        return _("Выбери язык бота, на который хочешь переключиться: 🌐")
 
-    @property
-    def PROFILE_STATS(self):
-        return """
-📂 Profile: {} | 🔕 Inactive: {}
-🙍‍♂ Guys: {} | 🙍‍♀ Girls: {}
+    def DONE_CHANGE_LANG(self, language: str):
+        return _("Язык бота изменён! ✅", locale=language)
 
-💘 Matchs: {}
+    @property
+    def REPORT_TO_USER(self):
+        return _(
+            "Пользователь <code>{}</code> (@{}) отправил жалобу на анкету пользователя: <code>{}</code> (@{})"
+        )
 
-🕘 Age: {}
-🏙 City: {}
-"""
+    @property
+    def REPORT_TO_PROFILE(self):
+        return _("✅ Жалоба отправлена на рассмотрение!")
 
     @property
-    def USER_STATS(self):
-        return """
-👤 Users: {}\t| 🚫 Blocked: {}
-✉️ Referrals: {}
+    def RESON_OF_REPORTING(self):
+        return _("""Укажи причину жалобы:
+🔞 Неприличный материал
+💰 Реклама
+🔫 Другое
 
-🌍 Most popular language: {}
-"""
+Если жалоба ошибочная, то можете вернутся назад.
+""")
 
-    @property
-    def CHANGE_LANG(self):
-        return _("Выбери язык бота, на который хочешь переключиться: 🌐")
 
+class AdminMessageText:
     @property
-    def DONE_CHANGE_LANG(self):
-        return _("Язык бот изменён! ✅")
+    def ADMIN_WELCOME(self):
+        return _("Ты администратор!")
 
     @property
     def NEW_USER(self):
-        return _("Новый пользователь!\n<code>{}</code> (@{})")
+        return "New user!\n<code>{}</code> (@{})"
 
     @property
-    def REPORT_TO_USER(self):
-        return _(
-            "Пользователь <code>{}</code> (@{}) отправил жалобу на анкету пользователя: <code>{}</code> (@{})"
-        )
+    def MAILING_PANEL(self):
+        return _("Укажи текст сообщения которое будет отправленно")
 
     @property
     def USER_PANEL(self):
@@ -200,30 +196,34 @@ def BAN_USERS_PANEL(self):
         )
 
     @property
-    def USER_BANNED(self):
-        return _("Пользователь: <code>{}</code> заблокирован")
+    def PROFILE_STATS(self):
+        return """
+📂 Profile: {} | 🔕 Inactive: {}
+🙍‍♂ Guys: {} | 🙍‍♀ Girls: {}
 
-    @property
-    def USER_BANNED_CANCEL(self):
-        return _("Администратор отклонил жалобу")
+💘 Matchs: {}
 
-    @property
-    def MAILING_PANEL(self):
-        return _("Укажи текст сообщения которое будет отправленно")
+🕘 Age: {}
+🏙 City: {}
+"""
 
     @property
-    def REPORT_TO_PROFILE(self):
-        return _("✅ Жалоба отправлена на рассмотрение!")
+    def USER_STATS(self):
+        return """
+👤 Users: {}\t| 🚫 Blocked: {}
+✉️ Referrals: {}
+
+🌍 Most popular language: {}
+"""
 
     @property
-    def RESON_OF_REPORTING(self):
-        return _("""Укажи причину жалобы:
-🔞 Неприличный материал
-💰 Реклама
-🔫 Другое
+    def USER_BANNED(self):
+        return _("Пользователь: <code>{}</code> заблокирован")
 
-Если жалоба ошибочная, то можете вернутся назад.
-""")
+    @property
+    def USER_BANNED_CANCEL(self):
+        return _("Администратор отклонил жалобу")
 
 
-msg_text = MsgText()
+user_message_text = UserMessageText()
+admin_message_text = AdminMessageText()

app/handlers/user/archive_like.py

@@ -3,7 +3,7 @@
 from aiogram.fsm.context import FSMContext
 
 from app.handlers.bot_utils import generate_user_link, sending_user_contact
-from app.handlers.msg_text import msg_text
+from app.handlers.message_text import user_message_text as umt
 from app.keyboards.default.base import arhive_search_kb
 from app.others.states import DisableProfile, LikeResponse
 from app.routers import user_router as router
@@ -20,15 +20,15 @@ async def like_profile(message: types.Message, state: FSMContext, user: UserMode
     if await state.get_state() == DisableProfile.waiting:
         return
     await User.update_username(session, user, message.from_user.username)  # needs to be redone
-    await message.answer(text=msg_text.SEARCH, reply_markup=arhive_search_kb)
+    await message.answer(text=umt.SEARCH, reply_markup=arhive_search_kb)
     await state.set_state(LikeResponse.response)
 
     if liker_ids := await Match.get_all(session, message.from_user.id):
         await state.update_data(ids=liker_ids)
         profile = await Profile.get(session, liker_ids[0])
         await send_profile(message.from_user.id, profile)
     else:
-        await message.answer(msg_text.LIKE_ARCHIVE)
+        await message.answer(umt.LIKE_ARCHIVE)
         await cancel_command(message, state)
 
 
@@ -41,15 +41,15 @@ async def _like_profile(
         return
     await state.set_state(LikeResponse.response)
     await User.update_username(session, user, callback.from_user.username)  # needs to be redone
-    await callback.message.answer(text=msg_text.SEARCH, reply_markup=arhive_search_kb)
+    await callback.message.answer(text=umt.SEARCH, reply_markup=arhive_search_kb)
     await callback.answer()
 
     if liker_ids := await Match.get_all(session, callback.from_user.id):
         await state.update_data(ids=liker_ids)
         profile = await Profile.get(session, liker_ids[0])
         await send_profile(callback.from_user.id, profile)
     else:
-        await callback.message.answer(msg_text.LIKE_ARCHIVE)
+        await callback.message.answer(umt.LIKE_ARCHIVE)
         await cancel_command(callback.message, state)
 
 
@@ -90,5 +90,5 @@ async def _like_response(
         profile = await Profile.get(session, ids[0])
         await send_profile(user.id, profile)
     else:
-        await message.answer(msg_text.EMPTY_PROFILE_SEARCH)
+        await message.answer(umt.EMPTY_PROFILE_SEARCH)
         await cancel_command(message, state)