From be3ec083e3d91b4adc43931be491859fb502daf5 Mon Sep 17 00:00:00 2001
From: Rykov7 <rykov7@protonmail.ch>
Date: Tue, 8 Nov 2022 19:37:24 +0300
Subject: [PATCH] visual improvements in report

---
 app/bot.py    | 6 +++---
 app/report.py | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/bot.py b/app/bot.py
index 2bcfe47..30ca951 100644
--- a/app/bot.py
+++ b/app/bot.py
@@ -52,8 +52,8 @@ def check_spam_list(type_message: types.Message) -> bool:
 def moderate_messages(message: types.Message):
     """ Ban user and delete their message. """
     warn = bot.send_message(message.chat.id,
-                            f'♻ <b><a href="tg://user?id={message.from_user.id}">{message.from_user.first_name}</a></b>'
-                            f' заблокирован.', parse_mode='HTML')
+                            f'♻ <a href="tg://user?id={message.from_user.id}">{message.from_user.first_name}</a>'
+                            f' заблокирован (запрещённые ссылки).', parse_mode='HTML')
     Thread(target=wait_for_readers, args=(bot.delete_message, message.chat.id, warn.id)).start()
     bot.ban_chat_member(message.chat.id, message.from_user.id)
     bot.delete_message(message.chat.id, message.id)
@@ -74,7 +74,7 @@ def check_caption_spam_list(type_message: types.Message) -> bool:
 @bot.message_handler(func=check_caption_spam_list, content_types=['video'])
 def catch_videos(message: types.Message):
     """Catch offensive videos"""
-    warn = bot.send_message(message.chat.id, f"♻ {message.from_user.first_name} заблокирован.")
+    warn = bot.send_message(message.chat.id, f'♻ <a href="tg://user?id={message.from_user.id}">{message.from_user.first_name}</a> заблокирован (наркотики).')
     bot.delete_message(message.chat.id, message.id)
     bot.ban_chat_member(message.chat.id, message.from_user.id)
     Thread(target=wait_for_readers, args=(bot.delete_message, message.chat.id, warn.id)).start()
diff --git a/app/report.py b/app/report.py
index ca9a145..86c970e 100644
--- a/app/report.py
+++ b/app/report.py
@@ -12,7 +12,8 @@ def create_report_text():
         for i, flooder in enumerate(flooders):
             user = flooder['User']
             count = flooder['Count']
-            text += f'\n  {i + 1}. <a href="tg://user?id={user.id}">{user.first_name}</a> ({count})'
+            name = f"{user.first_name} {user.last_name}" if user.last_name else user.first_name
+            text += f'\n  {i + 1}. <a href="tg://user?id={user.id}">{name}</a> ({count})'
         report = f"""<code>Доброе утро, Мир!</code>
 <b>За прошедшие сутки</b>