.gitea/workflows/publish.yml

@@ -1,90 +0,0 @@
-name: Upload Python Package
-
-on:
-  release:
-    types: [ published ]
-
-permissions:
-  contents: read
-
-jobs:
-  release-build:
-    runs-on: ubuntu-latest
-    container: catthehacker/ubuntu:act-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: Build release distributions
-        run: |
-          python -m pip install build
-          python -m build
-
-      - name: Upload distributions
-        uses: christopherhx/gitea-upload-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-  gitea-publish:
-    runs-on: ubuntu-latest
-    container: catthehacker/ubuntu:act-latest
-
-    needs:
-      - release-build
-
-    permissions:
-      id-token: write
-
-    environment:
-      name: gitea
-      url: https://git.end-play.xyz/profitroll/-/packages/pypi/libbot
-
-    env:
-      GITHUB_WORKFLOW_REF: ${{ gitea.workflow_ref }}
-      INPUT_REPOSITORY_URL: https://git.end-play.xyz/api/packages/profitroll/pypi
-
-    steps:
-      - name: Retrieve release distributions
-        uses: christopherhx/gitea-download-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-      - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_GITEA_API_TOKEN }}
-          repository-url: https://git.end-play.xyz/api/packages/profitroll/pypi
-
-  pypi-publish:
-    runs-on: ubuntu-latest
-    container: catthehacker/ubuntu:act-latest
-
-    needs:
-      - release-build
-
-    permissions:
-      id-token: write
-
-    environment:
-      name: pypi
-
-    env:
-      GITHUB_WORKFLOW_REF: ${{ gitea.workflow_ref }}
-
-    steps:
-      - name: Retrieve release distributions
-        uses: christopherhx/gitea-download-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-      - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_PYPI_API_TOKEN }}

README.md

@@ -36,8 +36,6 @@ pip install libbot[pycord,speed]
 ### Pyrogram
 
 ```python
-import sys
-
 from libbot.pyrogram.classes import PyroClient
 
 
@@ -49,7 +47,7 @@ def main():
     except KeyboardInterrupt:
         print("Shutting down...")
     finally:
-        sys.exit()
+        exit()
 
 
 if __name__ == "__main__":
@@ -59,9 +57,6 @@ if __name__ == "__main__":
 ### Pycord
 
 ```python
-import asyncio
-from asyncio import AbstractEventLoop
-
 from discord import Intents
 from libbot.utils import config_get
 from libbot.pycord.classes import PycordBot
@@ -81,7 +76,7 @@ async def main():
 
 
 if __name__ == "__main__":
