Fix tags error in aiogram

hikka/inline/form.py

@@ -122,7 +122,7 @@ class Form(InlineUnit):
             logger.error("Invalid type for `text`")
             return False
 
-        text = self._sanitise_text(text)
+        text = self.sanitise_text(text)
 
         if not isinstance(silent, bool):
             logger.error("Invalid type for `silent`")

hikka/inline/list.py

@@ -236,9 +236,11 @@ class List(InlineUnit):
         try:
             await self.bot.edit_message_text(
                 inline_message_id=call.inline_message_id,
-                text=self._units[unit_id]["strings"][
+                text=self.sanitise_text(
-                    self._units[unit_id]["current_index"]
+                    self._units[unit_id]["strings"][
-                ],
+                        self._units[unit_id]["current_index"]
+                    ]
+                ),
                 reply_markup=self._list_markup(unit_id),
             )
             await call.answer()

hikka/inline/utils.py

@@ -255,7 +255,7 @@ class Utils(InlineUnit):
 
         return reply_markup
 
-    def _sanitise_text(self, text: str) -> str:
+    def sanitise_text(self, text: str) -> str:
         """Replaces all animated emojis in text with normal ones, bc aiogram doesn't support them"""
         return re.sub(r"</?emoji.*?>", "", text)
 
@@ -313,7 +313,7 @@ class Utils(InlineUnit):
             audio = {"url": audio}
 
         if isinstance(text, str):
-            text = self._sanitise_text(text)
+            text = self.sanitise_text(text)
 
         media_params = [
             photo is None,

hikka/modules/updater.py

@@ -74,16 +74,12 @@ class UpdaterMod(loader.Module):
         "origin_cfg_doc": "Git origin URL, for where to update from",
         "btn_restart": "🔄 Restart",
         "btn_update": "🧭 Update",
-        "restart_confirm": (
+        "restart_confirm": "❓ <b>Are you sure you want to restart?</b>",
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Are you sure you"
-            " want to restart?</b>"
-        ),
         "secure_boot_confirm": (
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Are you sure you"
+            "❓ <b>Are you sure you want to restart in secure boot mode?</b>"
-            " want to restart in secure boot mode?</b>"
         ),
         "update_confirm": (
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Are you sure you"
+            "❓ <b>Are you sure you"
             " want to update?\n\n<a"
             ' href="https://github.com/hikariatama/Hikka/commit/{}">{}</a> ⤑ <a'
             ' href="https://github.com/hikariatama/Hikka/commit/{}">{}</a></b>'
@@ -145,16 +141,13 @@ class UpdaterMod(loader.Module):
         "origin_cfg_doc": "Ссылка, из которой будут загружаться обновления",
         "btn_restart": "🔄 Перезагрузиться",
         "btn_update": "🧭 Обновиться",
-        "restart_confirm": (
+        "restart_confirm": "❓ <b>Ты уверен, что хочешь перезагрузиться?</b>",
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Ты уверен, что"
-            " хочешь перезагрузиться?</b>"
-        ),
         "secure_boot_confirm": (
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Ты уверен, что"
+            "❓ <b>Ты уверен, что"
             " хочешь перезагрузиться в режиме безопасной загрузки?</b>"
         ),
         "update_confirm": (
-            "<emoji document_id='5384612769716774600'>❓</emoji> <b>Ты уверен, что"
+            "❓ <b>Ты уверен, что"
             " хочешь обновиться??\n\n<a"
             ' href="https://github.com/hikariatama/Hikka/commit/{}">{}</a> ⤑ <a'
             ' href="https://github.com/hikariatama/Hikka/commit/{}">{}</a></b>'
@@ -566,7 +559,7 @@ class UpdaterMod(loader.Module):
 
         await self.inline.bot.edit_message_text(
             inline_message_id=ms,
-            text=msg,
+            text=self.inline.sanitise_text(msg),
         )
 
     async def full_restart_complete(self, secure_boot: bool = False):
@@ -599,7 +592,7 @@ class UpdaterMod(loader.Module):
 
         await self.inline.bot.edit_message_text(
             inline_message_id=ms,
-            text=msg,
+            text=self.inline.sanitise_text(msg),
         )