diff options
| author | Tolmachev Igor <me@igorek.dev> | 2026-03-23 18:40:40 +0300 |
|---|---|---|
| committer | Tolmachev Igor <me@igorek.dev> | 2026-03-23 18:40:40 +0300 |
| commit | d5994e732d7b1dfa469cf400132ba49c8f75315e (patch) | |
| tree | a091b84babf7829ae6193d78fb8dc090336b0f9b /handlers/admin/new_announcement.py | |
| parent | f7b7e87cffc9dcb2817b070d7a003ac234c96ec3 (diff) | |
| download | vpn_manager_bot-d5994e732d7b1dfa469cf400132ba49c8f75315e.tar.gz vpn_manager_bot-d5994e732d7b1dfa469cf400132ba49c8f75315e.zip | |
Add new_invoice command
Diffstat (limited to 'handlers/admin/new_announcement.py')
| -rw-r--r-- | handlers/admin/new_announcement.py | 9 |
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 @@ | |||
| 1 | from datetime import UTC, datetime | 1 | from datetime import UTC, datetime |
| 2 | 2 | ||
| 3 | from aiogram import Bot, F, Router | 3 | from aiogram import Bot, F, Router |
| 4 | from aiogram.enums import ButtonStyle | ||
| 4 | from aiogram.exceptions import TelegramAPIError | 5 | from aiogram.exceptions import TelegramAPIError |
| 5 | from aiogram.filters import Command | 6 | from aiogram.filters import Command |
| 6 | from aiogram.fsm.context import FSMContext | 7 | from aiogram.fsm.context import FSMContext |
| @@ -17,7 +18,7 @@ from sqlalchemy import select | |||
| 17 | from sqlalchemy.ext.asyncio import AsyncSession | 18 | from sqlalchemy.ext.asyncio import AsyncSession |
| 18 | 19 | ||
| 19 | from libs.fsm import get_data, set_data | 20 | from libs.fsm import get_data, set_data |
| 20 | from libs.msg import publish | 21 | from libs.msg import publish_announcement |
| 21 | from models import Announcement, RichText, User | 22 | from models import Announcement, RichText, User |
| 22 | 23 | ||
| 23 | router = Router(name="new_announcement") | 24 | router = 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: |
