Revert "Harden message send fallback for invalid HTML"

app/utils/message_patch.py

@@ -1,5 +1,3 @@
-import html
-import re
 from pathlib import Path
 from typing import Any, Dict
 
@@ -21,14 +19,6 @@ _original_answer = Message.answer
 _original_edit_text = Message.edit_text
 
 
-def _strip_html(text: str | None) -> str:
-    if not text:
-        return ""
-
-    plain_text = html.unescape(re.sub(r"<[^>]+>", "", text))
-    return plain_text.strip()
-
-
 def _get_language(message: Message) -> str | None:
     try:
         user = message.from_user
@@ -79,29 +69,6 @@ def prepare_privacy_safe_kwargs(kwargs: Dict[str, Any] | None = None) -> Dict[st
     return safe_kwargs
 
 
-async def _answer_plain_text(self: Message, text: str | None, kwargs: Dict[str, Any], error: Exception | None = None):
-    language = _get_language(self)
-
-    if error and is_privacy_restricted_error(error):
-        text = append_privacy_hint(text, language)
-        kwargs = prepare_privacy_safe_kwargs(kwargs)
-
-    try:
-        return await _original_answer(self, text, **kwargs)
-    except TelegramBadRequest as send_error:
-        if is_privacy_restricted_error(send_error):
-            text = append_privacy_hint(text, language)
-            kwargs = prepare_privacy_safe_kwargs(kwargs)
-        else:
-            text = _strip_html(text)
-            kwargs = dict(kwargs)
-            kwargs.pop("parse_mode", None)
-
-        return await _original_answer(self, text, **kwargs)
-    except Exception:
-        return await _original_answer(self, text, **kwargs)
-
-
 def is_privacy_restricted_error(error: Exception) -> bool:
     if not isinstance(error, TelegramBadRequest):
         return False
@@ -114,11 +81,11 @@ def is_privacy_restricted_error(error: Exception) -> bool:
 async def _answer_with_photo(self: Message, text: str = None, **kwargs):
     # Уважаем флаг в рантайме: если логотип выключен — не подменяем ответ
     if not settings.ENABLE_LOGO_MODE:
-        return await _answer_plain_text(self, text, kwargs)
+        return await _original_answer(self, text, **kwargs)
     # Если caption слишком длинный для фото — отправим как текст
     try:
         if text is not None and len(text) > 900:
-            return await _answer_plain_text(self, text, kwargs)
+            return await _original_answer(self, text, **kwargs)
     except Exception:
         pass
     language = _get_language(self)
@@ -133,10 +100,10 @@ async def _answer_with_photo(self: Message, text: str = None, **kwargs):
                 safe_kwargs = prepare_privacy_safe_kwargs(kwargs)
                 return await _original_answer(self, fallback_text, **safe_kwargs)
             # Фоллбек, если Telegram ругается на caption или другое ограничение: отправим как текст
-            return await _answer_plain_text(self, text, kwargs, error)
+            return await _original_answer(self, text, **kwargs)
         except Exception:
-            return await _answer_plain_text(self, text, kwargs)
-    return await _answer_plain_text(self, text, kwargs)
+            return await _original_answer(self, text, **kwargs)
+    return await _original_answer(self, text, **kwargs)
 
 
 async def _edit_with_photo(self: Message, text: str, **kwargs):
@@ -152,7 +119,7 @@ async def _edit_with_photo(self: Message, text: str, **kwargs):
                     await self.delete()
                 except Exception:
                     pass
-                return await _answer_plain_text(self, text, kwargs)
+                return await _original_answer(self, text, **kwargs)
         except Exception:
             pass
         # Всегда используем логотип если включен режим логотипа,
@@ -180,13 +147,13 @@ async def _edit_with_photo(self: Message, text: str, **kwargs):
                     await self.delete()
                 except Exception:
                     pass
-                return await _answer_plain_text(self, fallback_text, safe_kwargs)
+                return await _original_answer(self, fallback_text, **safe_kwargs)
             # Фоллбек: удалим и отправим обычный текст без фото
             try:
                 await self.delete()
             except Exception:
                 pass
-            return await _answer_plain_text(self, text, kwargs, error)
+            return await _original_answer(self, text, **kwargs)
     return await _original_edit_text(self, text, **kwargs)
 
 

app/utils/photo_message.py

@@ -1,6 +1,3 @@
-import html
-import re
-
 from aiogram import types
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.types import FSInputFile, InputMediaPhoto
@@ -36,14 +33,6 @@ def _get_language(callback: types.CallbackQuery) -> str | None:
     return None
 
 
-def _strip_html(text: str | None) -> str:
-    if not text:
-        return ""
-
-    plain_text = html.unescape(re.sub(r"<[^>]+>", "", text))
-    return plain_text.strip()
-
-
 def _build_base_kwargs(keyboard: types.InlineKeyboardMarkup | None, parse_mode: str | None):
     kwargs: dict[str, object] = {}
     if parse_mode is not None:
@@ -68,19 +57,6 @@ async def _answer_text(
         kwargs = prepare_privacy_safe_kwargs(kwargs)
 
     kwargs.setdefault("parse_mode", parse_mode or "HTML")
-    try:
-        await callback.message.answer(
-            caption,
-            **kwargs,
-        )
-        return
-    except TelegramBadRequest as send_error:
-        if is_privacy_restricted_error(send_error):
-            caption = append_privacy_hint(caption, language)
-            kwargs = prepare_privacy_safe_kwargs(kwargs)
-        else:
-            caption = _strip_html(caption)
-            kwargs.pop("parse_mode", None)
 
     await callback.message.answer(
         caption,