Upload join_request.py

chatbot/plugins/join_request.py

@@ -91,7 +91,6 @@ def generate_captcha_multiple_choice():
         d.line([start, end], fill=line_color, width=2)
     
     img = img.filter(ImageFilter.BLUR)
-    
     img_path = f"captcha_{captcha_text}.png"
     img.save(img_path)
     return captcha_text, img_path, choices
@@ -104,10 +103,15 @@ async def join_request(client: Client, event: ChatJoinRequest):
     async for m in client.get_chat_members(event.chat.id, filter=ChatMembersFilter.ADMINISTRATORS):
         if not m.user.is_bot:
             user_list.append(m.user.id)
+    try:
+        chat_link = await client.export_chat_invite_link(event.chat.id)
+    except ChatAdminRequired:
+        await client.send_message(event.chat.id, text="I need to be an administrator to perform this action.")
+        return
     captcha_text, img_path, choices = generate_captcha_multiple_choice()
     captcha_texts[event.from_user.id] = captcha_text
     captcha_texts["chat_id"] = event.chat.id
-    captcha_texts["chat_username"] = event.chat.username
+    captcha_texts["chat_link"] = chat_link
     keyboard = InlineKeyboardMarkup(
         [
             [InlineKeyboardButton(choice, callback_data=f"verify_{event.from_user.id}_{choice}")]
@@ -119,6 +123,11 @@ async def join_request(client: Client, event: ChatJoinRequest):
     )
     if event.chat.type == ChatType.SUPERGROUP:
         try:
+            await client.send_message(
+                event.chat.id,
+                text=f" 🕦 Verify that you {event.from_user.first_name} are human!",
+                reply_markup=create_button_userinfo(event.from_user.id, client.me.username)
+            )
             await client.send_photo(
                 event.from_user.id,
                 photo=img_path,
@@ -152,14 +161,22 @@ async def cancel_captcha_callback(client: Client, cb: CallbackQuery):
 async def close_final(client: Client, cb: CallbackQuery):
     await cb.message.delete()
 
-def create_button_join_group(username):
+def create_button_join_group(chat_link):
     return InlineKeyboardMarkup(
         [
+            [InlineKeyboardButton("👁️ Join chat", url=chat_link")],
             [InlineKeyboardButton("🔘 Close", callback_data="close")],
-            [InlineKeyboardButton("👁️ Join chat", url=f"https://t.me/{username}")],
         ]
     )
 
+def create_button_userinfo(user_id, username):
+    return InlineKeyboardMarkup(
+        [
+            [InlineKeyboardButton("👤 Chmod +W $USER", url=f"tg://user?id={user_id}")],
+            [InlineKeyboardButton("🔔 Check human Bot", url=f"https://t.me/{username}")],
+        ]
+    ) 
+
 @Client.on_callback_query(filters.regex("^refresh_captcha$"))
 async def refresh_captcha_callback(client: Client, cb: CallbackQuery):
     user_id = cb.from_user.id
@@ -198,10 +215,8 @@ async def verify_captcha_multiple_choice_callback(client: Client, cb: CallbackQu
         return
     if user_id not in captcha_texts:
         await cb.answer("❗️ Please start the CAPTCHA verification first.", show_alert=True)
-        logger.warning(f"User {user_id} attempted to verify CAPTCHA without starting verification.")
         return
-    correct_captcha = captcha_texts.get(user_id)
-    logger.info(f"User {user_id} selected CAPTCHA: {user_choice} (Expected: {correct_captcha})")
+    correct_captcha = captcha_texts.get(user_id?
     if user_choice == correct_captcha:
         hacker_image = thanks_hacker_by_randydev()
         await cb.edit_message_media(
@@ -209,7 +224,7 @@ async def verify_captcha_multiple_choice_callback(client: Client, cb: CallbackQu
                 hacker_image,
                 caption="✅ CAPTCHA verification successful!"
             ),
-            reply_markup=create_button_join_group(captcha_texts.get("chat_username"))
+            reply_markup=create_button_join_group(captcha_texts.get("chat_link"))
         )
         logger.info(f"User {user_id} successfully verified CAPTCHA.")
         await client.approve_chat_join_request(
@@ -218,25 +233,23 @@ async def verify_captcha_multiple_choice_callback(client: Client, cb: CallbackQu
         )
         del captcha_texts[user_id]
         del captcha_texts["chat_id"]
-        del captcha_texts["chat_username"]
+        del captcha_texts["chat_link"]
     else:
         await cb.edit_message_text("❌ Incorrect CAPTCHA. Please try again")
-        logger.info(f"User {user_id} failed CAPTCHA verification.")
         await client.decline_chat_join_request(
             chat_id=captcha_texts.get("chat_id"),
             user_id=user_id
         )
         del captcha_texts[user_id]
         del captcha_texts["chat_id"]
-        del captcha_texts["chat_username"]
+        del captcha_texts["chat_link"]
 
 @Client.on_callback_query(filters.regex("^verify_captcha$"))
 async def verify_captcha_callback(client: Client, cb: CallbackQuery):
     user_id = cb.from_user.id
     if user_id not in captcha_texts:
         await cb.answer("❗️ Please start the CAPTCHA verification first", show_alert=True)
-        logger.warning(f"User {user_id} attempted to verify CAPTCHA without starting verification.")
         return
     await cb.message.reply_text("🔍 **Please enter the CAPTCHA text exactly as shown in the image:**")
     await cb.answer()
-    logger.info(f"User {user_id} is attempting to verify CAPTCHA.")
+    logger.info(f"User {user_id} is attempting to verify CAPTCHA.")