Merge pull request 'Pycord support initial release' (#48) from dev into main

Reviewed-on: #48

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-asyncio==0.23.2
 pytest-cov==4.1.0
-pytest==8.0.0
+pytest==7.4.3
-tox==4.13.0
+tox==4.11.4
-types-aiofiles==23.2.0.20240106
+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.3.18
+pyrogram~=2.0.106

src/libbot/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.0"
+__version__ = "2.1.0"
 __license__ = "GPL3"
 __author__ = "Profitroll"
 

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,21 +93,17 @@ 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.scoped_commands: bool = self.config["bot"]["scoped_commands"]
-            self.config["bot"]["scoped_commands"]
-            if scoped_commands is None
-            else scoped_commands
-        )
         self.start_time: float = 0
 
         self.bot_locale: BotLocale = BotLocale(
             default_locale=self.config["locale"],
-            locales_root=(Path("locale") if locales_root is None else locales_root),
+            locales_root=(Path("locale") if locales_root is None else locales_root)
         )
         self.default_locale: str = self.bot_locale.default
         self.locales: dict = self.bot_locale.locales
@@ -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,55 +129,6 @@ class PyroClient(Client):
             getpid(),
         )
 
-        if self.i18n_bot_info:
-            # Register default bot's info
-            try:
-                await self.set_bot_info(
-                    name=self._("name", "bot"),
-                    about=self._("about", "bot"),
-                    description=self._("description", "bot"),
-                    lang_code="",
-                )
-                logger.info(
-                    "Bot's info for the default locale %s has been updated",
-                    self.default_locale,
-                )
-            except KeyError:
-                logger.warning(
-                    "Default locale %s has incorrect keys or values in bot section",
-                    self.default_locale,
-                )
-
-            # Register bot's info for each available locale
-            for locale_code in self.locales:
-                locale = self.locales[locale_code]
-
-                if "metadata" not in locale or ("codes" not in locale["metadata"]):
-                    logger.warning(
-                        "Locale %s is missing metadata or metadata.codes key",
-                        locale_code,
-                    )
-                    continue
-
-                for code in locale["metadata"]["codes"]:
-                    try:
-                        await self.set_bot_info(
-                            name=locale["bot"]["name"],
-                            about=locale["bot"]["about"],
-                            description=locale["bot"]["description"],
-                            lang_code=code,
-                        )
-                        logger.info(
-                            "Bot's info for the locale %s has been updated",
-                            self.code,
-                        )
-                    except KeyError:
-                        logger.warning(
-                            "Locale %s has incorrect keys or values in bot section",
-                            locale_code,
-                        )
-
-        # Send a message to the bot's reports chat about the startup
         try:
             await self.send_message(
                 chat_id=self.owner
@@ -194,23 +136,22 @@ class PyroClient(Client):
                 else self.config["reports"]["chat_id"],
                 text=f"Bot started PID `{getpid()}`",
             )
+
+            if self.scheduler is None:
+                return
+
+            if register_commands:
+                self.scheduler.add_job(
+                    self.register_commands,
+                    trigger="date",
+                    run_date=datetime.now() + timedelta(seconds=5),
+                    kwargs={"command_sets": await self.collect_commands()},
+                )
+
+            self.scheduler.start()
         except BadRequest:
             logger.warning("Unable to send message to report chat.")
 
-        if self.scheduler is None:
-            return
-
-        # Schedule the task to register all commands
-        if register_commands:
-            self.scheduler.add_job(
-                self.register_commands,
-                trigger="date",
-                run_date=datetime.now() + timedelta(seconds=5),
-                kwargs={"command_sets": await self.collect_commands()},
-            )
-
-        self.scheduler.start()
-
     async def stop(self, exit_completely: bool = True) -> None:
         try:
             await self.send_message(
@@ -229,16 +170,16 @@ class PyroClient(Client):
         if exit_completely:
             try:
                 exit()
-            except SystemExit as exc:
+            except SystemExit as exp:
                 raise SystemExit(
                     "Bot has been shut down, this is not an application error!"
-                ) from exc
+                ) from exp
 
     async def collect_commands(self) -> Union[List[CommandSet], None]:
         """Gather list of the bot's commands
 
         ### Returns:
-            * `List[CommandSet]`: List of the commands' sets.
+            * `List[CommandSet]`: List of the commands' sets
         """
         command_sets = None
 

tests/data/locale/en.json

@@ -1,16 +1,4 @@
 {
-    "metadata": {
-        "flag": "🇬🇧",
-        "name": "English",
-        "codes": [
-            "en"
-        ]
-    },
-    "bot": {
-        "name": "",
-        "about": "", 
-        "description": ""
-    },
     "foo": "bar",
     "messages": {
         "example": "okay"

tests/data/locale/uk.json

@@ -1,16 +1,4 @@
 {
-    "metadata": {
-        "flag": "🇺🇦",
-        "name": "Українська",
-        "codes": [
-            "uk"
-        ]
-    },
-    "bot": {
-        "name": "",
-        "about": "", 
-        "description": ""
-    },
     "foo": "бар",
     "messages": {
         "example": "окей"