From 783f4abd981be832da48056bcfd5158e494e6c01 Mon Sep 17 00:00:00 2001 From: benya Date: Mon, 9 Feb 2026 04:00:04 +0300 Subject: [PATCH] Use icon buttons for incidents, queue and OpenWrt actions --- handlers/system.py | 14 ++++++++++---- keyboards.py | 16 ++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/handlers/system.py b/handlers/system.py index 207c3bf..37455c9 100644 --- a/handlers/system.py +++ b/handlers/system.py @@ -245,7 +245,7 @@ async def openwrt_wan(msg: Message): asyncio.create_task(worker()) -@dp.message(F.text == "/openwrt_clients") +@dp.message(F.text.in_({"/openwrt_clients", "๐Ÿ“ถ Wi-Fi clients"})) async def openwrt_clients(msg: Message): if not is_admin_msg(msg): return @@ -261,7 +261,7 @@ async def openwrt_clients(msg: Message): asyncio.create_task(worker()) -@dp.message(F.text == "/openwrt_leases") +@dp.message(F.text.in_({"/openwrt_leases", "๐Ÿงพ Leases"})) async def openwrt_leases(msg: Message): if not is_admin_msg(msg): return @@ -346,7 +346,7 @@ async def incidents_entry(msg: Message): ) -@dp.message(F.text == "/incidents_summary") +@dp.message(F.text.in_({"/incidents_summary", "๐Ÿ“ฃ Summary"})) async def incidents_summary(msg: Message): if not is_admin_msg(msg): return @@ -385,6 +385,7 @@ async def incidents_summary(msg: Message): @dp.message(F.text.startswith("/incidents_diff")) +@dp.message(F.text == "๐Ÿ†• Diff") async def incidents_diff(msg: Message): if not is_admin_msg(msg): return @@ -426,6 +427,7 @@ async def incidents_diff(msg: Message): @dp.message(F.text.startswith("/alerts_heatmap")) +@dp.message(F.text == "๐Ÿ”ฅ Heatmap") async def alerts_heatmap(msg: Message): if not is_admin_msg(msg): return @@ -502,6 +504,7 @@ async def alerts_log(msg: Message): @dp.message(F.text.startswith("/incidents_export")) +@dp.message(F.text == "๐Ÿ“ค Export") async def incidents_export(msg: Message): if not is_admin_msg(msg): return @@ -540,7 +543,7 @@ async def incidents_export(msg: Message): await msg.answer_document(document=BufferedInputFile(file_bytes, filename=fname)) -@dp.message(F.text == "/backup_sla") +@dp.message(F.text.in_({"/backup_sla", "๐Ÿ“‰ Backup SLA"})) async def backup_sla(msg: Message): if not is_admin_msg(msg): return @@ -585,6 +588,7 @@ async def backup_sla(msg: Message): @dp.message(F.text.startswith("/docker_restarts")) +@dp.message(F.text == "โ™ป๏ธ Restarts") async def docker_restarts(msg: Message): if not is_admin_msg(msg): return @@ -618,6 +622,7 @@ async def docker_restarts(msg: Message): @dp.message(F.text.startswith("/openwrt_leases_diff")) +@dp.message(F.text == "๐Ÿ”€ Leases diff") async def openwrt_leases_diff(msg: Message): if not is_admin_msg(msg): return @@ -705,6 +710,7 @@ async def selftest_history(msg: Message): @dp.message(F.text.startswith("/export_all")) +@dp.message(F.text == "๐Ÿ“ฆ Export all") async def export_all(msg: Message): if not is_admin_msg(msg): return diff --git a/keyboards.py b/keyboards.py index 66e0d9b..e680276 100644 --- a/keyboards.py +++ b/keyboards.py @@ -20,7 +20,7 @@ docker_kb = ReplyKeyboardMarkup( keyboard=[ [KeyboardButton(text="๐Ÿณ Status"), KeyboardButton(text="๐Ÿงฐ Arcane")], [KeyboardButton(text="๐Ÿ”„ Restart"), KeyboardButton(text="๐Ÿ“œ Logs")], - [KeyboardButton(text="๐Ÿ“ˆ Stats"), KeyboardButton(text="/docker_restarts")], + [KeyboardButton(text="๐Ÿ“ˆ Stats"), KeyboardButton(text="โ™ป๏ธ Restarts")], [KeyboardButton(text="โฌ…๏ธ ะะฐะทะฐะด")], ], resize_keyboard=True, @@ -38,8 +38,8 @@ backup_kb = ReplyKeyboardMarkup( keyboard=[ [KeyboardButton(text="๐Ÿ“ฆ Status"), KeyboardButton(text="๐Ÿ“ฆ Last snapshot")], [KeyboardButton(text="๐Ÿ“Š Repo stats"), KeyboardButton(text="๐Ÿงฏ Restore help")], - [KeyboardButton(text="โ–ถ๏ธ Run backup"), KeyboardButton(text="๐Ÿงพ Queue"), KeyboardButton(text="/queue_sla")], - [KeyboardButton(text="/backup_sla"), KeyboardButton(text="๐Ÿ“œ History"), KeyboardButton(text="โฌ…๏ธ ะะฐะทะฐะด")], + [KeyboardButton(text="โ–ถ๏ธ Run backup"), KeyboardButton(text="๐Ÿงพ Queue"), KeyboardButton(text="๐Ÿ“Š Queue SLA")], + [KeyboardButton(text="๐Ÿ“‰ Backup SLA"), KeyboardButton(text="๐Ÿ“œ History"), KeyboardButton(text="โฌ…๏ธ ะะฐะทะฐะด")], ], resize_keyboard=True, ) @@ -84,7 +84,7 @@ system_logs_kb = ReplyKeyboardMarkup( keyboard=[ [KeyboardButton(text="๐Ÿงพ Audit/Incidents"), KeyboardButton(text="๐Ÿ”’ Security")], [KeyboardButton(text="๐Ÿงฉ Integrations"), KeyboardButton(text="๐Ÿงฐ Processes")], - [KeyboardButton(text="/incidents_summary"), KeyboardButton(text="/alerts_heatmap")], + [KeyboardButton(text="๐Ÿ“ฃ Summary"), KeyboardButton(text="๐Ÿ”ฅ Heatmap")], [KeyboardButton(text="โฌ…๏ธ System")], ], resize_keyboard=True, @@ -93,8 +93,8 @@ system_logs_kb = ReplyKeyboardMarkup( system_logs_audit_kb = ReplyKeyboardMarkup( keyboard=[ [KeyboardButton(text="๐Ÿงพ Audit"), KeyboardButton(text="๐Ÿ“ฃ Incidents")], - [KeyboardButton(text="/incidents_diff"), KeyboardButton(text="/incidents_export")], - [KeyboardButton(text="/export_all"), KeyboardButton(text="/alerts_log")], + [KeyboardButton(text="๐Ÿ†• Diff"), KeyboardButton(text="๐Ÿ“ค Export")], + [KeyboardButton(text="๐Ÿ“ฆ Export all"), KeyboardButton(text="๐Ÿงฐ Alerts log")], [KeyboardButton(text="โฌ…๏ธ Logs")], ], resize_keyboard=True, @@ -129,8 +129,8 @@ system_logs_tools_kb = ReplyKeyboardMarkup( openwrt_kb = ReplyKeyboardMarkup( keyboard=[ [KeyboardButton(text="๐ŸŒ WAN fast"), KeyboardButton(text="๐Ÿ“ก OpenWrt")], - [KeyboardButton(text="/openwrt_clients"), KeyboardButton(text="/openwrt_leases")], - [KeyboardButton(text="/openwrt_leases_diff")], + [KeyboardButton(text="๐Ÿ“ถ Wi-Fi clients"), KeyboardButton(text="๐Ÿงพ Leases")], + [KeyboardButton(text="๐Ÿ”€ Leases diff")], [KeyboardButton(text="โฌ…๏ธ System")], ], resize_keyboard=True,