chore: Global project refactoring

app/callbacks/menu.py

@@ -1,11 +1,10 @@
-# type: ignore
-__all__ = ()
+__all__ = ("router",)
 
 from aiogram import F, Router
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.filters import StateFilter
 from aiogram.fsm.context import FSMContext
-from aiogram.types import CallbackQuery
+from aiogram.types import CallbackQuery, Message
 
 from app import messages
 from app.config import Config
@@ -20,24 +19,18 @@ router = Router(name="menu_callback")
 
 
 @router.callback_query(
-    F.data == "menu_profile", RegisteredCallback(), StateFilter(None),
+    F.data == "menu_profile",
+    RegisteredCallback(),
+    StateFilter(None),
 )
 async def profile_callback(callback: CallbackQuery) -> None:
-    if callback.data is None or callback.message is None:
+    if callback.data is None or not isinstance(callback.message, Message):
         return
 
     user = User().get_user_by_telegram_id(callback.from_user.id)
 
     await callback.message.answer(
-        messages.PROFILE.format(
-            username=user.username,
-            age=user.age,
-            bio=user.bio if user.bio else messages.NOT_SET,
-            sex=user.sex.capitalize(),
-            country=user.country,
-            city=user.city,
-            date_joined=user.get_human_readable_datejoined(),
-        ),
+        user.get_profile_text(),
         reply_markup=get(),
     )
     await callback.answer()
@@ -49,13 +42,15 @@ async def profile_callback(callback: CallbackQuery) -> None:
 
 
 @router.callback_query(
-    F.data == "menu_create_travel", RegisteredCallback(), StateFilter(None),
+    F.data == "menu_create_travel",
+    RegisteredCallback(),
+    StateFilter(None),
 )
 async def create_travel_callback(
     callback: CallbackQuery,
     state: FSMContext,
 ) -> None:
-    if callback.data is None or callback.message is None:
+    if callback.data is None or not isinstance(callback.message, Message):
         return
 
     await callback.message.answer(
@@ -75,11 +70,16 @@ async def create_travel_callback(
 
 
 @router.callback_query(
-    F.data == "menu_travels", RegisteredCallback(), StateFilter(None),
+    F.data == "menu_travels",
+    RegisteredCallback(),
+    StateFilter(None),
 )
 async def travels_callback(
     callback: CallbackQuery,
 ) -> None:
+    if not isinstance(callback.message, Message):
+        return
+
     page = 0
 
     user = User().get_user_by_telegram_id(callback.from_user.id)

app/callbacks/profile.py

@@ -1,5 +1,4 @@
-# type: ignore
-__all__ = ()
+__all__ = ("router",)
 
 from aiogram import F, Router
 from aiogram.exceptions import TelegramBadRequest
@@ -31,7 +30,11 @@ async def profile_change_callback(
     callback: CallbackQuery,
     state: FSMContext,
 ) -> None:
-    if callback.data is None or callback.message is None:
+    if (
+        callback.data is None
+        or callback.message is None
+        or not isinstance(callback.message, Message)
+    ):
         return
 
     column = callback.data.replace("profile_change_", "")
@@ -70,6 +73,13 @@ async def profile_change_callback(
 
 @router.message(UserAlteringState.value, F.text, Registered())
 async def profile_change_entered(message: Message, state: FSMContext) -> None:
+    if (
+        message.text is None
+        or message.from_user is None
+        or message.bot is None
+    ):
+        return
+
     column = (await state.get_data()).get("column")
     value = message.text.strip()
 
@@ -205,15 +215,7 @@ async def profile_change_entered(message: Message, state: FSMContext) -> None:
 
     try:
         await message.bot.edit_message_text(
-            messages.PROFILE.format(
-                username=user.username,
-                age=user.age,
-                bio=user.bio if user.bio else messages.NOT_SET,
-                sex=user.sex.capitalize(),
-                country=user.country,
-                city=user.city,
-                date_joined=user.get_human_readable_datejoined(),
-            ),
+            user.get_profile_text(),
             message.chat.id,
             state_data["profile_message_id"],
             reply_markup=get(),

app/callbacks/travels.py

@@ -1,10 +1,9 @@
-# type: ignore
-__all__ = ()
+__all__ = ("router",)
 
 from aiogram import F, Router
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.filters import StateFilter
-from aiogram.types import CallbackQuery
+from aiogram.types import CallbackQuery, Message
 
 from app import messages
 from app.config import Config
@@ -17,9 +16,14 @@ router = Router(name="menu_callback")
 
 
 @router.callback_query(
-    F.data.startswith("travels_page"), RegisteredCallback(), StateFilter(None),
+    F.data.startswith("travels_page"),
+    RegisteredCallback(),
+    StateFilter(None),
 )
 async def travels_callback(callback: CallbackQuery) -> None:
+    if callback.data is None or not isinstance(callback.message, Message):
+        return
+
     page = int(callback.data.replace("travels_page_", ""))
 
     user = User().get_user_by_telegram_id(callback.from_user.id)