Improved locales, added /language

plugins/handlers/bot_join.py

@@ -0,0 +1,15 @@
+import logging
+
+from pyrogram import filters
+from pyrogram.types import Message
+
+from classes.pyroclient import PyroClient
+from classes.pyrogroup import PyroGroup
+
+logger = logging.getLogger(__name__)
+
+
+@PyroClient.on_message(filters.new_chat_members & filters.group & filters.me)
+async def handler_bot_join(app: PyroClient, message: Message):
+    logger.info("Bot has joined the group %s")
+    await PyroGroup.create_if_not_exists(message.chat.id, None, True)

plugins/handlers/user_join.py

@@ -12,6 +12,7 @@ from pyrogram.types import (
 )
 
 from classes.pyroclient import PyroClient
+from classes.pyrogroup import PyroGroup
 from classes.pyrouser import PyroUser
 from modules.database import col_schedule
 from modules.kicker import kick_unstarted
@@ -19,34 +20,37 @@ from modules.kicker import kick_unstarted
 logger = logging.getLogger(__name__)
 
 
-@PyroClient.on_message(filters.new_chat_members & ~filters.me)
+@PyroClient.on_message(
+    filters.new_chat_members & filters.group & ~filters.me & ~filters.bot
+)
 async def handler_user_join(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 (
         app.config["whitelist"]["enabled"]
-        and message.chat.id not in app.config["whitelist"]["groups"]
+        and group.id not in app.config["whitelist"]["groups"]
     ):
         logger.info(
             "User %s has joined the group %s, but it's not whitelisted, ignoring.",
             message.from_user.id,
-            message.chat.id,
+            group.id,
         )
         return
 
-    logger.info(
-        "User %s has joined the group %s", message.from_user.id, message.chat.id
-    )
+    logger.info("User %s has joined the group %s", message.from_user.id, group.id)
 
     await message.delete()
 
     # If user has already failed the test and joined once more
     with contextlib.suppress(KeyError):
-        user = await app.find_user(message.from_user, message.chat.id)
+        user = await app.find_user(message.from_user, group.id)
         if user.failed is True:
             logger.info(
                 "User %s has previously failed the captcha, kicking and banning him",
                 user.id,
             )
-            banned = await app.ban_chat_member(message.chat.id, user.id)
+            banned = await app.ban_chat_member(group.id, user.id)
 
             if isinstance(banned, Message):
                 await banned.delete()
@@ -54,42 +58,35 @@ async def handler_user_join(app: PyroClient, message: Message):
             return
 
     await app.restrict_chat_member(
-        chat_id=message.chat.id,
+        chat_id=group.id,
         user_id=message.from_user.id,
         permissions=ChatPermissions(can_send_messages=False),
     )
 
-    user = PyroUser.create_if_not_exists(message.from_user.id, message.chat.id)
+    user = await PyroUser.create_if_not_exists(message.from_user.id, group.id)
 
     if user.mistakes > 0 or user.score > 0:
-        user.set_score(0)
-        user.set_mistakes(0)
+        await user.set_score(0)
+        await user.set_mistakes(0)
 
     await asyncio.sleep(2)
     verification_request = await app.send_message(
-        chat_id=message.chat.id,
-        text=app._(
-            "welcome",
-            "messages",
-        ).format(mention=message.from_user.mention),
+        chat_id=group.id,
+        text=app._("welcome", "messages", locale=locale).format(
+            mention=message.from_user.mention
+        ),
         reply_markup=InlineKeyboardMarkup(
             [
                 [
                     InlineKeyboardButton(
-                        app._(
-                            "verify",
-                            "buttons",
-                        ),
-                        callback_data=f"verify;{message.from_user.id}",
+                        app._("verify", "buttons", locale=locale),
+                        callback_data=f"verify;{user.id}",
                     )
                 ],
                 [
                     InlineKeyboardButton(
-                        app._(
-                            "ban",
-                            "buttons",
-                        ),
-                        callback_data=f"ban;{message.from_user.id}",
+                        app._("ban", "buttons", locale=locale),
+                        callback_data=f"ban;{user.id}",
                     )
                 ],
             ],
@@ -103,6 +100,6 @@ async def handler_user_join(app: PyroClient, message: Message):
             [app, user.id, verification_request.chat.id, verification_request.id],
             run_date=datetime.now() + timedelta(seconds=app.config["timeouts"]["join"]),
         )
-        col_schedule.insert_one(
-            {"user": message.from_user.id, "group": message.chat.id, "job_id": job.id}
+        await col_schedule.insert_one(
+            {"user": user.id, "group": group.id, "job_id": job.id}
         )