Implemented find_group and find_user

This commit is contained in:
2023-08-17 16:37:42 +02:00
parent ab39c111eb
commit 9e00d38877
15 changed files with 37 additions and 43 deletions

View File

@@ -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)

View File

@@ -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)