This commit closes #13

plugins/callbacks/emoji_button.py

@@ -82,10 +82,11 @@ async def callback_emoji_button(app: PyroClient, callback: CallbackQuery):
                 app._("captcha_failed", "callbacks", locale=locale), show_alert=True
             )
 
-            banned = await app.ban_chat_member(group.id, callback.from_user.id)
+            if group.ban_failed:
+                banned = await app.ban_chat_member(group.id, callback.from_user.id)
 
-            if isinstance(banned, Message):
-                await banned.delete()
+                if isinstance(banned, Message):
+                    await banned.delete()
 
             await callback.message.delete()
             return

plugins/commands/ban_failed.py

@@ -0,0 +1,44 @@
+import logging
+
+from pyrogram import filters
+from pyrogram.enums.chat_member_status import ChatMemberStatus
+from pyrogram.types import Message
+
+from classes.pyroclient import PyroClient
+from classes.pyrogroup import PyroGroup
+
+logger = logging.getLogger(__name__)
+
+
+@PyroClient.on_message(
+    ~filters.scheduled
+    & filters.group
+    & filters.command(["ban_failed"], prefixes=["/"])  # type: ignore
+)
+async def command_ban_failed(app: PyroClient, message: Message):
+    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    locale = group.select_locale(app, message.from_user)
+
+    if (await app.get_chat_member(group.id, message.from_user.id)).status not in [
+        ChatMemberStatus.ADMINISTRATOR,
+        ChatMemberStatus.OWNER,
+    ]:
+        await message.reply_text(
+            app._("permission_denied", "messages", locale=locale), quote=True
+        )
+        return
+
+    if group.ban_failed:
+        await message.reply_text(
+            app._("ban_failed_disabled", "messages", locale=locale)
+        )
+    else:
+        await message.reply_text(app._("ban_failed_enabled", "messages", locale=locale))
+
+    logger.info(
+        "Ban on fail in group %s has been set to %s",
+        group.id,
+        not group.ban_failed,
+    )
+
+    await group.set_ban_failed(not group.ban_failed)

plugins/handlers/user_join.py

@@ -50,10 +50,11 @@ async def handler_user_join(app: PyroClient, message: Message):
                 "User %s has previously failed the captcha, kicking and banning him",
                 user.id,
             )
-            banned = await app.ban_chat_member(group.id, user.id)
+            if group.ban_failed:
+                banned = await app.ban_chat_member(group.id, user.id)
 
-            if isinstance(banned, Message):
-                await banned.delete()
+                if isinstance(banned, Message):
+                    await banned.delete()
 
             return
 
@@ -101,7 +102,7 @@ async def handler_user_join(app: PyroClient, message: Message):
             kick_unstarted,
             "date",
             [app, user.id, verification_request.chat.id, verification_request.id],
-            run_date=datetime.now() + timedelta(seconds=app.config["timeouts"]["join"]),
+            run_date=datetime.now() + timedelta(seconds=group.timeout_join),
         )
         await col_schedule.insert_one(
             {"user": user.id, "group": group.id, "job_id": job.id}