From 900d84ad6a8568399efbf47307b82ab5fd6a1ba0 Mon Sep 17 00:00:00 2001
From: Rykov7 <rykov7@protonmail.ch>
Date: Tue, 26 Dec 2023 23:26:23 +0300
Subject: [PATCH] Update invalid name reaction.

---
 src/commands.py   | 7 +++++--
 tests/test_bot.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/commands.py b/src/commands.py
index 722b810..df1709e 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -355,8 +355,11 @@ async def default_query(inline_query):
 @bot.message_handler(func=is_invalid_name, chat_types=["supergroup", "group"])
 async def handle_invalid_name(message: types.Message):
     """Send the rule if member name is invalid."""
-    message.text = '\правило 6'
-    await send_rules(message)
+    rule_num = 6
+    markup = types.InlineKeyboardMarkup([[RULES]], 1)
+    logging.info(LOG_COMM % (message.chat.title, message.from_user.id, message.from_user.first_name, message.text))
+    await send_or_reply(message, f'<b><a href="tg:user?id={message.from_user.id}">{message.from_user.full_name}</a>, правило {rule_num}</b>\n<i>{fetch_rule(rule_num)}</i>', reply_markup=markup)
+    await bot.delete_message(message.chat.id, message.id)
 
 
 @bot.message_handler(func=is_hello_text, chat_types=["supergroup", "group"])
diff --git a/tests/test_bot.py b/tests/test_bot.py
index 0a3743e..32752d7 100644
--- a/tests/test_bot.py
+++ b/tests/test_bot.py
@@ -496,7 +496,7 @@ class TestBot(IsolatedAsyncioTestCase):
     async def test_invalid_name_user(self):
         await self.bot.process_new_updates([get_update('новый текст', first_name=None)])
         self.assertEqual(RESULTS[0][0]['chat_id'], '11')
-        self.assertEqual(RESULTS[0][0]['text'], '<b>Правило 6</b>\n<i>Имя должно быть читаемым и понятным.</i>')
+        self.assertEqual(RESULTS[0][0]['text'], '<b><a href="tg:user?id=10">None</a>, правило 6</b>\n<i>Имя должно быть читаемым и понятным.</i>')
         self.assertEqual(RESULTS[0][1], 'sendMessage')
         self.assertEqual(RESULTS[1][1], 'deleteMessage')