diff --git a/ext/__init__.py b/ext/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ext/system.py b/ext/system.py index 8cb4f99..e56bf23 100644 --- a/ext/system.py +++ b/ext/system.py @@ -4,6 +4,10 @@ import asyncio import lightbulb import hikari +from lib.config import load_config + +config = load_config() + plugin = lightbulb.Plugin("SystemPlugin") async def get_git_status() -> dict: @@ -52,7 +56,7 @@ async def ping(ctx: lightbulb.Context) -> None: async def info(ctx: lightbulb.Context) -> None: git_status = await get_git_status() embed = hikari.Embed(title="About Me!") - embed.add_field("GitHub", "https://gitdab.com/InValidFire/radical-bot") + embed.add_field("GitHub", config.git_url) embed.add_field("Version", git_status['commit_id'], inline=True) embed.add_field("Branch", git_status['branch'], inline=True) embed.add_field("In Dev-Env?", git_status['dev']) diff --git a/lib/__init__.py b/lib/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/config.py b/lib/config.py similarity index 81% rename from config.py rename to lib/config.py index 6408e71..f71d5f5 100644 --- a/config.py +++ b/lib/config.py @@ -7,20 +7,22 @@ class Config(object): discord_token: str | None = None discord_guild_id: int | None = None git_branch: str | None = None + git_url: str | None = None def config_decoder(obj): if '__type__' in obj and obj['__type__'] == "Config": return Config( discord_token=obj['discord_token'], discord_guild_id=obj['discord_guild_id'], - git_branch=obj['git_branch'] + git_branch=obj['git_branch'], + git_url=obj['git_url'] ) -def save(config: dict): +def save_config(config: dict): with Path("config.json").open("w+", encoding="utf-8") as fp: json.dump(config, fp, indent=4) -def load(): +def load_config(): with Path("config.json").open("r", encoding="utf-8") as fp: config = json.load(fp, object_hook=config_decoder) return config diff --git a/main.py b/main.py index 8aa2a77..ab4428c 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,8 @@ import lightbulb -from config import load +from lib.config import load_config -config = load() +config = load_config() bot = lightbulb.BotApp(config.discord_token, default_enabled_guilds=[config.discord_guild_id]) bot.load_extensions_from("ext/")