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

Reviewed-on: #48

requirements/dev.txt

@@ -3,9 +3,9 @@ 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==7.4.4
+pytest==7.4.3
 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.3.16.post1
+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

@@ -103,7 +103,7 @@ class PyroClient(Client):
 
         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
@@ -129,53 +129,6 @@ class PyroClient(Client):
             getpid(),
         )
 
-        # 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.default_locale,
-                    )
-                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
@@ -183,13 +136,10 @@ class PyroClient(Client):
                 else self.config["reports"]["chat_id"],
                 text=f"Bot started PID `{getpid()}`",
             )
-        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,
@@ -199,6 +149,8 @@ class PyroClient(Client):
                 )
 
             self.scheduler.start()
+        except BadRequest:
+            logger.warning("Unable to send message to report chat.")
 
     async def stop(self, exit_completely: bool = True) -> None:
         try:
@@ -218,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": "окей"