Add add_user command

1 files changed, 5 insertions, 5 deletions

diff --git a/handlers/admin/new_announcement.py b/handlers/admin/new_announcement.py
index 0920c47..6aa099e 100644
--- a/handlers/admin/new_announcement.py
+++ b/handlers/admin/new_announcement.py
@@ -7,7 +7,6 @@ from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
 from aiogram.types import (
-    ContentType,
     KeyboardButton,
     Message,
     ReplyKeyboardMarkup,
@@ -67,6 +66,10 @@ async def announcement_send(
         await msg.answer("Для публикации анонса укажите текст сообщения.")
         return
 
+    announcement = Announcement(message=data.rich_text, datetime=datetime.now(UTC))
+    session.add(announcement)
+    await session.flush()
+
     status_template = "Публикация анонса...\nОпубликовано: {}"
     status_msg = await msg.answer(status_template.format(0))
 
@@ -76,9 +79,6 @@ async def announcement_send(
         except TelegramAPIError:
             pass
 
-    announcement = Announcement(message=data, datetime=datetime.now(UTC))
-    session.add(announcement)
-
     await status_msg.delete()
     await msg.answer(
         "Анонс отправлен всем пользователям",
@@ -95,7 +95,7 @@ async def announcement_cancel(msg: Message, state: FSMContext) -> None:
 
 @router.message(NewAnnouncementStates.message)
 async def announcement_message(msg: Message, bot: Bot, state: FSMContext) -> None:
-    if msg.content_type != ContentType.TEXT or msg.text is None:
+    if msg.text is None:
         await msg.answer(
             "Неверный тип сообщения.\n"
             "Бот поддерживает отправку только текстовых анонсов."