This commit is contained in:
2026-04-04 00:44:09 +03:00
parent 98274ffa49
commit b548021b86
2 changed files with 15 additions and 17 deletions
@@ -1,4 +1,5 @@
from aiogram.types import Message, CallbackQuery
from aiogram.utils.markdown import html_decoration as hd
from aiogram_dialog import Window, DialogManager
from aiogram_dialog.widgets.text import Format, Const
from aiogram_dialog.widgets.kbd import Row, SwitchTo, Button, ScrollingGroup, Select, Group
@@ -102,7 +103,7 @@ async def get_resident_info_data(
room = await rooms_repository.get_room_by_id(resident.room)
room_number = room.number if room else "???"
name = resident.real_name if resident.real_name else "Без имени"
name = hd.quote(resident.real_name) if resident.real_name else "Без имени"
status = "🟢 Занят" if resident.is_busy else "⚪️ Свободен"
is_admin = False
@@ -111,10 +112,11 @@ async def get_resident_info_data(
user = await users_repository.get_user_by_id(resident.user_entity)
if user:
if user.username:
username = f"@{user.username}"
username = f"@{hd.quote(user.username)}"
else:
username = f"ID: {user.id}"
user_info = f"{user.first_name} ({username})"
first_name = hd.quote(user.first_name) if user.first_name else "Без имени"
user_info = f"{first_name} ({username})"
is_admin = user.is_admin
admin_badge = " 👑" if is_admin else ""