From 417ecf14d7832e98ab7ba3fea734e3e019257380 Mon Sep 17 00:00:00 2001
From: "Andrew K. Choi" <a.choi@smartsoltech.kr>
Date: Sat, 7 Mar 2026 11:28:40 +0900
Subject: [PATCH] Clean up P2P message format - remove emoji prefixes and
 simplify sender display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Messages now show just sender name (bold) followed by message text
- For admin senders: displays as 'АДМИН'
- For regular users to admins: shows 'Nickname (карта: XXXX)'
- Removed decorative emoji prefixes (💬) for cleaner messaging
- Applies consistent formatting across text, photo, video, and document messages
---
 src/handlers/p2p_chat.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/handlers/p2p_chat.py b/src/handlers/p2p_chat.py
index badb57c..70d79e4 100644
--- a/src/handlers/p2p_chat.py
+++ b/src/handlers/p2p_chat.py
@@ -379,7 +379,19 @@ async def handle_p2p_message(message: Message, state: FSMContext):
             first_name=message.from_user.first_name,
             last_name=message.from_user.last_name
         )
-        sender_name = f"@{sender.username}" if sender.username else sender.first_name
+        
+        # Получаем информацию о получателе для определения как подписать сообщение
+        recipient = await UserService.get_by_telegram_id(session, recipient_telegram_id)
+        
+        # Формируем подпись сообщения для получателя
+        if sender.is_admin:
+            sender_name = "АДМИН"
+        else:
+            sender_name = sender.nickname or f"@{sender.username}" or sender.first_name or "Unknown"
+        
+        # Добавляем карту если получатель админ
+        if recipient and recipient.is_admin and sender.club_card_number:
+            sender_name += f" (карта: {sender.club_card_number})"
         
         # Определяем тип сообщения
         message_type = "text"
@@ -404,28 +416,28 @@ async def handle_p2p_message(message: Message, state: FSMContext):
             if message_type == "text":
                 sent = await message.bot.send_message(
                     recipient_telegram_id,
-                    f"💬 <b>Сообщение от {sender_name}:</b>\n\n{text}",
+                    f"<b>{sender_name}</b>\n\n{text}",
                     parse_mode="HTML"
                 )
             elif message_type == "photo":
                 sent = await message.bot.send_photo(
                     recipient_telegram_id,
                     photo=file_id,
-                    caption=f"💬 <b>Фото от {sender_name}</b>\n\n{text or ''}" ,
+                    caption=f"<b>{sender_name}</b>\n\n{text or ''}" ,
                     parse_mode="HTML"
                 )
             elif message_type == "video":
                 sent = await message.bot.send_video(
                     recipient_telegram_id,
                     video=file_id,
-                    caption=f"💬 <b>Видео от {sender_name}</b>\n\n{text or ''}",
+                    caption=f"<b>{sender_name}</b>\n\n{text or ''}",
                     parse_mode="HTML"
                 )
             elif message_type == "document":
                 sent = await message.bot.send_document(
                     recipient_telegram_id,
                     document=file_id,
-                    caption=f"💬 <b>Документ от {sender_name}</b>\n\n{text or ''}",
+                    caption=f"<b>{sender_name}</b>\n\n{text or ''}",
                     parse_mode="HTML"
                 )
             
-- 
2.49.1