Merge pull request #1 from nawinds/v1.0.1

v1.0.1: Markdown escape added

Author: Nikita Aksenov

handlers/callbacks.py

@@ -1,4 +1,3 @@
-from string import Template
 
 from aiogram import Router
 from aiogram import types, F
@@ -11,6 +10,7 @@
 from data.sticker_sets import StickerSet
 from data.user_sets import UserSet
 from instances import bot
+from instances import escape_md
 
 callbacks = Router()
 callbacks.message.filter(F.chat.type == "private")
@@ -43,10 +43,10 @@ async def add_set(callback: types.CallbackQuery, i18n: I18nContext):
     if notifications:
         await bot.send_message(
             sticker_set.owner_id,
-            Template(i18n.gettext("callbacks.add_set.notification", title=sticker_set.title))
-            .substitute(title=sticker_set.title),
+            i18n.gettext("callbacks.add_set.notification", title=escape_md(sticker_set.title)),
             parse_mode="markdown")
-    await bot.send_message(callback.from_user.id, i18n.gettext("callbacks.add_set.added"))
+    await bot.send_message(callback.from_user.id, i18n.gettext("callbacks.add_set.added"),
+                           parse_mode="markdown")
 
 
 @callbacks.callback_query(lambda c: c.data.startswith("share_set-"), StateFilter("*"))
@@ -80,8 +80,8 @@ async def share_set(callback: types.CallbackQuery, i18n: I18nContext):
                                      f"{link.code}")
     await bot.send_message(callback.from_user.id,
                            i18n.gettext("callbacks.share_set.link_text",
-                                        title=sticker_set.title,
-                                        username=bot_info.username,
+                                        title=escape_md(sticker_set.title),
+                                        username=escape_md(bot_info.username),
                                         code=link.code), reply_markup=builder.as_markup(),
                            parse_mode="markdown")
 

handlers/commands.py

@@ -13,6 +13,7 @@
 from data.user_sets import UserSet
 from instances import NewSetState
 from instances import bot
+from instances import escape_md
 
 commands = Router()
 commands.message.filter(F.chat.type == "private")
@@ -34,14 +35,14 @@ async def cmd_start_add_set(message: types.Message, i18n: I18nContext):
     builder.button(text=i18n.gettext("commands.start_deep.no"), callback_data="add_set-0")
     builder.adjust(1)
 
-    await message.answer(i18n.gettext("commands.start_deep.reply_text", link_set_title=link.set.title),
+    await message.answer(i18n.gettext("commands.start_deep.reply_text", link_set_title=escape_md(link.set.title)),
                          reply_markup=builder.as_markup(), parse_mode="markdown")
 
 
 @commands.message(CommandStart(), StateFilter(None))
 async def cmd_start(message: types.Message, i18n: I18nContext):
     bot_info = await bot.get_me()
-    await message.answer(i18n.gettext("commands.start.hello_text", username=bot_info.username),
+    await message.answer(i18n.gettext("commands.start.hello_text", username=escape_md(bot_info.username)),
                          parse_mode="markdown", disable_web_page_preview=True)
 
 

instances.py

@@ -6,6 +6,7 @@
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.storage.memory import MemoryStorage
 from aiogram.types import TelegramObject
+from aiogram.utils.markdown import markdown_decoration, _join
 from aiogram_i18n.managers.fsm import FSMManager
 
 storage = MemoryStorage()
@@ -31,3 +32,7 @@ async def get_locale(self, event: TelegramObject, data: Dict[str, Any]) -> str:
             if state:
                 await state.update_data(data={self.key: locale})
         return locale
+
+
+def escape_md(*content, sep=" ") -> str:
+    return markdown_decoration.quote(_join(*content, sep=sep)).replace("\\.", ".")

locales/en/LC_MESSAGES/en.mo

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Inline stickers bot\n"
 "POT-Creation-Date: 2023-07-20 18:07+0300\n"
-"PO-Revision-Date: 2023-07-20 18:08+0300\n"
+"PO-Revision-Date: 2023-07-23 23:23+0300\n"
 "Last-Translator: Nikita Aksenov <[email protected]>\n"
 "Language-Team: Nikita Aksenov\n"
 "Language: en\n"
@@ -57,7 +57,7 @@ msgstr " notifications"
 #: handlers/callbacks.py:82
 msgid "callbacks.share_set.link_text"
 msgstr ""
-"Here is a link for adding the {title} set. You can now share it with your "
+"Here is a link for adding the *{title}* set. You can now share it with your "
 "friends.\n"
 "\n"
 "https://t.me/{username}?start=add\\_set-{code}\n"

locales/en/LC_MESSAGES/en.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Inline stickers bot\n"
 "POT-Creation-Date: 2023-07-20 18:07+0300\n"
-"PO-Revision-Date: 2023-07-20 18:08+0300\n"
+"PO-Revision-Date: 2023-07-23 23:24+0300\n"
 "Last-Translator: Nikita Aksenov <[email protected]>\n"
 "Language-Team: Nikita Aksenov\n"
 "Language: ru\n"
@@ -57,7 +57,7 @@ msgstr " уведомления"
 #: handlers/callbacks.py:82
 msgid "callbacks.share_set.link_text"
 msgstr ""
-"Ниже ссылка для добавления сета {title}. Вы можете поделиться ей с "
+"Ниже ссылка для добавления сета *{title}*. Вы можете поделиться ей с "
 "друзьями.\n"
 "\n"
 "https://t.me/{username}?start=add\\_set-{code}\n"

locales/ru/LC_MESSAGES/ru.mo

@@ -1,22 +1,4 @@
-aiofiles==23.1.0
 aiogram==3.0.0b7
-aiogram_i18n==1.0
-aiohttp==3.8.4
-aiosignal==1.3.1
-async-timeout==4.0.2
-attrs==23.1.0
-certifi==2023.5.7
-charset-normalizer==3.2.0
-click==8.1.4
-colorama==0.4.6
-frozenlist==1.4.0
-greenlet==2.0.2
-idna==3.4
-magic-filter==1.0.10
-multidict==6.0.4
 numpy==1.25.1
-pydantic==1.10.11
 pyxDamerauLevenshtein==1.7.1
-SQLAlchemy==2.0.19
-typing_extensions==4.7.1
-yarl==1.9.2
+SQLAlchemy==2.0.19