Unify admin callback checks and log queue job failures
This commit is contained in:
@@ -2,7 +2,7 @@ import asyncio
|
||||
from datetime import datetime
|
||||
from aiogram import F
|
||||
from aiogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
|
||||
from app import dp, cfg
|
||||
from app import dp, cfg, ADMIN_IDS
|
||||
from auth import is_admin_msg
|
||||
from keyboards import docker_kb, arcane_kb
|
||||
from services.arcane import list_projects, restart_project, set_project_state, get_project_details
|
||||
@@ -115,7 +115,7 @@ async def arcane_refresh(msg: Message):
|
||||
|
||||
@dp.callback_query(F.data == "arcane:refresh")
|
||||
async def arcane_refresh_inline(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
await cb.answer()
|
||||
await cmd_arcane_projects(cb.message, edit=True)
|
||||
@@ -123,7 +123,7 @@ async def arcane_refresh_inline(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:page:"))
|
||||
async def arcane_page(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
try:
|
||||
page = int(cb.data.split(":", 2)[2])
|
||||
@@ -141,7 +141,7 @@ async def arcane_page(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:restart:"))
|
||||
async def arcane_restart(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
|
||||
_, _, pid = cb.data.split(":", 2)
|
||||
@@ -160,7 +160,7 @@ async def arcane_restart(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:details:"))
|
||||
async def arcane_details(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
|
||||
_, _, pid = cb.data.split(":", 2)
|
||||
@@ -208,7 +208,7 @@ async def arcane_details(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:deploy:"))
|
||||
async def arcane_deploy_status(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
|
||||
_, _, pid = cb.data.split(":", 2)
|
||||
@@ -254,7 +254,7 @@ async def arcane_deploy_status(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:up:"))
|
||||
async def arcane_up(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
|
||||
_, _, pid = cb.data.split(":", 2)
|
||||
@@ -273,7 +273,7 @@ async def arcane_up(cb: CallbackQuery):
|
||||
|
||||
@dp.callback_query(F.data.startswith("arcane:down:"))
|
||||
async def arcane_down(cb: CallbackQuery):
|
||||
if cb.from_user.id != cfg["telegram"]["admin_id"]:
|
||||
if cb.from_user.id not in ADMIN_IDS:
|
||||
return
|
||||
|
||||
_, _, pid = cb.data.split(":", 2)
|
||||
|
||||
Reference in New Issue
Block a user