diff --git a/requirements/dev.txt b/requirements/dev.txt index 644e136..8e5ea9c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,11 +1,11 @@ -black==23.11.0 +black==23.12.1 build==1.0.3 -isort==5.13.0 -mypy==1.7.1 -pylint==3.0.2 +isort==5.13.2 +mypy==1.8.0 +pylint==3.0.3 pytest-asyncio==0.23.2 pytest-cov==4.1.0 pytest==7.4.3 tox==4.11.4 types-aiofiles==23.2.0.0 -types-ujson==5.8.0.1 \ No newline at end of file +types-ujson==5.9.0.0 \ No newline at end of file diff --git a/requirements/pycord.txt b/requirements/pycord.txt index e38caa7..5c3fd69 100644 --- a/requirements/pycord.txt +++ b/requirements/pycord.txt @@ -1 +1,2 @@ +apscheduler~=3.10.4 py-cord~=2.4.1 \ No newline at end of file diff --git a/requirements/pyrogram.txt b/requirements/pyrogram.txt index 9d72624..a7d1e59 100644 --- a/requirements/pyrogram.txt +++ b/requirements/pyrogram.txt @@ -1,2 +1,2 @@ -apscheduler~=3.10.1 +apscheduler~=3.10.4 pyrogram~=2.0.106 \ No newline at end of file diff --git a/requirements/speed.txt b/requirements/speed.txt index 37c6a01..934e0b8 100644 --- a/requirements/speed.txt +++ b/requirements/speed.txt @@ -1 +1 @@ -ujson~=5.8.0 \ No newline at end of file +ujson~=5.9.0 \ No newline at end of file diff --git a/src/libbot/__init__.py b/src/libbot/__init__.py index c26fb2f..4f9160f 100644 --- a/src/libbot/__init__.py +++ b/src/libbot/__init__.py @@ -1,6 +1,6 @@ -__version__ = "2.0.1" +__version__ = "2.1.0" __license__ = "GPL3" __author__ = "Profitroll" -from . import i18n, pyrogram, sync +from . import i18n, pycord, pyrogram, sync from .__main__ import * diff --git a/src/libbot/pycord/classes/__init__.py b/src/libbot/pycord/classes/__init__.py new file mode 100644 index 0000000..4294771 --- /dev/null +++ b/src/libbot/pycord/classes/__init__.py @@ -0,0 +1 @@ +from .bot import PycordBot diff --git a/src/libbot/pycord/classes/bot.py b/src/libbot/pycord/classes/bot.py new file mode 100644 index 0000000..e59dad5 --- /dev/null +++ b/src/libbot/pycord/classes/bot.py @@ -0,0 +1,57 @@ +import logging +from pathlib import Path +from typing import Any, Dict, Union + +try: + from apscheduler.schedulers.asyncio import AsyncIOScheduler + from apscheduler.schedulers.background import BackgroundScheduler + from discord import Bot +except ImportError as exc: + raise ImportError( + "You need to install libbot[pycord] in order to use this class." + ) from exc + +try: + from ujson import loads +except ImportError: + from json import loads + +from libbot.i18n import BotLocale +from libbot.i18n.sync import _ + +logger = logging.getLogger(__name__) + + +class PycordBot(Bot): + def __init__( + self, + config: Union[Dict[str, Any], None] = None, + config_path: Union[str, Path] = Path("config.json"), + locales_root: Union[str, Path, None] = None, + scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None, + **kwargs, + ): + 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"], + owner_ids=self.config["bot"]["owners"], + **kwargs, + ) + + self.bot_locale: BotLocale = BotLocale( + default_locale=self.config["locale"], + 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 + + self._ = self.bot_locale._ + self.in_all_locales = self.bot_locale.in_all_locales + self.in_every_locale = self.bot_locale.in_every_locale + + self.scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = scheduler