4 files changed, 16 insertions, 16 deletions

diff --git a/handlers/admin/add_user.py b/handlers/admin/add_user.py
index b9b8604..c58af2b 100644
--- a/handlers/admin/add_user.py
+++ b/handlers/admin/add_user.py
@@ -34,7 +34,7 @@ CANCEL_BUTTON = "Отменить добавление"
 
 
 @router.message(Command("add_user"))
-async def add_user_command(msg: Message, state: FSMContext) -> None:
+async def command(msg: Message, state: FSMContext) -> None:
     await msg.answer(
         "Выберете пользователя которого хотите добавить.",
         reply_markup=ReplyKeyboardMarkup(
@@ -58,7 +58,7 @@ async def add_user_command(msg: Message, state: FSMContext) -> None:
 
 
 @router.message(AddUserStates(), F.text == CANCEL_BUTTON)
-async def add_user_cancel(msg: Message, state: FSMContext) -> None:
+async def cancel(msg: Message, state: FSMContext) -> None:
     await msg.answer(
         "Добавление пользователей отменено",
         reply_markup=ReplyKeyboardRemove(),
@@ -67,7 +67,7 @@ async def add_user_cancel(msg: Message, state: FSMContext) -> None:
 
 
 @router.message(AddUserStates.user_id)
-async def add_user_user_id(msg: Message, state: FSMContext) -> None:
+async def set_user_id(msg: Message, state: FSMContext) -> None:
     if msg.users_shared is None:
         await msg.answer("Вы должны воспользоваться кнопкой ниже.")
         return
@@ -80,7 +80,7 @@ async def add_user_user_id(msg: Message, state: FSMContext) -> None:
 
 
 @router.message(AddUserStates.vpn_link)
-async def add_user_vpn_link(
+async def set_vpn_link(
     msg: Message,
     state: FSMContext,
     session: AsyncSession,
diff --git a/handlers/admin/new_announcement.py b/handlers/admin/new_announcement.py
index 6aa099e..e8aacb0 100644
--- a/handlers/admin/new_announcement.py
+++ b/handlers/admin/new_announcement.py
@@ -36,7 +36,7 @@ CANCEL_BUTTON = "Отменить создание"
 
 
 @router.message(Command("new_announcement"))
-async def new_announcement_command(msg: Message, state: FSMContext) -> None:
+async def command(msg: Message, state: FSMContext) -> None:
     await msg.answer(
         "Укажите сообщение для анонса.",
         reply_markup=ReplyKeyboardMarkup(
@@ -53,7 +53,7 @@ async def new_announcement_command(msg: Message, state: FSMContext) -> None:
 
 
 @router.message(NewAnnouncementStates.message, F.text == SEND_BUTTON)
-async def announcement_send(
+async def publish(
     msg: Message,
     bot: Bot,
     state: FSMContext,
@@ -88,13 +88,13 @@ async def announcement_send(
 
 
 @router.message(NewAnnouncementStates.message, F.text == CANCEL_BUTTON)
-async def announcement_cancel(msg: Message, state: FSMContext) -> None:
+async def cancel(msg: Message, state: FSMContext) -> None:
     await msg.answer("Создание анонса отменено", reply_markup=ReplyKeyboardRemove())
     await state.clear()
 
 
 @router.message(NewAnnouncementStates.message)
-async def announcement_message(msg: Message, bot: Bot, state: FSMContext) -> None:
+async def set_message(msg: Message, bot: Bot, state: FSMContext) -> None:
     if msg.text is None:
         await msg.answer(
             "Неверный тип сообщения.\n"
diff --git a/handlers/admin/new_invoice.py b/handlers/admin/new_invoice.py
index 0427d90..43e47cb 100644
--- a/handlers/admin/new_invoice.py
+++ b/handlers/admin/new_invoice.py
@@ -36,7 +36,7 @@ CANCEL_BUTTON = "Отменить создание"
 
 
 @router.message(Command("new_invoice"))
-async def new_invoice_command(msg: Message, state: FSMContext) -> None:
+async def command(msg: Message, state: FSMContext) -> None:
     await msg.answer(
         "Укажите сообщение для создания счёта",
         reply_markup=ReplyKeyboardMarkup(
@@ -53,7 +53,7 @@ async def new_invoice_command(msg: Message, state: FSMContext) -> None:
 
 
 @router.message(NewInvoiceStates.message, F.text == CREATE_BUTTON)
-async def invoice_send(
+async def create(
     msg: Message,
     bot: Bot,
     state: FSMContext,
@@ -82,19 +82,19 @@ async def invoice_send(
     await status_msg.delete()
     await msg.answer(
         "Счёт отправлен всем пользователям",
-        # reply_markup=ReplyKeyboardRemove(),
+        reply_markup=ReplyKeyboardRemove(),
     )
-    # await state.clear()
+    await state.clear()
 
 
 @router.message(NewInvoiceStates.message, F.text == CANCEL_BUTTON)
-async def invoice_cancel(msg: Message, state: FSMContext) -> None:
+async def cancel(msg: Message, state: FSMContext) -> None:
     await msg.answer("Создание счёта отменено", reply_markup=ReplyKeyboardRemove())
     await state.clear()
 
 
 @router.message(NewInvoiceStates.message)
-async def invoice_message(msg: Message, bot: Bot, state: FSMContext) -> None:
+async def set_message(msg: Message, bot: Bot, state: FSMContext) -> None:
     if msg.text is None:
         await msg.answer(
             "Неверный тип сообщения.\n"
diff --git a/libs/msg.py b/libs/msg.py
index 05bddfc..2e9e16b 100644
--- a/libs/msg.py
+++ b/libs/msg.py
@@ -23,7 +23,7 @@ async def publish_announcement(
             except TelegramRetryAfter as e:
                 await asyncio.sleep(e.retry_after + 1)
             except TelegramAPIError:
-                await asyncio.sleep(5)
+                await asyncio.sleep(0.2)
 
         yield n
 
@@ -55,6 +55,6 @@ async def send_invoice(
             except TelegramRetryAfter as e:
                 await asyncio.sleep(e.retry_after + 1)
             except TelegramAPIError:
-                await asyncio.sleep(5)
+                await asyncio.sleep(0.2)
 
         yield n