fix UTC daily report and back button for bans

This commit is contained in:
Vladless
2025-06-03 00:35:20 +03:00
parent f62dbaa766
commit a6b4420708
2 changed files with 10 additions and 4 deletions
+1 -1
View File
@@ -267,7 +267,7 @@ async def handle_export_keys_csv(callback_query: CallbackQuery, session: AsyncSe
async def send_daily_stats_report(session: AsyncSession):
try:
today = datetime.utcnow().date()
today = datetime.now(pytz.timezone("Europe/Moscow")).date()
now_moscow = datetime.now(pytz.timezone("Europe/Moscow"))
update_time = now_moscow.strftime("%d.%m.%y %H:%M")
+9 -3
View File
@@ -1,5 +1,4 @@
import asyncio
import time
import uuid
from datetime import datetime, timedelta, timezone
from typing import Any
@@ -64,6 +63,7 @@ from .keyboard import (
build_users_balance_kb,
build_users_key_expiry_kb,
build_users_key_show_kb,
build_editor_btn
)
MOSCOW_TZ = pytz.timezone("Europe/Moscow")
@@ -1589,9 +1589,12 @@ async def handle_user_ban(
await state.set_state(BanUserStates.waiting_for_reason)
await state.update_data(tg_id=callback_data.tg_id)
kb = InlineKeyboardBuilder()
kb.row(build_editor_btn("⬅️ Назад", tg_id=callback_data.tg_id, edit=True))
await callback.message.edit_text(
text="✏️ Введите причину блокировки (или <code>-</code>, чтобы пропустить):",
reply_markup=build_admin_back_kb(f"users_edit|{callback_data.tg_id}"),
reply_markup=kb.as_markup(),
)
@@ -1603,9 +1606,12 @@ async def handle_ban_reason_input(message: Message, state: FSMContext):
user_data = await state.get_data()
tg_id = user_data.get("tg_id")
kb = InlineKeyboardBuilder()
kb.row(build_editor_btn("⬅️ Назад", tg_id=tg_id, edit=True))
await message.answer(
"⏳ Введите срок блокировки в днях (0 — навсегда):",
reply_markup=build_admin_back_kb(f"users_edit|{tg_id}"),
reply_markup=kb.as_markup(),
)