Change MARKDOWN to MARKDOWN_V2

src/bot.py

@@ -81,14 +81,17 @@ async def request(self, method, data=None, *args, **kwargs):
         return result
 
 
-tg = TellerBot(None, loop=asyncio.get_event_loop(), validate_token=False)
+tg = TellerBot("0:", loop=asyncio.get_event_loop(), validate_token=False)
 dp = Dispatcher(tg)
 
 
 def setup():
     """Set API token from config to bot and setup dispatcher."""
     with open(config.TOKEN_FILENAME, "r") as token_file:
-        tg._ctx_token.set(token_file.read().strip())
+        token = token_file.read().strip()
+        api.check_token(token)
+        tg._ctx_token.set(token)
+        tg.id = int(token.split(":")[0])
 
     dp.storage = MongoStorage()
 

src/escrow/blockchain/__init__.py

@@ -240,9 +240,11 @@ async def _confirmation_callback(
             escrow_user = offer["counter"]
             other_user = offer["init"]
 
-        answer = i18n(
-            "transaction_passed {currency}", locale=escrow_user["locale"]
-        ).format(currency=offer[new_currency])
+        answer = markdown.escape_md(
+            i18n("transaction_passed {currency}", locale=escrow_user["locale"]).format(
+                currency=offer[new_currency]
+            )
+        )
         await tg.send_message(escrow_user["id"], answer)
         is_confirmed = await create_task(self.is_block_confirmed(block_num, op))
         if is_confirmed:
@@ -260,19 +262,21 @@ async def _confirmation_callback(
                 i18n("transaction_confirmed", locale=other_user["locale"]),
                 self.trx_url(trx_id),
             )
-            answer += "\n" + i18n(
-                "send {amount} {currency} {address}", locale=other_user["locale"]
-            ).format(
-                amount=offer[f"sum_{new_currency}"],
-                currency=offer[new_currency],
-                address=markdown.escape_md(escrow_user["receive_address"]),
+            answer += "\n" + markdown.escape_md(
+                i18n(
+                    "send {amount} {currency} {address}", locale=other_user["locale"]
+                ).format(
+                    amount=offer[f"sum_{new_currency}"],
+                    currency=offer[new_currency],
+                    address=escrow_user["receive_address"],
+                )
             )
-            answer += "."
+            answer += r"\."
             await tg.send_message(
                 other_user["id"],
                 answer,
                 reply_markup=keyboard,
-                parse_mode=ParseMode.MARKDOWN,
+                parse_mode=ParseMode.MARKDOWN_V2,
             )
             return True
 
@@ -327,7 +331,7 @@ async def _refund_callback(
             answer += f"\n• {message_point}"
 
         answer += "\n\n" + i18n("refund_promise", locale=user["locale"])
-        await tg.send_message(user["id"], answer, parse_mode=ParseMode.MARKDOWN)
+        await tg.send_message(user["id"], answer)
         is_confirmed = await create_task(self.is_block_confirmed(block_num, op))
         await database.escrow.update_one(
             {"_id": offer["_id"]}, {"$set": {"transaction_time": time()}}
@@ -343,9 +347,11 @@ async def _refund_callback(
                 i18n("transaction_refunded", locale=user["locale"]), trx_url
             )
         else:
-            answer = i18n("transaction_not_confirmed", locale=user["locale"])
-        answer += " " + i18n("try_again", locale=user["locale"])
-        await tg.send_message(user["id"], answer, parse_mode=ParseMode.MARKDOWN)
+            answer = i18n(
+                "transaction_not_confirmed", locale=user["locale"], escape_md=True
+            )
+        answer += " " + i18n("try_again", locale=user["locale"], escape_md=True)
+        await tg.send_message(user["id"], answer, parse_mode=ParseMode.MARKDOWN_V2)
 
 
 class StreamBlockchain(BaseBlockchain):

src/handlers/__init__.py

@@ -86,15 +86,15 @@ async def errors_handler(update: types.Update, exception: Exception):
         else:
             await tg.send_message(
                 exceptions_chat_id,
-                "Error handling {} {} from {} ({}) in chat {}\n{}".format(
+                r"Error handling {} {} from {} \({}\) in chat {}\n{}".format(
                     update_type,
                     update.update_id,
                     markdown.link(from_user.mention, from_user.url),
                     from_user.id,
                     chat_id,
                     markdown.code(traceback.format_exc(limit=-3)),
                 ),
-                parse_mode=types.ParseMode.MARKDOWN,
+                parse_mode=types.ParseMode.MARKDOWN_V2,
             )
         await tg.send_message(
             chat_id, i18n("unexpected_error"), reply_markup=start_keyboard(),

src/handlers/base.py

@@ -175,10 +175,12 @@ async def orders_list(
                     order["buy"],
                 )
 
+        line = markdown.escape_md(line)
+
         if user_id is not None and order["user_id"] == user_id:
             line = f"*{line}*"
 
-        lines.append(f"{i + 1}. {line}")
+        lines.append(fr"{i + 1}\. {line}")
         buttons.append(
             types.InlineKeyboardButton(
                 "{}".format(i + 1), callback_data="get_order {}".format(order["_id"])
@@ -194,22 +196,21 @@ async def orders_list(
     keyboard.add(*buttons)
     keyboard.row(*inline_orders_buttons)
 
-    text = (
-        "\\["
+    text = markdown.escape_md(
+        "["
         + i18n("page {number} {total}").format(
             number=math.ceil(start / config.ORDERS_COUNT) + 1,
             total=math.ceil(quantity / config.ORDERS_COUNT),
         )
         + "]\n"
-        + "\n".join(lines)
-    )
+    ) + "\n".join(lines)
 
     if message_id is None:
         await tg.send_message(
             chat_id,
             text,
             reply_markup=keyboard,
-            parse_mode=types.ParseMode.MARKDOWN,
+            parse_mode=types.ParseMode.MARKDOWN_V2,
             disable_web_page_preview=True,
         )
     else:
@@ -218,7 +219,7 @@ async def orders_list(
             chat_id,
             message_id,
             reply_markup=keyboard,
-            parse_mode=types.ParseMode.MARKDOWN,
+            parse_mode=types.ParseMode.MARKDOWN_V2,
             disable_web_page_preview=True,
         )
 
@@ -295,17 +296,21 @@ async def show_order(
         header += markdown.bold(i18n("archived", locale=locale)) + "\n"
 
     creator = await database.users.find_one({"id": order["user_id"]})
-    header += "{} ({}) ".format(
+    header += r"{} \({}\) ".format(
         markdown.link(creator["mention"], types.User(id=creator["id"]).url),
         markdown.code(creator["id"]),
     )
     if invert:
         act = i18n("sells {sell_currency} {buy_currency}", locale=locale)
     else:
         act = i18n("buys {buy_currency} {sell_currency}", locale=locale)
-    header += act.format(buy_currency=order["buy"], sell_currency=order["sell"]) + "\n"
+    header += (
+        markdown.escape_md(
+            act.format(buy_currency=order["buy"], sell_currency=order["sell"])
+        )
+        + "\n"
+    )
 
-    lines = [header]
     field_names = {
         "sum_buy": i18n("buy_amount", locale=locale),
         "sum_sell": i18n("sell_amount", locale=locale),
@@ -355,6 +360,8 @@ async def show_order(
         )
     )
 
+    lines = []
+
     if edit and creator["id"] == user_id:
         buttons = []
         for i, (field, value) in enumerate(lines_format.items()):
@@ -449,15 +456,15 @@ async def show_order(
             )
         )
 
-    answer = "\n".join(lines)
+    answer = "\n".join((header, *map(markdown.escape_md, lines)))
 
     if message_id is not None:
         await tg.edit_message_text(
             answer,
             chat_id,
             message_id,
             reply_markup=keyboard,
-            parse_mode=types.ParseMode.MARKDOWN,
+            parse_mode=types.ParseMode.MARKDOWN_V2,
             disable_web_page_preview=True,
         )
         if new_edit_msg is not None:
@@ -478,6 +485,6 @@ async def show_order(
             chat_id,
             answer,
             reply_markup=keyboard,
-            parse_mode=types.ParseMode.MARKDOWN,
+            parse_mode=types.ParseMode.MARKDOWN_V2,
             disable_web_page_preview=True,
         )