-    loop: AbstractEventLoop = asyncio.get_event_loop()
+    loop = asyncio.get_event_loop()
     loop.run_until_complete(main())
 ```
 

examples/README.md

@@ -1,4 +0,0 @@
-# Examples
-
-If you're looking for Pyrogram usage examples, please take a look at
-the [PyrogramBotBase](https://git.end-play.xyz/profitroll/PyrogramBotBase) repository.

requirements/_.txt

@@ -1,2 +1,2 @@
 aiofiles>=23.0.0
-typing-extensions~=4.12.2
+typing_extensions~=4.12.2

requirements/dev.txt

@@ -1,9 +1,9 @@
 black==24.10.0
 build==1.2.2.post1
 isort==5.13.2
-mypy==1.14.1
+mypy==1.14.0
 pylint==3.3.3
-pytest-asyncio==0.25.1
+pytest-asyncio==0.25.0
 pytest-cov==6.0.0
 pytest==8.3.4
 tox==4.23.2

src/libbot/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.2"
+__version__ = "4.0.1"
 __license__ = "GPL3"
 __author__ = "Profitroll"
 

src/libbot/pycord/classes/bot.py

@@ -1,13 +1,9 @@
 import logging
-from logging import Logger
 from pathlib import Path
 from typing import Any, Dict
 
 from typing_extensions import override
 
-from ...i18n.classes import BotLocale
-from ...utils import json_read
-
 try:
     from apscheduler.schedulers.asyncio import AsyncIOScheduler
     from apscheduler.schedulers.background import BackgroundScheduler
@@ -15,7 +11,14 @@ try:
 except ImportError as exc:
     raise ImportError("You need to install libbot[pycord] in order to use this class.") from exc
 
-logger: Logger = logging.getLogger(__name__)
+try:
+    from ujson import loads
+except ImportError:
+    from json import loads
+
+from ...i18n.classes import BotLocale
+
+logger = logging.getLogger(__name__)
 
 
 class PycordBot(Bot):
@@ -29,7 +32,11 @@ class PycordBot(Bot):
         scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
         **kwargs,
     ):
-        self.config: Dict[str, Any] = config if config is not None else json_read(config_path)
+        if config is None:
+            with open(config_path, "r", encoding="utf-8") as f:
+                self.config: dict = loads(f.read())
+        else:
+            self.config = config
 
         super().__init__(
             debug_guilds=(self.config["bot"]["debug_guilds"] if self.config["debug"] else None),

src/libbot/pycord/utils/__init__.py

@@ -1 +0,0 @@
-from .color import color_from_hex, hex_from_color

src/libbot/pycord/utils/color.py

@@ -1,35 +0,0 @@
-from discord import Colour
-
-
-def _int_from_hex(hex_string: str) -> int:
-    try:
-        return int(hex_string, base=16)
-    except Exception as exc:
-        raise ValueError("Input string must be a valid HEX code.") from exc
-
-
-def _hex_from_int(color_int: int) -> str:
-    if not 0 <= color_int <= 0xFFFFFF:
-        raise ValueError("Color's value must be in the range 0 to 0xFFFFFF.")
-
-    return f"#{color_int:06x}"
-
-
-def color_from_hex(hex_string: str) -> Colour:
-    """Convert valid hexadecimal string to discord.Colour.
-
-    :param hex_string: Hexadecimal string to convert into Colour object
-    :type hex_string: str
-    :return: Colour object
-    """
-    return Colour(_int_from_hex(hex_string))
-
-
-def hex_from_color(color: Colour) -> str:
-    """Convert discord.Colour to hexadecimal string.
-
-    :param color: Colour object to convert into the string
-    :type color: Colour
-    :return: Hexadecimal string in #XXXXXX format
-    """
-    return _hex_from_int(color.value)

src/libbot/pyrogram/classes/client.py

@@ -2,7 +2,6 @@ import asyncio
 import logging
 import sys
 from datetime import datetime, timedelta
-from logging import Logger
 from os import cpu_count, getpid
 from pathlib import Path
 from time import time
@@ -10,12 +9,6 @@ from typing import Any, Dict, List
 
 from typing_extensions import override
 
-from .command import PyroCommand
-from .commandset import CommandSet
-from ...i18n import _
-from ...i18n.classes import BotLocale
-from ...utils import json_read
-
 try:
     import pyrogram
     from apscheduler.schedulers.asyncio import AsyncIOScheduler
@@ -42,7 +35,12 @@ try:
 except ImportError:
     from json import dumps, loads
 
-logger: Logger = logging.getLogger(__name__)
+from ...i18n.classes import BotLocale
+from ...i18n import _
+from .command import PyroCommand
+from .commandset import CommandSet
+
+logger = logging.getLogger(__name__)
 
 
 class PyroClient(Client):
@@ -68,7 +66,11 @@ class PyroClient(Client):
         scheduler: AsyncIOScheduler | BackgroundScheduler | None = None,
         **kwargs,
     ):
-        self.config: Dict[str, Any] = config if config is not None else json_read(config_path)
+        if config is None:
+            with open(config_path, "r", encoding="utf-8") as f:
+                self.config: dict = loads(f.read())
+        else:
+            self.config = config
 
         super().__init__(
             name=name,