From 13d4e934ec04643a08c60d25df8dc6db85df1399 Mon Sep 17 00:00:00 2001 From: Egor Date: Thu, 11 Sep 2025 04:25:07 +0300 Subject: [PATCH] Update welcome_text.py --- app/database/crud/welcome_text.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/database/crud/welcome_text.py b/app/database/crud/welcome_text.py index a12e119b..2d2897b0 100644 --- a/app/database/crud/welcome_text.py +++ b/app/database/crud/welcome_text.py @@ -64,7 +64,7 @@ def replace_placeholders(text: str, user) -> str: '{first_name}': user.first_name or "друг", '{username}': f"@{user.username}" if user.username else user.first_name or "друг", '{username_clean}': user.username or user.first_name or "друг", - 'User': user.first_name or user.username or "друг" + 'Egor': user.first_name or user.username or "Друг" } result = text @@ -79,6 +79,13 @@ async def get_welcome_text_for_user(db: AsyncSession, user) -> str: if not welcome_text: welcome_text = await get_current_welcome_text_or_default() + if isinstance(user, str): + class SimpleUser: + def __init__(self, name): + self.first_name = name + self.username = None + user = SimpleUser(user) + return replace_placeholders(welcome_text, user) def get_available_placeholders() -> dict: