mirror of
https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git
synced 2026-02-28 07:11:37 +00:00
1f0fef114b
- Add ContextVarsMiddleware for automatic user_id/chat_id/username binding via structlog contextvars (aiogram) and http_method/http_path (FastAPI) - Use bound_contextvars() context manager instead of clear_contextvars() to safely restore previous state instead of wiping all context - Register ContextVarsMiddleware as outermost middleware (before GlobalError) so all error logs include user context - Replace structlog.get_logger() with structlog.get_logger(__name__) across 270 calls in 265 files for meaningful logger names - Switch wrapper_class from BoundLogger to make_filtering_bound_logger() for pre-processor level filtering (performance optimization) - Migrate 1411 %-style positional arg logger calls to structlog kwargs style across 161 files via AST script - Migrate log_rotation_service.py from stdlib logging to structlog - Add payment module prefixes to TelegramNotifierProcessor.IGNORED_LOGGER_PREFIXES and ExcludePaymentFilter.PAYMENT_MODULES to prevent payment data leaking to Telegram notifications and general log files - Fix LoggingMiddleware: add from_user null-safety for channel posts, switch time.time() to time.monotonic() for duration measurement - Remove duplicate logger assignments in purchase.py, config.py, inline.py, and admin/payments.py
68 lines
1.8 KiB
Python
68 lines
1.8 KiB
Python
import structlog
|
|
from sqlalchemy import delete, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database.models import SentNotification
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def notification_sent(
|
|
db: AsyncSession,
|
|
user_id: int,
|
|
subscription_id: int,
|
|
notification_type: str,
|
|
days_before: int | None = None,
|
|
) -> bool:
|
|
result = await db.execute(
|
|
select(SentNotification)
|
|
.where(
|
|
SentNotification.user_id == user_id,
|
|
SentNotification.subscription_id == subscription_id,
|
|
SentNotification.notification_type == notification_type,
|
|
SentNotification.days_before == days_before,
|
|
)
|
|
.limit(1)
|
|
)
|
|
return result.scalars().first() is not None
|
|
|
|
|
|
async def record_notification(
|
|
db: AsyncSession,
|
|
user_id: int,
|
|
subscription_id: int,
|
|
notification_type: str,
|
|
days_before: int | None = None,
|
|
) -> None:
|
|
already_exists = await notification_sent(db, user_id, subscription_id, notification_type, days_before)
|
|
if already_exists:
|
|
return
|
|
notification = SentNotification(
|
|
user_id=user_id,
|
|
subscription_id=subscription_id,
|
|
notification_type=notification_type,
|
|
days_before=days_before,
|
|
)
|
|
db.add(notification)
|
|
await db.commit()
|
|
|
|
|
|
async def clear_notifications(db: AsyncSession, subscription_id: int) -> None:
|
|
await db.execute(delete(SentNotification).where(SentNotification.subscription_id == subscription_id))
|
|
await db.commit()
|
|
|
|
|
|
async def clear_notification_by_type(
|
|
db: AsyncSession,
|
|
subscription_id: int,
|
|
notification_type: str,
|
|
) -> None:
|
|
await db.execute(
|
|
delete(SentNotification).where(
|
|
SentNotification.subscription_id == subscription_id,
|
|
SentNotification.notification_type == notification_type,
|
|
)
|
|
)
|
|
await db.commit()
|