Merge pull request 'Update to 3.0.0' (#52) from dev into main

Reviewed-on: #52

examples/commands.json

@@ -1,21 +0,0 @@
-{
-    "help": {
-        "scopes": [
-            {
-                "name": "BotCommandScopeDefault"
-            },
-            {
-                "name": "BotCommandScopeChat",
-                "chat_id": "owner"
-            }
-        ]
-    },
-    "shutdown": {
-        "scopes": [
-            {
-                "name": "BotCommandScopeChat",
-                "chat_id": "owner"
-            }
-        ]
-    }
-}

examples/config.json

@@ -1,38 +0,0 @@
-{
-    "locale": "en",
-    "bot": {
-        "owner": 0,
-        "api_id": 0,
-        "api_hash": "",
-        "bot_token": "",
-        "workers": 1,
-        "max_concurrent_transmissions": 1,
-        "scoped_commands": true
-    },
-    "reports": {
-        "chat_id": "owner"
-    },
-    "disabled_plugins": [],
-    "commands": {
-        "help": {
-            "scopes": [
-                {
-                    "name": "BotCommandScopeDefault"
-                },
-                {
-                    "name": "BotCommandScopeChat",
-                    "chat_id": "owner"
-                }
-            ]
-        },
-        "shutdown": {
-            "scopes": [
-                {
-                    "name": "BotCommandScopeChat",
-                    "chat_id": "owner"
-                }
-            ]
-        }
-    }
-}
-

examples/locale.json

@@ -1,23 +0,0 @@
-{
-    "metadata": {
-        "flag": "🇬🇧",
-        "name": "English",
-        "codes": [
-            "en"
-        ]
-    },
-    "bot": {
-        "name": "Your Bot",
-        "about": "I'm a your bot. Nice to meet you!",
-        "description": "I'm just your bot. Yet nice to meet you!"
-    },
-    "commands": {
-        "help": "Show help message"
-    },
-    "messages": {
-        "help": "Sample Text"
-    },
-    "callbacks": {
-        "sample": "This button is working!"
-    }
-}

requirements/dev.txt

@@ -1,11 +1,11 @@
-black==24.1.1
+black==23.12.1
 build==1.0.3
 isort==5.13.2
 mypy==1.8.0
 pylint==3.0.3
 pytest-asyncio==0.23.3
 pytest-cov==4.1.0
-pytest==8.0.0
-tox==4.13.0
-types-aiofiles==23.2.0.20240106
+pytest==7.4.4
+tox==4.11.4
+types-aiofiles==23.2.0.0
 types-ujson==5.9.0.0

requirements/pyrogram.txt

@@ -1,2 +1,2 @@
 apscheduler~=3.10.4
-pyrofork~=2.4.0
+pyrofork~=2.3.16.post1

src/libbot/pyrogram/classes/client.py

@@ -46,7 +46,6 @@ class PyroClient(Client):
     def __init__(
         self,
         name: str = "bot_client",
-        owner: Union[int, None] = None,
         config: Union[Dict[str, Any], None] = None,
         config_path: Union[str, Path] = Path("config.json"),
         api_id: Union[int, None] = None,
@@ -59,8 +58,6 @@ class PyroClient(Client):
         sleep_threshold: int = 120,
         max_concurrent_transmissions: int = 1,
         commands_source: Union[Dict[str, dict], None] = None,
-        scoped_commands: Union[bool, None] = None,
-        i18n_bot_info: bool = False,
         scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None,
         **kwargs,
     ):
@@ -96,16 +93,12 @@ class PyroClient(Client):
             else max_concurrent_transmissions,
             **kwargs,
         )
-        self.owner: int = self.config["bot"]["owner"] if owner is None else owner
+        self.owner: int = self.config["bot"]["owner"]
         self.commands: List[PyroCommand] = []
         self.commands_source: Dict[str, dict] = (
             self.config["commands"] if commands_source is None else commands_source
         )
-        self.scoped_commands: bool = (
-            self.config["bot"]["scoped_commands"]
-            if scoped_commands is None
-            else scoped_commands
-        )
+        self.scoped_commands: bool = self.config["bot"]["scoped_commands"]
         self.start_time: float = 0
 
         self.bot_locale: BotLocale = BotLocale(
@@ -123,8 +116,6 @@ class PyroClient(Client):
 
         self.scopes_placeholders: Dict[str, int] = {"owner": self.owner}
 
-        self.i18n_bot_info: bool = i18n_bot_info
-
     async def start(self, register_commands: bool = True) -> None:
         await super().start()
 
@@ -138,7 +129,6 @@ class PyroClient(Client):
             getpid(),
         )
 
-        if self.i18n_bot_info:
         # Register default bot's info
         try:
             await self.set_bot_info(
@@ -163,8 +153,7 @@ class PyroClient(Client):
 
             if "metadata" not in locale or ("codes" not in locale["metadata"]):
                 logger.warning(
-                        "Locale %s is missing metadata or metadata.codes key",
-                        locale_code,
+                    "Locale %s is missing metadata or metadata.codes key", locale_code
                 )
                 continue
 
@@ -178,7 +167,7 @@ class PyroClient(Client):
                     )
                     logger.info(
                         "Bot's info for the locale %s has been updated",
-                            self.code,
+                        self.default_locale,
                     )
                 except KeyError:
                     logger.warning(