diff --git a/database.py b/database.py
index bb934f91..e226f8d5 100644
--- a/database.py
+++ b/database.py
@@ -776,9 +776,7 @@ async def get_referral_stats(referrer_tg_id: int):
referrer_tg_id,
)
- logger.debug(
- f"Получена общая сумма бонусов от рефералов: {total_referral_bonus}"
- )
+ logger.debug(f"Получена общая сумма бонусов от рефералов: {total_referral_bonus}")
return {
"total_referrals": total_referrals,
diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py
index 2ec4763b..3ab75926 100644
--- a/handlers/keys/key_management.py
+++ b/handlers/keys/key_management.py
@@ -189,11 +189,7 @@ async def create_key(
builder = InlineKeyboardBuilder()
for country in countries:
callback_data = f"select_country|{country}|{expiry_time.isoformat()}"
- builder.row(
- InlineKeyboardButton(
- text=country, callback_data=callback_data
- )
- )
+ builder.row(InlineKeyboardButton(text=country, callback_data=callback_data))
logger.info(f"[Country Selection] Добавлена кнопка для страны: {country} с callback_data: {callback_data}")
builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="profile"))
@@ -363,9 +359,7 @@ async def finalize_key_creation(
)
if not existing_key:
break
- logger.warning(
- f"Key name '{key_name}' already exists for user {tg_id}. Generating a new one."
- )
+ logger.warning(f"Key name '{key_name}' already exists for user {tg_id}. Generating a new one.")
client_id = str(uuid.uuid4())
email = key_name.lower()
diff --git a/handlers/keys/key_utils.py b/handlers/keys/key_utils.py
index 0935b478..f59b3072 100644
--- a/handlers/keys/key_utils.py
+++ b/handlers/keys/key_utils.py
@@ -73,9 +73,7 @@ async def create_client_on_server(
server_name = server_info.get("server_name", "unknown")
if not inbound_id:
- logger.warning(
- f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск."
- )
+ logger.warning(f"INBOUND_ID отсутствует для сервера {server_name}. Пропуск.")
return
if SUPERNODE:
@@ -103,7 +101,6 @@ async def create_client_on_server(
await asyncio.sleep(0.7)
-
async def renew_key_in_cluster(cluster_id, email, client_id, new_expiry_time, total_gb):
try:
servers = await get_servers_from_db()
diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py
index 751317c3..7b8261df 100644
--- a/handlers/keys/keys.py
+++ b/handlers/keys/keys.py
@@ -114,9 +114,7 @@ def build_keys_response(records):
if expiry_time:
expiry_date_full = datetime.fromtimestamp(expiry_time / 1000, tz=moscow_tz)
- formatted_date_full = expiry_date_full.strftime(
- "до %d %B %Y года, %H:%M"
- ).lower()
+ formatted_date_full = expiry_date_full.strftime("до %d %B %Y года, %H:%M").lower()
formatted_date_short = expiry_date_full.strftime("до %d %B").lower()
else:
@@ -124,23 +122,16 @@ def build_keys_response(records):
formatted_date_short = "без срока действия"
button_text = f"{key_name} ({formatted_date_short})"
- builder.row(
- InlineKeyboardButton(
- text=button_text, callback_data=f"view_key|{key_name}"
- )
- )
+ builder.row(InlineKeyboardButton(text=button_text, callback_data=f"view_key|{key_name}"))
response_message += f"• {key_name} ({formatted_date_full})\n"
else:
response_message = (
- "🔑 У вас пока нет подписок.\n\n"
- "Вы можете создать новую подписку для подключения устройств."
+ "🔑 У вас пока нет подписок.\n\nВы можете создать новую подписку для подключения устройств."
)
- builder.row(
- InlineKeyboardButton(text="➕ Добавить подписку", callback_data="create_key")
- )
+ builder.row(InlineKeyboardButton(text="➕ Добавить подписку", callback_data="create_key"))
builder.row(InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"))
inline_keyboard = builder.as_markup()
@@ -380,9 +371,8 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery, sessio
months = plan_details["months"]
price = plan_details["price"]
discount = DISCOUNTS.get(plan_id, 0)
- button_text = (
- f'📅 {months} месяц{"а" if months > 1 else ""} ({price} руб.)'
- + (f' {discount}% скидка' if discount > 0 else "")
+ button_text = f"📅 {months} месяц{'а' if months > 1 else ''} ({price} руб.)" + (
+ f" {discount}% скидка" if discount > 0 else ""
)
builder.row(
InlineKeyboardButton(
@@ -391,11 +381,7 @@ async def process_callback_renew_key(callback_query: types.CallbackQuery, sessio
)
)
- builder.row(
- InlineKeyboardButton(
- text="🔙 Назад", callback_data="view_keys"
- )
- )
+ builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="view_keys"))
balance = await get_balance(tg_id)
diff --git a/handlers/notifications.py b/handlers/notifications.py
index 1a242e2b..c01bb371 100644
--- a/handlers/notifications.py
+++ b/handlers/notifications.py
@@ -187,7 +187,6 @@ async def process_10h_record(record, bot, conn):
await send_renewal_notification(bot, tg_id, email, message, conn, record["client_id"], "notified")
-
async def notify_24h_keys(
bot: Bot,
conn: asyncpg.Connection,
@@ -327,12 +326,7 @@ async def notify_inactive_trial_users(bot: Bot, conn: asyncpg.Connection):
username = user["username"]
first_name = user["first_name"]
last_name = user["last_name"]
- display_name = (
- username
- or first_name
- or last_name
- or "Пользователь"
- )
+ display_name = username or first_name or last_name or "Пользователь"
try:
can_notify = await check_notification_time(tg_id, "inactive_trial", hours=24, session=conn)
@@ -407,9 +401,7 @@ async def handle_expired_keys(bot: Bot, conn: asyncpg.Connection, current_time:
for record in expired_keys:
try:
await delete_key_from_cluster(record["server_id"], record["email"], record["email"])
- await conn.execute(
- "DELETE FROM keys WHERE client_id = $1", record["client_id"]
- )
+ await conn.execute("DELETE FROM keys WHERE client_id = $1", record["client_id"])
logger.info(f"Удалён истёкший ключ {record['client_id']} пользователя {record['tg_id']}.")
except Exception as e:
logger.error(f"Ошибка при удалении истёкшего ключа {record['client_id']}: {e}")
@@ -468,7 +460,7 @@ async def process_key(record, bot, conn):
await bot.send_photo(
tg_id,
photo=BufferedInputFile(image_file.read(), filename="notify_expired.jpg"),
- caption = KEY_RENEWED.format(email=email),
+ caption=KEY_RENEWED.format(email=email),
reply_markup=keyboard,
)
else: