Move queue details to inline button
This commit is contained in:
@@ -2,7 +2,7 @@ import asyncio
|
|||||||
import json
|
import json
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from aiogram import F
|
from aiogram import F
|
||||||
from aiogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
|
from aiogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
|
||||||
from app import dp
|
from app import dp
|
||||||
from auth import is_admin_msg
|
from auth import is_admin_msg
|
||||||
from keyboards import backup_kb
|
from keyboards import backup_kb
|
||||||
@@ -247,13 +247,20 @@ async def ls(msg: Message):
|
|||||||
@dp.message(F.text == "🧾 Queue")
|
@dp.message(F.text == "🧾 Queue")
|
||||||
async def qb(msg: Message):
|
async def qb(msg: Message):
|
||||||
if is_admin_msg(msg):
|
if is_admin_msg(msg):
|
||||||
await msg.answer(format_status(), reply_markup=backup_kb)
|
kb = InlineKeyboardMarkup(
|
||||||
|
inline_keyboard=[
|
||||||
|
[InlineKeyboardButton(text="Details", callback_data="queue:details")],
|
||||||
|
]
|
||||||
|
)
|
||||||
|
await msg.answer(format_status(), reply_markup=kb)
|
||||||
|
|
||||||
|
|
||||||
@dp.message(F.text == "🧾 Queue details")
|
@dp.callback_query(F.data == "queue:details")
|
||||||
async def qd(msg: Message):
|
async def qd(cb: CallbackQuery):
|
||||||
if is_admin_msg(msg):
|
if not is_admin_msg(cb.message):
|
||||||
await msg.answer(format_details(), reply_markup=backup_kb)
|
return
|
||||||
|
await cb.answer()
|
||||||
|
await cb.message.answer(format_details(), reply_markup=backup_kb)
|
||||||
|
|
||||||
|
|
||||||
@dp.message(F.text == "▶️ Run backup")
|
@dp.message(F.text == "▶️ Run backup")
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ 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 details")],
|
[KeyboardButton(text="▶️ Run backup"), KeyboardButton(text="🧾 Queue")],
|
||||||
[KeyboardButton(text="🧪 Restic check"), KeyboardButton(text="📬 Weekly report"), KeyboardButton(text="⬅️ Назад")],
|
[KeyboardButton(text="🧪 Restic check"), KeyboardButton(text="📬 Weekly report"), KeyboardButton(text="⬅️ Назад")],
|
||||||
],
|
],
|
||||||
resize_keyboard=True,
|
resize_keyboard=True,
|
||||||
|
|||||||
Reference in New Issue
Block a user