aboutsummaryrefslogtreecommitdiff
path: root/handlers/admin/new_announcement.py
diff options
context:
space:
mode:
Diffstat (limited to 'handlers/admin/new_announcement.py')
-rw-r--r--handlers/admin/new_announcement.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/handlers/admin/new_announcement.py b/handlers/admin/new_announcement.py
index 79cf8d4..0920c47 100644
--- a/handlers/admin/new_announcement.py
+++ b/handlers/admin/new_announcement.py
@@ -1,6 +1,7 @@
1from datetime import UTC, datetime 1from datetime import UTC, datetime
2 2
3from aiogram import Bot, F, Router 3from aiogram import Bot, F, Router
4from aiogram.enums import ButtonStyle
4from aiogram.exceptions import TelegramAPIError 5from aiogram.exceptions import TelegramAPIError
5from aiogram.filters import Command 6from aiogram.filters import Command
6from aiogram.fsm.context import FSMContext 7from aiogram.fsm.context import FSMContext
@@ -17,7 +18,7 @@ from sqlalchemy import select
17from sqlalchemy.ext.asyncio import AsyncSession 18from sqlalchemy.ext.asyncio import AsyncSession
18 19
19from libs.fsm import get_data, set_data 20from libs.fsm import get_data, set_data
20from libs.msg import publish 21from libs.msg import publish_announcement
21from models import Announcement, RichText, User 22from models import Announcement, RichText, User
22 23
23router = Router(name="new_announcement") 24router = Router(name="new_announcement")
@@ -42,8 +43,8 @@ async def new_announcement_command(msg: Message, state: FSMContext) -> None:
42 reply_markup=ReplyKeyboardMarkup( 43 reply_markup=ReplyKeyboardMarkup(
43 keyboard=[ 44 keyboard=[
44 [ 45 [
45 KeyboardButton(text=SEND_BUTTON), 46 KeyboardButton(text=SEND_BUTTON, style=ButtonStyle.SUCCESS),
46 KeyboardButton(text=CANCEL_BUTTON), 47 KeyboardButton(text=CANCEL_BUTTON, style=ButtonStyle.DANGER),
47 ] 48 ]
48 ], 49 ],
49 resize_keyboard=True, 50 resize_keyboard=True,
@@ -69,7 +70,7 @@ async def announcement_send(
69 status_template = "Публикация анонса...\nОпубликовано: {}" 70 status_template = "Публикация анонса...\nОпубликовано: {}"
70 status_msg = await msg.answer(status_template.format(0)) 71 status_msg = await msg.answer(status_template.format(0))
71 72
72 async for n in publish(bot, users, data.rich_text): 73 async for n in publish_announcement(bot, users, data.rich_text):
73 try: 74 try:
74 await status_msg.edit_text(status_template.format(n)) 75 await status_msg.edit_text(status_template.format(n))
75 except TelegramAPIError: 76 except TelegramAPIError: