From 48eac124a57317e5cb7925e150bbfffd30d85f81 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 1 Oct 2022 22:38:01 +0200 Subject: [PATCH] Fixed settings handling in cpl-discord --- src/cpl_discord/__init__.py | 4 ++-- src/cpl_discord/application/__init__.py | 4 ++-- src/cpl_discord/command/__init__.py | 4 ++-- src/cpl_discord/configuration/__init__.py | 4 ++-- src/cpl_discord/container/__init__.py | 4 ++-- src/cpl_discord/cpl-discord.json | 2 +- src/cpl_discord/events/__init__.py | 4 ++-- src/cpl_discord/helper/__init__.py | 4 ++-- src/cpl_discord/service/__init__.py | 4 ++-- src/cpl_discord/service/discord_bot_service.py | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/cpl_discord/__init__.py b/src/cpl_discord/__init__.py index 9d2dd8be..e64e3790 100644 --- a/src/cpl_discord/__init__.py +++ b/src/cpl_discord/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti # build-ignore-end VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/application/__init__.py b/src/cpl_discord/application/__init__.py index 1d57e8e8..fd0dd6e4 100644 --- a/src/cpl_discord/application/__init__.py +++ b/src/cpl_discord/application/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.application' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_application_abc import DiscordBotApplicationABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/command/__init__.py b/src/cpl_discord/command/__init__.py index 6f7c9789..affdf6db 100644 --- a/src/cpl_discord/command/__init__.py +++ b/src/cpl_discord/command/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC from .discord_commands_meta import DiscordCogMeta VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/configuration/__init__.py b/src/cpl_discord/configuration/__init__.py index 2118b576..a12d538f 100644 --- a/src/cpl_discord/configuration/__init__.py +++ b/src/cpl_discord/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .discord_bot_settings import DiscordBotSettings VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/container/__init__.py b/src/cpl_discord/container/__init__.py index 97bb8466..00a5bd3c 100644 --- a/src/cpl_discord/container/__init__.py +++ b/src/cpl_discord/container/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.container' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -31,4 +31,4 @@ from .thread import Thread from .voice_channel import VoiceChannel VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/cpl-discord.json b/src/cpl_discord/cpl-discord.json index b3d062f3..62f8ed19 100644 --- a/src/cpl_discord/cpl-discord.json +++ b/src/cpl_discord/cpl-discord.json @@ -4,7 +4,7 @@ "Version": { "Major": "2022", "Minor": "10", - "Micro": "0" + "Micro": "0.post1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/cpl_discord/events/__init__.py b/src/cpl_discord/events/__init__.py index 35917920..38a4d75d 100644 --- a/src/cpl_discord/events/__init__.py +++ b/src/cpl_discord/events/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC from .on_webhooks_update_abc import OnWebhooksUpdateABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/helper/__init__.py b/src/cpl_discord/helper/__init__.py index 9f7ac978..e3775ff6 100644 --- a/src/cpl_discord/helper/__init__.py +++ b/src/cpl_discord/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.helper' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -24,4 +24,4 @@ from collections import namedtuple from .to_containers_converter import ToContainersConverter VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/service/__init__.py b/src/cpl_discord/service/__init__.py index 5c586b74..0cdb0f35 100644 --- a/src/cpl_discord/service/__init__.py +++ b/src/cpl_discord/service/__init__.py @@ -15,7 +15,7 @@ __title__ = 'cpl_discord.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de' -__version__ = '2022.10.0' +__version__ = '2022.10.0.post1' from collections import namedtuple @@ -29,4 +29,4 @@ from .discord_service import DiscordService from .discord_service_abc import DiscordServiceABC VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='2022', minor='10', micro='0') +version_info = VersionInfo(major='2022', minor='10', micro='0.post1') diff --git a/src/cpl_discord/service/discord_bot_service.py b/src/cpl_discord/service/discord_bot_service.py index 6b8466d1..fe86b908 100644 --- a/src/cpl_discord/service/discord_bot_service.py +++ b/src/cpl_discord/service/discord_bot_service.py @@ -43,8 +43,8 @@ class DiscordBotService(DiscordBotServiceABC): def _get_settings(self, settings_from_config: DiscordBotSettings) -> DiscordBotSettings: new_settings = DiscordBotSettings() - token = settings_from_config.token - prefix = settings_from_config.prefix + token = None if settings_from_config is None else settings_from_config.token + prefix = None if settings_from_config is None else settings_from_config.prefix env_token = self._config.get_configuration('TOKEN') env_prefix = self._config.get_configuration('PREFIX')