From ae940a58e60e13214791fb774964f0673944271d Mon Sep 17 00:00:00 2001
From: kolo <kolo.is.main@gmail.com>
Date: Wed, 15 Jul 2026 01:14:14 +0300
Subject: [PATCH] fix broken emoji in remove_hours_remark_window, remove unused
 json import, add input validation to on_room_remark_input

---
 src/dutylog/application/bot/admin_dialogs/hours_management.py | 2 +-
 src/dutylog/application/bot/admin_dialogs/rooms_management.py | 4 ++++
 .../application/bot/creator_dialogs/transactions_history.py   | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/dutylog/application/bot/admin_dialogs/hours_management.py b/src/dutylog/application/bot/admin_dialogs/hours_management.py
index c398351..800ea60 100644
--- a/src/dutylog/application/bot/admin_dialogs/hours_management.py
+++ b/src/dutylog/application/bot/admin_dialogs/hours_management.py
@@ -393,7 +393,7 @@ add_hours_remark_window = Window(
 )
 
 remove_hours_remark_window = Window(
-    Const("<blockquote>� <b>Причина снятия часов</b></blockquote>\n\n<blockquote>Отправьте текст или фото с подписью.\nФото будет сохранено как описание операции.\nМожно пропустить, нажав кнопку ниже.</blockquote>"),
+    Const("<blockquote>📝 <b>Причина снятия часов</b></blockquote>\n\n<blockquote>Отправьте текст или фото с подписью.\nФото будет сохранено как описание операции.\nМожно пропустить, нажав кнопку ниже.</blockquote>"),
     MessageInput(on_remove_hours_remark_input),
     Button(
         Const("⏭ Пропустить"),
diff --git a/src/dutylog/application/bot/admin_dialogs/rooms_management.py b/src/dutylog/application/bot/admin_dialogs/rooms_management.py
index 9137da8..86224d7 100644
--- a/src/dutylog/application/bot/admin_dialogs/rooms_management.py
+++ b/src/dutylog/application/bot/admin_dialogs/rooms_management.py
@@ -332,6 +332,10 @@ async def on_room_remark_input(
     elif message.text and message.text.strip():
         remark = message.text.strip()
 
+    if not photo_file_ids and not remark:
+        await message.answer("⚠️ Пожалуйста, отправьте текст или фото с подписью")
+        return
+
     dialog_manager.dialog_data["remark"] = remark
     dialog_manager.dialog_data["photo_file_ids"] = photo_file_ids
     await dialog_manager.switch_to(AdminMenuSG.room_add_hours_confirm)
diff --git a/src/dutylog/application/bot/creator_dialogs/transactions_history.py b/src/dutylog/application/bot/creator_dialogs/transactions_history.py
index 81c9ce4..106b4d6 100644
--- a/src/dutylog/application/bot/creator_dialogs/transactions_history.py
+++ b/src/dutylog/application/bot/creator_dialogs/transactions_history.py
@@ -1,5 +1,3 @@
-import json
-
 from aiogram import Bot
 from aiogram.enums import ContentType
 from aiogram.types import CallbackQuery, InputMediaPhoto