username filtration
This commit is contained in:
@@ -6,6 +6,7 @@ from aiogram.types import Update, User as TgUser
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from db.dal import user_dal
|
||||
from bot.utils.text_sanitizer import sanitize_username, sanitize_display_name, username_for_display
|
||||
|
||||
|
||||
class ProfileSyncMiddleware(BaseMiddleware):
|
||||
@@ -24,12 +25,16 @@ class ProfileSyncMiddleware(BaseMiddleware):
|
||||
db_user = await user_dal.get_user_by_id(session, tg_user.id)
|
||||
if db_user:
|
||||
update_payload: Dict[str, Any] = {}
|
||||
if db_user.username != tg_user.username:
|
||||
update_payload["username"] = tg_user.username
|
||||
if db_user.first_name != tg_user.first_name:
|
||||
update_payload["first_name"] = tg_user.first_name
|
||||
if db_user.last_name != tg_user.last_name:
|
||||
update_payload["last_name"] = tg_user.last_name
|
||||
sanitized_username = sanitize_username(tg_user.username)
|
||||
sanitized_first_name = sanitize_display_name(tg_user.first_name)
|
||||
sanitized_last_name = sanitize_display_name(tg_user.last_name)
|
||||
|
||||
if db_user.username != sanitized_username:
|
||||
update_payload["username"] = sanitized_username
|
||||
if db_user.first_name != sanitized_first_name:
|
||||
update_payload["first_name"] = sanitized_first_name
|
||||
if db_user.last_name != sanitized_last_name:
|
||||
update_payload["last_name"] = sanitized_last_name
|
||||
|
||||
if update_payload:
|
||||
await user_dal.update_user(session, tg_user.id, update_payload)
|
||||
@@ -42,10 +47,10 @@ class ProfileSyncMiddleware(BaseMiddleware):
|
||||
panel_service = data.get("panel_service")
|
||||
if panel_service and db_user.panel_user_uuid:
|
||||
description_text = "\n".join([
|
||||
tg_user.username or "",
|
||||
tg_user.first_name or "",
|
||||
tg_user.last_name or "",
|
||||
])
|
||||
username_for_display(tg_user.username, with_at=False) if sanitized_username is not None else "",
|
||||
sanitized_first_name or "",
|
||||
sanitized_last_name or "",
|
||||
]).strip()
|
||||
await panel_service.update_user_details_on_panel(
|
||||
db_user.panel_user_uuid,
|
||||
{"description": description_text},
|
||||
@@ -62,4 +67,3 @@ class ProfileSyncMiddleware(BaseMiddleware):
|
||||
|
||||
return await handler(event, data)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user