1 files changed, 15 insertions, 6 deletions

diff --git a/handlers/user/announcements.py b/handlers/user/announcements.py
index 8f4aa43..dc85b54 100644
--- a/handlers/user/announcements.py
+++ b/handlers/user/announcements.py
@@ -16,11 +16,17 @@ router = Router(name="announcements")
 PAGE_SIZE = 5
 
 
-async def get_reply_markup(page: int, session: AsyncSession) -> InlineKeyboardMarkup:
+async def get_reply_markup(
+    page: int,
+    session: AsyncSession,
+) -> InlineKeyboardMarkup | None:
     total = await session.scalar(select(count()).select_from(Announcement))
     assert total is not None
     total_pages = ceil(total / PAGE_SIZE)
 
+    if total == 0:
+        return None
+
     page = max(0, min(page, total_pages - 1))
     query = (
         select(Announcement)
@@ -64,10 +70,13 @@ async def get_reply_markup(page: int, session: AsyncSession) -> InlineKeyboardMa
 
 @router.message(Command("announcements"))
 async def command(msg: Message, bot: Bot, session: AsyncSession) -> None:
-    await msg.answer(
-        "Выберете анонс для просмотра.",
-        reply_markup=await get_reply_markup(0, session),
-    )
+    reply_markup = await get_reply_markup(0, session)
+
+    if reply_markup is None:
+        await msg.answer("Нету анонсов для просмотра.")
+        return
+
+    await msg.answer("Выберете анонс для просмотра.", reply_markup=reply_markup)
 
 
 @router.callback_query(AnnouncePageClb.filter())
@@ -80,7 +89,7 @@ async def page(
 
     reply_markup = await get_reply_markup(callback_data.page, session)
     await clb.message.edit_text(
-        "Выберете анонс для просмотра.",
+        "Выберете анонс для просмотра:",
         reply_markup=reply_markup,
     )