benya/tg-admin-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use icon buttons for incidents, queue and OpenWrt actions

Browse Source
This commit is contained in:
Alex
2026-02-09 04:00:04 +03:00
parent f71c02835a
commit 783f4abd98
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
handlers/system.py
View File

@@ -245,7 +245,7 @@ async def openwrt_wan(msg: Message):
asyncio.create_task(worker()) 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): async def openwrt_clients(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -261,7 +261,7 @@ async def openwrt_clients(msg: Message):
asyncio.create_task(worker()) asyncio.create_task(worker())
@dp.message(F.text == "/openwrt_leases") @dp.message(F.text.in_({"/openwrt_leases", "🧾 Leases"}))
async def openwrt_leases(msg: Message): async def openwrt_leases(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return 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): async def incidents_summary(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -385,6 +385,7 @@ async def incidents_summary(msg: Message):
@dp.message(F.text.startswith("/incidents_diff")) @dp.message(F.text.startswith("/incidents_diff"))
@dp.message(F.text == "🆕 Diff")
async def incidents_diff(msg: Message): async def incidents_diff(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -426,6 +427,7 @@ async def incidents_diff(msg: Message):
@dp.message(F.text.startswith("/alerts_heatmap")) @dp.message(F.text.startswith("/alerts_heatmap"))
@dp.message(F.text == "🔥 Heatmap")
async def alerts_heatmap(msg: Message): async def alerts_heatmap(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -502,6 +504,7 @@ async def alerts_log(msg: Message):
@dp.message(F.text.startswith("/incidents_export")) @dp.message(F.text.startswith("/incidents_export"))
@dp.message(F.text == "📤 Export")
async def incidents_export(msg: Message): async def incidents_export(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -540,7 +543,7 @@ async def incidents_export(msg: Message):
await msg.answer_document(document=BufferedInputFile(file_bytes, filename=fname)) 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): async def backup_sla(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -585,6 +588,7 @@ async def backup_sla(msg: Message):
@dp.message(F.text.startswith("/docker_restarts")) @dp.message(F.text.startswith("/docker_restarts"))
@dp.message(F.text == "♻️ Restarts")
async def docker_restarts(msg: Message): async def docker_restarts(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -618,6 +622,7 @@ async def docker_restarts(msg: Message):
@dp.message(F.text.startswith("/openwrt_leases_diff")) @dp.message(F.text.startswith("/openwrt_leases_diff"))
@dp.message(F.text == "🔀 Leases diff")
async def openwrt_leases_diff(msg: Message): async def openwrt_leases_diff(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return
@@ -705,6 +710,7 @@ async def selftest_history(msg: Message):
@dp.message(F.text.startswith("/export_all")) @dp.message(F.text.startswith("/export_all"))
@dp.message(F.text == "📦 Export all")
async def export_all(msg: Message): async def export_all(msg: Message):
if not is_admin_msg(msg): if not is_admin_msg(msg):
return return

16
keyboards.py
View File

@@ -20,7 +20,7 @@ docker_kb = ReplyKeyboardMarkup(
keyboard=[ keyboard=[
[KeyboardButton(text="🐳 Status"), KeyboardButton(text="🧰 Arcane")], [KeyboardButton(text="🐳 Status"), KeyboardButton(text="🧰 Arcane")],
[KeyboardButton(text="🔄 Restart"), KeyboardButton(text="📜 Logs")], [KeyboardButton(text="🔄 Restart"), KeyboardButton(text="📜 Logs")],
[KeyboardButton(text="📈 Stats"), KeyboardButton(text="/docker_restarts")], [KeyboardButton(text="📈 Stats"), KeyboardButton(text="♻️ Restarts")],
[KeyboardButton(text="⬅️ Назад")], [KeyboardButton(text="⬅️ Назад")],
], ],
resize_keyboard=True, resize_keyboard=True,
@@ -38,8 +38,8 @@ backup_kb = ReplyKeyboardMarkup(
keyboard=[ keyboard=[
[KeyboardButton(text="📦 Status"), KeyboardButton(text="📦 Last snapshot")], [KeyboardButton(text="📦 Status"), KeyboardButton(text="📦 Last snapshot")],
[KeyboardButton(text="📊 Repo stats"), KeyboardButton(text="🧯 Restore help")], [KeyboardButton(text="📊 Repo stats"), KeyboardButton(text="🧯 Restore help")],
[KeyboardButton(text="▶️ Run backup"), KeyboardButton(text="🧾 Queue"), KeyboardButton(text="/queue_sla")], [KeyboardButton(text="▶️ Run backup"), KeyboardButton(text="🧾 Queue"), KeyboardButton(text="📊 Queue SLA")],
[KeyboardButton(text="/backup_sla"), KeyboardButton(text="📜 History"), KeyboardButton(text="⬅️ Назад")], [KeyboardButton(text="📉 Backup SLA"), KeyboardButton(text="📜 History"), KeyboardButton(text="⬅️ Назад")],
], ],
resize_keyboard=True, resize_keyboard=True,
) )
@@ -84,7 +84,7 @@ system_logs_kb = ReplyKeyboardMarkup(
keyboard=[ keyboard=[
[KeyboardButton(text="🧾 Audit/Incidents"), KeyboardButton(text="🔒 Security")], [KeyboardButton(text="🧾 Audit/Incidents"), KeyboardButton(text="🔒 Security")],
[KeyboardButton(text="🧩 Integrations"), KeyboardButton(text="🧰 Processes")], [KeyboardButton(text="🧩 Integrations"), KeyboardButton(text="🧰 Processes")],
[KeyboardButton(text="/incidents_summary"), KeyboardButton(text="/alerts_heatmap")], [KeyboardButton(text="📣 Summary"), KeyboardButton(text="🔥 Heatmap")],
[KeyboardButton(text="⬅️ System")], [KeyboardButton(text="⬅️ System")],
], ],
resize_keyboard=True, resize_keyboard=True,
@@ -93,8 +93,8 @@ system_logs_kb = ReplyKeyboardMarkup(
system_logs_audit_kb = ReplyKeyboardMarkup( system_logs_audit_kb = ReplyKeyboardMarkup(
keyboard=[ keyboard=[
[KeyboardButton(text="🧾 Audit"), KeyboardButton(text="📣 Incidents")], [KeyboardButton(text="🧾 Audit"), KeyboardButton(text="📣 Incidents")],
[KeyboardButton(text="/incidents_diff"), KeyboardButton(text="/incidents_export")], [KeyboardButton(text="🆕 Diff"), KeyboardButton(text="📤 Export")],
[KeyboardButton(text="/export_all"), KeyboardButton(text="/alerts_log")], [KeyboardButton(text="📦 Export all"), KeyboardButton(text="🧰 Alerts log")],
[KeyboardButton(text="⬅️ Logs")], [KeyboardButton(text="⬅️ Logs")],
], ],
resize_keyboard=True, resize_keyboard=True,
@@ -129,8 +129,8 @@ system_logs_tools_kb = ReplyKeyboardMarkup(
openwrt_kb = ReplyKeyboardMarkup( openwrt_kb = ReplyKeyboardMarkup(
keyboard=[ keyboard=[
[KeyboardButton(text="🌐 WAN fast"), KeyboardButton(text="📡 OpenWrt")], [KeyboardButton(text="🌐 WAN fast"), KeyboardButton(text="📡 OpenWrt")],
[KeyboardButton(text="/openwrt_clients"), KeyboardButton(text="/openwrt_leases")], [KeyboardButton(text="📶 Wi-Fi clients"), KeyboardButton(text="🧾 Leases")],
[KeyboardButton(text="/openwrt_leases_diff")], [KeyboardButton(text="🔀 Leases diff")],
[KeyboardButton(text="⬅️ System")], [KeyboardButton(text="⬅️ System")],
], ],
resize_keyboard=True, resize_keyboard=True,