From 0d8a4f8ae6751c653b91825858a081a1b3412adf Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 19 Jul 2022 16:55:56 +0200 Subject: [PATCH] Improved deploy process --- src/bot/__init__.py | 4 +-- src/bot/bot.json | 2 +- src/bot/config/appsettings.production.json | 2 +- src/bot/config/appsettings.staging.json | 2 +- src/bot/translation/de.json | 3 ++- src/bot_core/__init__.py | 4 +-- src/bot_core/abc/__init__.py | 4 +-- src/bot_core/configuration/__init__.py | 4 +-- src/bot_core/pipes/__init__.py | 4 +-- src/bot_core/service/__init__.py | 4 +-- src/bot_data/__init__.py | 4 +-- src/bot_data/abc/__init__.py | 4 +-- src/bot_data/migration/__init__.py | 4 +-- src/bot_data/model/__init__.py | 4 +-- src/bot_data/service/__init__.py | 4 +-- src/modules/admin/__init__.py | 4 +-- src/modules/admin/command/__init__.py | 26 +++++++++++++++++++ src/modules/admin/command/deploy_command.py | 26 ++++++++++++++++--- src/modules/base/__init__.py | 4 +-- src/modules/base/abc/__init__.py | 4 +-- src/modules/base/command/__init__.py | 4 +-- src/modules/base/configuration/__init__.py | 4 +-- src/modules/base/events/__init__.py | 4 +-- src/modules/base/service/__init__.py | 4 +-- src/modules/boot_log/__init__.py | 4 +-- .../boot_log/configuration/__init__.py | 4 +-- src/modules/database/__init__.py | 4 +-- src/modules/moderator/__init__.py | 4 +-- src/modules/moderator/command/__init__.py | 26 +++++++++++++++++++ src/modules/permission/__init__.py | 4 +-- src/modules/permission/abc/__init__.py | 4 +-- .../permission/configuration/__init__.py | 4 +-- src/modules/permission/events/__init__.py | 4 +-- src/modules/permission/service/__init__.py | 4 +-- 34 files changed, 134 insertions(+), 61 deletions(-) diff --git a/src/bot/__init__.py b/src/bot/__init__.py index dc049f8b46..4624edde01 100644 --- a/src/bot/__init__.py +++ b/src/bot/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot/bot.json b/src/bot/bot.json index 3c29a9bbec..53e1d0ba8d 100644 --- a/src/bot/bot.json +++ b/src/bot/bot.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "0", - "Micro": "0.dev2" + "Micro": "0.dev3" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/src/bot/config/appsettings.production.json b/src/bot/config/appsettings.production.json index ac7d487919..c6259daa72 100644 --- a/src/bot/config/appsettings.production.json +++ b/src/bot/config/appsettings.production.json @@ -28,7 +28,7 @@ 240160344557879316, 236592458664902657 ], - "DeployFilesPath": "../../deploy" + "DeployFilesPath": "../../" }, "Base": { "650366049023295514": { diff --git a/src/bot/config/appsettings.staging.json b/src/bot/config/appsettings.staging.json index eea3c0e117..b69da3ddc1 100644 --- a/src/bot/config/appsettings.staging.json +++ b/src/bot/config/appsettings.staging.json @@ -25,7 +25,7 @@ 240160344557879316, 236592458664902657 ], - "DeployFilesPath": "../../deploy" + "DeployFilesPath": "../../" }, "Base": { "910199451145076828": { diff --git a/src/bot/translation/de.json b/src/bot/translation/de.json index 65786a2209..0cf015295f 100644 --- a/src/bot/translation/de.json +++ b/src/bot/translation/de.json @@ -42,7 +42,8 @@ "modules": { "admin": { "restart_message": "Bin gleich wieder da :D", - "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, Euer Freund. Lebt lange und in Frieden :)" + "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, Euer Freund. Lebt lange und in Frieden :)", + "deploy_message": "Der neue Stand wurde hochgeladen." }, "moderator": { "purge_message": "Na gut..., ich lösche alle Nachrichten wenns sein muss." diff --git a/src/bot_core/__init__.py b/src/bot_core/__init__.py index a00b8a64b5..3f2c7bbe66 100644 --- a/src/bot_core/__init__.py +++ b/src/bot_core/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_core' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_core/abc/__init__.py b/src/bot_core/abc/__init__.py index a15e30c192..d9aecd72a6 100644 --- a/src/bot_core/abc/__init__.py +++ b/src/bot_core/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_core.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_core/configuration/__init__.py b/src/bot_core/configuration/__init__.py index ef011752c0..a7bc5ad366 100644 --- a/src/bot_core/configuration/__init__.py +++ b/src/bot_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_core.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_core/pipes/__init__.py b/src/bot_core/pipes/__init__.py index adc0ffb5f1..bf9acf0011 100644 --- a/src/bot_core/pipes/__init__.py +++ b/src/bot_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_core.pipes' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_core/service/__init__.py b/src/bot_core/service/__init__.py index 33fa6d8f72..08716a8725 100644 --- a/src/bot_core/service/__init__.py +++ b/src/bot_core/service/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_core.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_data/__init__.py b/src/bot_data/__init__.py index 41632b0408..86962872bd 100644 --- a/src/bot_data/__init__.py +++ b/src/bot_data/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_data' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_data/abc/__init__.py b/src/bot_data/abc/__init__.py index 5a6b93c119..49d0500fe8 100644 --- a/src/bot_data/abc/__init__.py +++ b/src/bot_data/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_data.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_data/migration/__init__.py b/src/bot_data/migration/__init__.py index 3588521fda..99b6544eab 100644 --- a/src/bot_data/migration/__init__.py +++ b/src/bot_data/migration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_data.migration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_data/model/__init__.py b/src/bot_data/model/__init__.py index 07a8945c87..53632478fb 100644 --- a/src/bot_data/model/__init__.py +++ b/src/bot_data/model/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_data.model' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/bot_data/service/__init__.py b/src/bot_data/service/__init__.py index 9bf9dcfd30..9f22307b04 100644 --- a/src/bot_data/service/__init__.py +++ b/src/bot_data/service/__init__.py @@ -15,7 +15,7 @@ __title__ = 'bot_data.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/admin/__init__.py b/src/modules/admin/__init__.py index cdee6cea5c..c50baf6c0f 100644 --- a/src/modules/admin/__init__.py +++ b/src/modules/admin/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.admin' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/admin/command/__init__.py b/src/modules/admin/command/__init__.py index e69de29bb2..a017764043 100644 --- a/src/modules/admin/command/__init__.py +++ b/src/modules/admin/command/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'modules.admin.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '1.0.0.dev3' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/admin/command/deploy_command.py b/src/modules/admin/command/deploy_command.py index 0d2078dca5..948ecc90dc 100644 --- a/src/modules/admin/command/deploy_command.py +++ b/src/modules/admin/command/deploy_command.py @@ -5,6 +5,7 @@ from io import BytesIO import requests from cpl_core.configuration import ConfigurationABC +from cpl_core.environment import ApplicationEnvironmentABC from cpl_core.logging import LoggerABC from cpl_discord.command import DiscordCommandABC from cpl_discord.service import DiscordBotServiceABC @@ -15,7 +16,6 @@ from discord.ext.commands import Context from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC from bot_core.abc.message_service_abc import MessageServiceABC from bot_core.configuration.bot_settings import BotSettings -from modules.permission.abc.permission_service_abc import PermissionServiceABC class DeployCommand(DiscordCommandABC): @@ -28,7 +28,8 @@ class DeployCommand(DiscordCommandABC): bot: DiscordBotServiceABC, client_utils: ClientUtilsServiceABC, translate: TranslatePipe, - bot_settings: BotSettings + bot_settings: BotSettings, + env: ApplicationEnvironmentABC ): DiscordCommandABC.__init__(self) @@ -39,6 +40,7 @@ class DeployCommand(DiscordCommandABC): self._client_utils = client_utils self._t = translate self._bot_settings = bot_settings + self._env = env self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}') @@ -52,6 +54,11 @@ class DeployCommand(DiscordCommandABC): self._logger.trace(__name__, f'Finished deploy command') return + blacklist = ['venv', 'start', 'latest'] + + if old_version in blacklist: + raise Exception(self._t.transform('common.errors.bad_argument')) + if len(ctx.message.attachments) > 1: raise IndexError(self._t.transform('common.errors.too_many_arguments')) @@ -80,7 +87,20 @@ class DeployCommand(DiscordCommandABC): file.extractall(deploy_path) except Exception as e: self._logger.error(__name__, f'An error occurred extracting the zip file', e) - await self._message_service.send_ctx_msg(ctx, self._t.transform('common.command_error')) + await self._message_service.send_ctx_msg(ctx, self._t.transform('common.command_error'), without_tracking=True) return + try: + shutil.copy(f'{deploy_old_path}/bot/config/appsettings.{self._env.host_name}.json', f'{deploy_path}/bot/config/appsettings.{self._env.host_name}.json') + except Exception as e: + self._logger.error(__name__, f'An error occurred copying config file', e) + await self._message_service.send_ctx_msg(ctx, self._t.transform('common.command_error'), without_tracking=True) + return + + await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.deploy_message'), without_tracking=True) + + self._config.add_configuration('IS_RESTART', 'true') + await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.restart_message'), without_tracking=True) + await self._bot.stop_async() + self._logger.trace(__name__, f'Finished deploy command') diff --git a/src/modules/base/__init__.py b/src/modules/base/__init__.py index 07b9a59b4a..c858a445c5 100644 --- a/src/modules/base/__init__.py +++ b/src/modules/base/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/base/abc/__init__.py b/src/modules/base/abc/__init__.py index a9ca4b434f..9257224aa6 100644 --- a/src/modules/base/abc/__init__.py +++ b/src/modules/base/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/base/command/__init__.py b/src/modules/base/command/__init__.py index fe78a1c15d..38fde0da77 100644 --- a/src/modules/base/command/__init__.py +++ b/src/modules/base/command/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/base/configuration/__init__.py b/src/modules/base/configuration/__init__.py index 7eb4bcc66c..e0cd17aa08 100644 --- a/src/modules/base/configuration/__init__.py +++ b/src/modules/base/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/base/events/__init__.py b/src/modules/base/events/__init__.py index b8f3c17630..ea61763268 100644 --- a/src/modules/base/events/__init__.py +++ b/src/modules/base/events/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/base/service/__init__.py b/src/modules/base/service/__init__.py index 60832dbc59..2524e65871 100644 --- a/src/modules/base/service/__init__.py +++ b/src/modules/base/service/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.base.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/boot_log/__init__.py b/src/modules/boot_log/__init__.py index ba53aa594b..36d89a837e 100644 --- a/src/modules/boot_log/__init__.py +++ b/src/modules/boot_log/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.boot_log' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/boot_log/configuration/__init__.py b/src/modules/boot_log/configuration/__init__.py index 66bbbd5345..b34945fb63 100644 --- a/src/modules/boot_log/configuration/__init__.py +++ b/src/modules/boot_log/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.boot_log.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/database/__init__.py b/src/modules/database/__init__.py index 10b92d1d29..5e264dd848 100644 --- a/src/modules/database/__init__.py +++ b/src/modules/database/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.database' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/moderator/__init__.py b/src/modules/moderator/__init__.py index 19de191200..0f79339b11 100644 --- a/src/modules/moderator/__init__.py +++ b/src/modules/moderator/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.moderator' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/moderator/command/__init__.py b/src/modules/moderator/command/__init__.py index e69de29bb2..a24186f419 100644 --- a/src/modules/moderator/command/__init__.py +++ b/src/modules/moderator/command/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +""" +bot Keksdose bot +~~~~~~~~~~~~~~~~~~~ + +Discord bot for the Keksdose discord Server + +:copyright: (c) 2022 sh-edraft.de +:license: MIT, see LICENSE for more details. + +""" + +__title__ = 'modules.moderator.command' +__author__ = 'Sven Heidemann' +__license__ = 'MIT' +__copyright__ = 'Copyright (c) 2022 sh-edraft.de' +__version__ = '1.0.0.dev3' + +from collections import namedtuple + + +# imports: + +VersionInfo = namedtuple('VersionInfo', 'major minor micro') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/permission/__init__.py b/src/modules/permission/__init__.py index 8b3b97b740..df287f2d56 100644 --- a/src/modules/permission/__init__.py +++ b/src/modules/permission/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.permission' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/permission/abc/__init__.py b/src/modules/permission/abc/__init__.py index 56d527c1ef..22bf468b1d 100644 --- a/src/modules/permission/abc/__init__.py +++ b/src/modules/permission/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.permission.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/permission/configuration/__init__.py b/src/modules/permission/configuration/__init__.py index d52d37d679..93c6bedb44 100644 --- a/src/modules/permission/configuration/__init__.py +++ b/src/modules/permission/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.permission.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/permission/events/__init__.py b/src/modules/permission/events/__init__.py index 2745be3cd5..f10c80ccfe 100644 --- a/src/modules/permission/events/__init__.py +++ b/src/modules/permission/events/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.permission.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3') diff --git a/src/modules/permission/service/__init__.py b/src/modules/permission/service/__init__.py index ae3f6d5d9c..61f252673d 100644 --- a/src/modules/permission/service/__init__.py +++ b/src/modules/permission/service/__init__.py @@ -15,7 +15,7 @@ __title__ = 'modules.permission.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' -__version__ = '1.0.0.dev2' +__version__ = '1.0.0.dev3' from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple('VersionInfo', 'major minor micro') -version_info = VersionInfo(major='1', minor='0', micro='0.dev2') +version_info = VersionInfo(major='1', minor='0', micro='0.dev3')