From e61aa17a7214557be29bcf1160c96f114bd801a0 Mon Sep 17 00:00:00 2001 From: profitroll Date: Fri, 16 Dec 2022 12:04:57 +0100 Subject: [PATCH] Improved logging and changed message --- modules/handlers/group_join.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/handlers/group_join.py b/modules/handlers/group_join.py index 87209d8..4ea326e 100644 --- a/modules/handlers/group_join.py +++ b/modules/handlers/group_join.py @@ -1,6 +1,7 @@ from app import app, isAnAdmin from pyrogram.types import ChatPermissions, InlineKeyboardMarkup, InlineKeyboardButton from modules.utils import configGet, locale +from modules.logging import logWrite from classes.holo_user import HoloUser # Filter users on join ========================================================================================================= @@ -12,13 +13,17 @@ async def filter_join(app, member): holo_user = HoloUser(member.from_user) - if (holo_user.link is not None) and (holo_user.link == member.invite_link): + if (holo_user.link is not None) and (holo_user.link == member.invite_link.invite_link): + logWrite(f"User {holo_user.id} joined destination group with correct link {holo_user.link}") return if await isAnAdmin(member.invite_link.creator.id): + logWrite(f"User {holo_user.id} joined destination group with link {holo_user.link} of an admin {member.invite_link.creator.id}") return - - await app.send_message(configGet("admin_group"), f"User **{member.from_user.first_name}** (`{member.from_user.id}`) joined the chat not with his personal link", reply_markup=InlineKeyboardMarkup( + + logWrite(f"User {holo_user.id} joined destination group with stolen/unapproved link {holo_user.link}") + + await app.send_message(configGet("admin_group"), locale("joined_false_link", "message").format(member.from_user.first_name, member.from_user.id), reply_markup=InlineKeyboardMarkup( [ [ InlineKeyboardButton(text=str(locale("sus_allow", "button")), callback_data=f"sus_allow_{member.from_user.id}")