Fixed sending a final message in /import

Removed checking if sleep_time is 0
Moved sleeping outside of try block

src/bot/helper_functions.py

@@ -18,7 +18,7 @@ states: dict[tuple[int, int], Handler] = {}
 
 def register_state(
     message: Message,
-    handler: Callable[[Message], Any],
+    handler: Handler,
 ) -> None:
     states[(message.chat.id, message.from_user.id)] = handler
 
@@ -40,9 +40,8 @@ async def delete_message(
     *,
     sleep_time: int = 0,
 ) -> bool:
+    await asyncio.sleep(sleep_time)
     try:
-        if sleep_time != 0:
-            await asyncio.sleep(sleep_time)
         await bot.delete_message(mes.chat.id, mes.id)
     except telebot.apihelper.ApiException:
         return False
@@ -86,10 +85,3 @@ async def send_deleteable_message(
         parse_mode="MarkdownV2",
         reply_markup=markup,
     )
-
-
-def escape(text: str) -> str:
-    escaped_chars = "*_~|`[("
-    for char in escaped_chars:
-        text = text.replace(char, rf"\\{char}")
-    return text

src/bot/message_handlers.py

@@ -20,7 +20,6 @@ from . import markups
 from .helper_functions import (
     base_handler,
     delete_message,
-    escape,
     get_state,
     register_state,
     send_deleteable_message,
@@ -36,7 +35,7 @@ async def get_accounts(
     mes: Message,
 ) -> None:
     await base_handler(bot, mes)
-    accounts = db.get.get_accounts(
+    accounts = db.get.get_account_names(
         engine,
         mes.from_user.id,
         to_sort=True,
@@ -210,7 +209,7 @@ async def _add_account2(
             mes.chat.id,
             "Не корректное название аккаунта",
         )
-    if text in db.get.get_accounts(engine, mes.from_user.id):
+    if text in db.get.get_account_names(engine, mes.from_user.id):
         return await send_tmp_message(
             bot, mes.chat.id, "Аккаунт с таким именем уже существует"
         )
@@ -332,7 +331,7 @@ async def get_account(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None:
     if master_pass is None:
         return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
 
-    accounts = db.get.get_accounts(
+    accounts = db.get.get_account_names(
         engine,
         mes.from_user.id,
         to_sort=True,
@@ -355,7 +354,7 @@ async def _get_account2(
     if text == "/cancel":
         return await send_tmp_message(bot, mes.chat.id, "Успешная отмена")
 
-    if text not in db.get.get_accounts(engine, mes.from_user.id):
+    if text not in db.get.get_account_names(engine, mes.from_user.id):
         return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта")
 
     bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль")
@@ -394,9 +393,9 @@ async def _get_account3(
     await send_deleteable_message(
         bot,
         mes.chat.id,
-        f"Название:\n{escape(account.name)}\n"
+        f"Название:\n`{account.name}`\n"
         f"Логин:\n`{account.login}`\nПароль:\n`{account.password}`\nНажмите "
-        "на логин или пароль, чтобы скопировать",
+        "на название, логин или пароль, чтобы скопировать",
     )
 
     del text, mes
@@ -414,7 +413,7 @@ async def delete_account(
     if master_pass is None:
         return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
 
-    accounts = db.get.get_accounts(
+    accounts = db.get.get_account_names(
         engine,
         mes.from_user.id,
         to_sort=True,
@@ -443,7 +442,7 @@ async def _delete_account2(
     if text == "/cancel":
         return await send_tmp_message(bot, mes.chat.id, "Успешная отмена")
 
-    if text not in db.get.get_accounts(engine, mes.from_user.id):
+    if text not in db.get.get_account_names(engine, mes.from_user.id):
         return await send_tmp_message(bot, mes.chat.id, "Нет такого аккаунта")
 
     bot_mes = await bot.send_message(
@@ -502,7 +501,7 @@ async def export(bot: AsyncTeleBot, engine: Engine, mes: Message) -> None:
     if master_password_from_db is None:
         return await send_tmp_message(bot, mes.chat.id, "Нет мастер пароля")
 
-    if not db.get.get_accounts(engine, mes.from_user.id):
+    if not db.get.get_account_names(engine, mes.from_user.id):
         return await send_tmp_message(bot, mes.chat.id, "Нет аккаунтов")
 
     bot_mes = await bot.send_message(mes.chat.id, "Отправьте мастер пароль")
@@ -529,7 +528,7 @@ async def _export2(
             "Не подходит мастер пароль",
         )
 
-    accounts = db.get.get_all_accounts(engine, mes.from_user.id)
+    accounts = db.get.get_accounts(engine, mes.from_user.id)
     with ProcessPoolExecutor() as pool:
         loop = asyncio.get_running_loop()
         tasks = []
@@ -651,11 +650,12 @@ async def _import3(
             failed.append(account.name)
 
     if failed:
-        mes_text = "Не удалось добавить:\n" + "\n".join(failed)
+        await send_deleteable_message(
+            bot, mes.chat.id, "Не удалось добавить:\n" + "\n".join(failed)
+        )
     else:
-        mes_text = "Успех"
+        await send_tmp_message(bot, mes.chat.id, "Успех")
 
-    await send_tmp_message(bot, mes.chat.id, mes_text, 10)
     del text, mes, accounts
     gc.collect()
 

src/db/get.py

@@ -17,7 +17,7 @@ def get_master_pass(
     return result
 
 
-def get_accounts(
+def get_account_names(
     engine: Engine,
     user_id: int,
     *,
@@ -34,7 +34,7 @@ def get_accounts(
     return result
 
 
-def get_all_accounts(engine: Engine, user_id: int) -> list[models.Account]:
+def get_accounts(engine: Engine, user_id: int) -> list[models.Account]:
     """Returns a list of accounts of a user"""
     statement = sqlmodel.select(models.Account).where(
         models.Account.user_id == user_id,