Implemented find_group and find_user

plugins/callbacks/ban.py

@@ -6,14 +6,13 @@ from pyrogram.types import CallbackQuery, Message
 
 from classes.callbacks import CallbackBan
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 
 logger = logging.getLogger(__name__)
 
 
 @PyroClient.on_callback_query(filters.regex(r"ban:[\s\S]*"))  # type: ignore
 async def callback_ban(app: PyroClient, callback: CallbackQuery):
-    group = await PyroGroup.create_if_not_exists(callback.message.chat.id, None, True)
+    group = await app.find_group(callback.message.chat.id)
     locale = group.select_locale(app, callback.message.from_user)
 
     if (await app.get_chat_member(group.id, callback.from_user.id)).status not in [

plugins/callbacks/emoji_button.py

@@ -11,7 +11,6 @@ from pyrogram.types import (
 
 from classes.callbacks import CallbackEmoji
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 
 logger = logging.getLogger(__name__)
 
@@ -19,7 +18,7 @@ logger = logging.getLogger(__name__)
 @PyroClient.on_callback_query(filters.regex(r"emoji:[\s\S]*"))  # type: ignore
 async def callback_emoji_button(app: PyroClient, callback: CallbackQuery):
     parsed = CallbackEmoji.from_callback(callback)
-    group = await PyroGroup.create_if_not_exists(callback.message.chat.id, None, True)
+    group = await app.find_group(callback.message.chat.id)
     locale = group.select_locale(app, callback.message.from_user)
 
     if callback.from_user.id != parsed.user_id:

plugins/callbacks/nothing.py

@@ -2,12 +2,11 @@ from pyrogram import filters
 from pyrogram.types import CallbackQuery
 
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 
 
 @PyroClient.on_callback_query(filters.regex(r"nothing"))  # type: ignore
 async def callback_nothing(app: PyroClient, callback: CallbackQuery):
-    group = await PyroGroup.create_if_not_exists(callback.message.chat.id, None, True)
+    group = await app.find_group(callback.message.chat.id)
     locale = group.select_locale(app, callback.message.from_user)
 
     await callback.answer(app._("nothing", "callbacks", locale=locale))

plugins/callbacks/verify.py

@@ -9,7 +9,6 @@ from pyrogram.types import CallbackQuery
 
 from classes.callbacks import CallbackVerify
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 from modules.database import col_schedule
 from modules.kicker import kick_unverified
 from modules.utils import get_captcha_image
@@ -20,7 +19,7 @@ logger = logging.getLogger(__name__)
 @PyroClient.on_callback_query(filters.regex(r"verify:[\s\S]*"))  # type: ignore
 async def callback_verify(app: PyroClient, callback: CallbackQuery):
     parsed = CallbackVerify.from_callback(callback)
-    group = await PyroGroup.create_if_not_exists(callback.message.chat.id, None, True)
+    group = await app.find_group(callback.message.chat.id)
     locale = group.select_locale(app, callback.message.from_user)
 
     if callback.from_user.id != parsed.user_id:

plugins/commands/ban_failed.py

@@ -5,7 +5,6 @@ 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__)
 
@@ -16,7 +15,7 @@ logger = logging.getLogger(__name__)
     & 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)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (await app.get_chat_member(group.id, message.from_user.id)).status not in [

plugins/commands/language_auto.py

@@ -5,7 +5,6 @@ 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__)
 
@@ -16,7 +15,7 @@ logger = logging.getLogger(__name__)
     & filters.command(["language_auto"], prefixes=["/"])  # type: ignore
 )
 async def command_language_auto(app: PyroClient, message: Message):
-    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (await app.get_chat_member(group.id, message.from_user.id)).status not in [

plugins/commands/timeout_join.py

@@ -5,7 +5,6 @@ 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__)
 
@@ -16,7 +15,7 @@ logger = logging.getLogger(__name__)
     & filters.command(["timeout_join"], prefixes=["/"])  # type: ignore
 )
 async def command_timeout_join(app: PyroClient, message: Message):
-    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (await app.get_chat_member(group.id, message.from_user.id)).status not in [

plugins/commands/timeout_verify.py

@@ -5,7 +5,6 @@ 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__)
 
@@ -16,7 +15,7 @@ logger = logging.getLogger(__name__)
     & filters.command(["timeout_verify"], prefixes=["/"])  # type: ignore
 )
 async def command_timeout_verify(app: PyroClient, message: Message):
-    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (await app.get_chat_member(group.id, message.from_user.id)).status not in [

plugins/handlers/bot_join.py

@@ -4,7 +4,6 @@ from pyrogram import filters
 from pyrogram.types import Message
 
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 
 logger = logging.getLogger(__name__)
 
@@ -12,4 +11,4 @@ logger = logging.getLogger(__name__)
 @PyroClient.on_message(filters.new_chat_members & filters.group & filters.me)  # type: ignore
 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)
+    await app.find_group(message.chat.id)

plugins/handlers/user_join.py

@@ -12,8 +12,6 @@ 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
 
@@ -24,7 +22,7 @@ logger = logging.getLogger(__name__)
     filters.new_chat_members & filters.group & ~filters.me & ~filters.bot  # type: ignore
 )
 async def handler_user_join(app: PyroClient, message: Message):
-    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (
@@ -64,7 +62,7 @@ async def handler_user_join(app: PyroClient, message: Message):
         permissions=ChatPermissions(can_send_messages=False),
     )
 
-    user = await PyroUser.create_if_not_exists(message.from_user.id, group.id)
+    user = await app.find_user(message.from_user, group=group.id)
 
     if user.mistakes > 0 or user.score > 0:
         await user.set_score(0)

plugins/language.py

@@ -8,7 +8,6 @@ from pyrogram.types import CallbackQuery, Message
 
 from classes.callbacks import CallbackLanguage
 from classes.pyroclient import PyroClient
-from classes.pyrogroup import PyroGroup
 
 logger = logging.getLogger(__name__)
 
@@ -17,7 +16,7 @@ logger = logging.getLogger(__name__)
     ~filters.scheduled & filters.group & filters.command(["language"], prefixes=["/"])  # type: ignore
 )
 async def command_language(app: PyroClient, message: Message):
-    group = await PyroGroup.create_if_not_exists(message.chat.id, None, True)
+    group = await app.find_group(message.chat.id)
     locale = group.select_locale(app, message.from_user)
 
     if (await app.get_chat_member(group.id, message.from_user.id)).status not in [
@@ -54,7 +53,7 @@ async def command_language(app: PyroClient, message: Message):
 
 @Client.on_callback_query(filters.regex(r"language:[\s\S]*"))  # type: ignore
 async def callback_language(app: PyroClient, callback: CallbackQuery):
-    group = await PyroGroup.create_if_not_exists(callback.message.chat.id, None, True)
+    group = await app.find_group(callback.message.chat.id)
     locale = group.select_locale(app, callback.message.from_user)
 
     if (await app.get_chat_member(group.id, callback.from_user.id)).status not in [