From 7a587ececabe5f425ddb710990d58089ee6ef12d Mon Sep 17 00:00:00 2001 From: profitroll Date: Mon, 14 Aug 2023 11:56:59 +0200 Subject: [PATCH] This commit closes #11 --- classes/pyrogroup.py | 11 ++++++++--- config_example.json | 32 +++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/classes/pyrogroup.py b/classes/pyrogroup.py index 40d47ca..73fc1bb 100644 --- a/classes/pyrogroup.py +++ b/classes/pyrogroup.py @@ -3,6 +3,7 @@ from dataclasses import dataclass from typing import Union from bson import ObjectId +from libbot import sync from pyrogram.types import User from classes.pyroclient import PyroClient @@ -26,8 +27,8 @@ class PyroGroup: async def create_if_not_exists( cls, id: int, - locale: Union[str, None] = None, - locale_auto: bool = True, + locale: Union[str, None] = sync.config_get("locale", "defaults", "group"), + locale_auto: bool = sync.config_get("locale_auto", "defaults", "group"), ): db_entry = await col_groups.find_one( { @@ -37,7 +38,11 @@ class PyroGroup: if db_entry is None: inserted = await col_groups.insert_one( - {"id": id, "locale": locale, "locale_auto": locale_auto} + { + "id": id, + "locale": locale, + "locale_auto": locale_auto, + } ) db_entry = await col_groups.find_one({"_id": inserted.inserted_id}) diff --git a/config_example.json b/config_example.json index 99f3987..17c3919 100644 --- a/config_example.json +++ b/config_example.json @@ -19,9 +19,14 @@ "port": 27017, "name": "captchabot" }, - "timeouts": { - "join": 2, - "verify": 3 + "defaults": { + "group": { + "locale": null, + "locale_auto": true, + "ban_failed": true, + "timeout_join": 180, + "timeout_verify": 300 + } }, "whitelist": { "enabled": false, @@ -113,6 +118,13 @@ } ] }, + "ban_failed": { + "scopes": [ + { + "name": "BotCommandScopeAllChatAdministrators" + } + ] + }, "language": { "scopes": [ { @@ -126,6 +138,20 @@ "name": "BotCommandScopeAllChatAdministrators" } ] + }, + "timeout_join": { + "scopes": [ + { + "name": "BotCommandScopeAllChatAdministrators" + } + ] + }, + "timeout_verify": { + "scopes": [ + { + "name": "BotCommandScopeAllChatAdministrators" + } + ] } } } \ No newline at end of file