chore: Global project refactoring

This commit is contained in:
ITQ
2024-03-23 10:47:39 +03:00
parent 1802ce81b0
commit 7b28635f09
21 changed files with 143 additions and 116 deletions
+17 -17
View File
@@ -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)