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'♻ {message.from_user.first_name}'
- f' заблокирован.', parse_mode='HTML')
+ f'♻ {message.from_user.first_name}'
+ 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'♻ {message.from_user.first_name} заблокирован (наркотики).')
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}. {user.first_name} ({count})'
+ name = f"{user.first_name} {user.last_name}" if user.last_name else user.first_name
+ text += f'\n {i + 1}. {name} ({count})'
report = f"""Доброе утро, Мир!
За прошедшие сутки