Добавление работы с конфликтными частями и исправление вайтлиста

bot/templates/message_callback.py

@@ -246,23 +246,40 @@ async def msg(
     keyboard = markups(markup)
 
     try:
-        # Попытка редактирования (для callback)
         if edit_if_possible and isinstance(update, CallbackQuery):
-            sent_message = await message.edit_text(
+            try:
+                sent_message = await message.edit_text(
+                    text=text,
+                    reply_markup=keyboard,
+                    parse_mode=parse_mode,
+                    disable_web_page_preview=disable_web_page_preview
+                )
+
+                if log:
+                    logger.debug(
+                        f"Сообщение отредактировано: {message.message_id}",
+                        log_type='MESSAGE'
+                    )
+
+            except (TelegramBadRequest, TelegramForbiddenError):
+                sent_message = await message.answer(
+                    text=text,
+                    reply_markup=keyboard,
+                    parse_mode=parse_mode,
+                    disable_web_page_preview=disable_web_page_preview,
+                    disable_notification=disable_notification,
+                    protect_content=protect_content
+                )
+        else:
+            sent_message = await message.answer(
                 text=text,
                 reply_markup=keyboard,
                 parse_mode=parse_mode,
-                disable_web_page_preview=disable_web_page_preview
+                disable_web_page_preview=disable_web_page_preview,
+                disable_notification=disable_notification,
+                protect_content=protect_content
             )
 
-            if log:
-                logger.debug(
-                    f"Сообщение отредактировано: {message.message_id}",
-                    log_type='MESSAGE'
-                )
-        else:
-            raise TelegramBadRequest
-
     except (TelegramBadRequest, TelegramForbiddenError):
         # Отправка нового сообщения
         try: