Merge pull request '0.2.1 - Status setzen (#56)' (#57) from #56 into master

Reviewed-on: sh-edraft.de/kd_discord_bot#57
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #56

src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot/application.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type, Callable
-
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.console import Console
 from cpl_core.dependency_injection import ServiceProviderABC
@@ -9,14 +7,6 @@ from cpl_discord.configuration import DiscordBotSettings
 from cpl_discord.service import DiscordBotServiceABC, DiscordBotService
 from cpl_translation import TranslatePipe, TranslationServiceABC, TranslationSettings
 
-from bot_core.configuration.bot_logging_settings import BotLoggingSettings
-from bot_core.configuration.bot_settings import BotSettings
-from bot_core.logging.command_logger import CommandLogger
-from bot_core.logging.database_logger import DatabaseLogger
-from modules.base.configuration.base_settings import BaseSettings
-from modules.boot_log.configuration.boot_log_settings import BootLogSettings
-from modules.permission.configuration.permission_settings import PermissionSettings
-
 
 class Application(DiscordBotApplicationABC):
 
@@ -32,7 +22,7 @@ class Application(DiscordBotApplicationABC):
         self._bot_settings: DiscordBotSettings = config.get_configuration(DiscordBotSettings)
         # cpl-translation
         self._translation: TranslationServiceABC = services.get_service(TranslationServiceABC)
-        self._translate: TranslatePipe = services.get_service(TranslatePipe)
+        self._t: TranslatePipe = services.get_service(TranslatePipe)
 
         self._is_stopping = False
 
@@ -41,7 +31,7 @@ class Application(DiscordBotApplicationABC):
 
     async def main(self):
         try:
-            self._logger.debug(__name__, f'Starting...\n')
+            self._logger.debug(__name__, f'Starting...')
             self._logger.trace(__name__, f'Try to start {DiscordBotService.__name__}')
             await self._bot.start_async()
             await self._bot.stop_async()
@@ -63,4 +53,4 @@ class Application(DiscordBotApplicationABC):
         Console.write_line()
 
     def is_restart(self):
-        return True if self._configuration.get_configuration('IS_RESTART') == 'true' else False
+        return True if self._configuration.get_configuration('IS_RESTART') == 'true' else False#

src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "2",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/bot/config/appsettings.development.json

@@ -37,14 +37,6 @@
       "de"
     ]
   },
-  "FeatureFlags": {
-    "AdminModule": true,
-    "BaseModule": true,
-    "BootLogModule": true,
-    "DatabaseModule": true,
-    "ModeratorModule": true,
-    "PermissionModule": true
-  },
   "DiscordBot": {
     "Token": "OTk4MTU5NjczODkzMDYwNzM4.GN3QyA.yvWO6L7Eu36gXQ7ARDs0Jg2J1VqIDnHLou5lT4",
     "Prefix": "!kd "
@@ -57,7 +49,8 @@
       240160344557879316,
       236592458664902657
     ],
-    "DeployFilesPath": "../../deploy"
+    "WaitForRestart": 4,
+    "WaitForShutdown": 4
   },
   "Base": {
     "910199451145076828": {

src/bot/config/appsettings.edrafts-pc-ubuntu.json

@@ -39,14 +39,6 @@
     "Token": "OTk4MTYwNDI3Njg5MTgxMjM3.GI7h67.BqD6Lu1Tz0MuG8iktYrcLnHi1pNozyMiWFGTKI",
     "Prefix": "!ke "
   },
-  "FeatureFlags": {
-    "AdminModule": true,
-    "BaseModule": true,
-    "BootLogModule": true,
-    "DatabaseModule": true,
-    "ModeratorModule": true,
-    "PermissionModule": true
-  },
   "Bot": {
     "910199451145076828": {
       "MessageDeleteTimer": 2
@@ -54,7 +46,8 @@
     "Technicians": [
       240160344557879316
     ],
-    "DeployFilesPath": "../../deploy"
+    "WaitForRestart": 4,
+    "WaitForShutdown": 4
   },
   "Base": {
     "910199451145076828": {

src/bot/config/appsettings.production.json

@@ -48,14 +48,6 @@
     "Buffered": "true",
     "AuthPlugin": "mysql_native_password"
   },
-  "FeatureFlags": {
-    "AdminModule": true,
-    "BaseModule": true,
-    "BootLogModule": true,
-    "DatabaseModule": true,
-    "ModeratorModule": true,
-    "PermissionModule": true
-  },
   "Bot": {
     "650366049023295514": {
       "MessageDeleteTimer": 2
@@ -67,7 +59,8 @@
       240160344557879316,
       236592458664902657
     ],
-    "DeployFilesPath": "../../"
+    "WaitForRestart": 4,
+    "WaitForShutdown": 4
   },
   "Base": {
     "650366049023295514": {

src/bot/config/appsettings.staging.json

@@ -48,14 +48,6 @@
     "Buffered": "true",
     "AuthPlugin": "mysql_native_password"
   },
-  "FeatureFlags": {
-    "AdminModule": true,
-    "BaseModule": true,
-    "BootLogModule": true,
-    "DatabaseModule": true,
-    "ModeratorModule": true,
-    "PermissionModule": true
-  },
   "Bot": {
     "910199451145076828": {
       "MessageDeleteTimer": 4
@@ -64,7 +56,8 @@
       240160344557879316,
       236592458664902657
     ],
-    "DeployFilesPath": "../../"
+    "WaitForRestart": 4,
+    "WaitForShutdown": 4
   },
   "Base": {
     "910199451145076828": {

src/bot/config/feature-flags.json

@@ -0,0 +1,13 @@
+{
+  "FeatureFlags": {
+    "AdminModule": true,
+    "BaseModule": true,
+    "BootLogModule": true,
+    "CoreModule": true,
+    "CoreExtensionModule": true,
+    "DatabaseModule": true,
+    "ModeratorModule": true,
+    "PermissionModule": true,
+    "PresenceModule": true
+  }
+}

src/bot/main.py

@@ -1,4 +1,5 @@
 import asyncio
+import traceback
 from typing import Optional
 
 from cpl_core.application import ApplicationBuilder
@@ -45,12 +46,12 @@ def main():
     except KeyboardInterrupt:
         asyncio.run(program.stop())
     except Exception as e:
-        Console.error(f'[ ERROR ] [ {__name__} ]: Cannot start the bot', str(e))
+        Console.error(f'[ ERROR ] [ {__name__} ]: Cannot start the bot', f'{e} -> {traceback.format_exc()}')
     finally:
         try:
             asyncio.run(program.stop())
         except Exception as e:
-            Console.error(f'[ ERROR ] [ {__name__} ]: Cannot stop the bot', str(e))
+            Console.error(f'[ ERROR ] [ {__name__} ]: Cannot stop the bot', f'{e} -> {traceback.format_exc()}')
 
         if program.app is not None and program.app.is_restart():
             del program

src/bot/module_list.py

@@ -0,0 +1,29 @@
+from cpl_query.extension import List
+
+from bot_core.core_extension.core_extension_module import CoreExtensionModule
+from bot_core.core_module import CoreModule
+from bot_data.data_module import DataModule
+from modules.admin.admin_module import AdminModule
+from modules.base.base_module import BaseModule
+from modules.boot_log.boot_log_module import BootLogModule
+from modules.database.database_module import DatabaseModule
+from modules.moderator.moderator_module import ModeratorModule
+from modules.permission.permission_module import PermissionModule
+
+
+class ModuleList:
+
+    @staticmethod
+    def get_modules():
+        # core modules (modules out of modules folder) should be loaded first!
+        return List(type, [
+            CoreModule,  # has to be first!
+            DataModule,
+            AdminModule,
+            BaseModule,
+            DatabaseModule,
+            ModeratorModule,
+            PermissionModule,
+            CoreExtensionModule,
+            BootLogModule  # has to be last!
+        ])

src/bot/startup.py

@@ -1,41 +1,21 @@
-import os
 from datetime import datetime
 from typing import Optional
 
 from cpl_core.application import StartupABC
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database import DatabaseSettings
-from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.environment import ApplicationEnvironment
 from cpl_core.logging import LoggerABC
-from cpl_discord import get_discord_collection
 
-from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
-from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_core.logging.message_logger import MessageLogger
-from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
-from bot_core.service.client_utils_service import ClientUtilsService
-from bot_core.service.message_service import MessageService
-from bot_data.abc.client_repository_abc import ClientRepositoryABC
-from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
-from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
-from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.db_context import DBContext
-from bot_data.service.client_repository_service import ClientRepositoryService
-from bot_data.service.known_user_repository_service import KnownUserRepositoryService
-from bot_data.service.server_repository_service import ServerRepositoryService
-from bot_data.service.user_joined_server_repository_service import UserJoinedServerRepositoryService
-from bot_data.service.user_joined_voice_channel_service import UserJoinedVoiceChannelRepositoryService
-from bot_data.service.user_repository_service import UserRepositoryService
-from modules.base.abc.base_helper_abc import BaseHelperABC
-from modules.base.service.base_helper_service import BaseHelperService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-from modules.permission.service.permission_service import PermissionService
 
 
 class Startup(StartupABC):
@@ -45,43 +25,32 @@ class Startup(StartupABC):
         self._start_time = datetime.now()
 
         self._config: Optional[ConfigurationABC] = None
+        self._feature_flags: Optional[FeatureFlagsSettings] = None
 
     def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
         self._config = configuration
+        self._feature_flags = configuration.get_configuration(FeatureFlagsSettings)
         return configuration
 
     def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
         services.add_logging()
+        if self._feature_flags.get_flag(FeatureFlagsEnum.core_module):
             # custom logging
-        services.add_singleton(LoggerABC, CommandLogger)
+            services.add_singleton(CustomFileLoggerABC, CommandLogger)
-        services.add_singleton(LoggerABC, DatabaseLogger)
+            services.add_singleton(CustomFileLoggerABC, DatabaseLogger)
-        services.add_singleton(LoggerABC, MessageLogger)
+            services.add_singleton(CustomFileLoggerABC, MessageLogger)
 
         services.add_translation()
         services.add_db_context(DBContext, self._config.get_configuration(DatabaseSettings))
 
-        # general services
-        services.add_transient(BaseHelperABC, BaseHelperService)
-        services.add_transient(MessageServiceABC, MessageService)
-        services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
-
-        # pipes
-        services.add_transient(DateTimeOffsetPipe)
-
-        # module services
-        services.add_singleton(PermissionServiceABC, PermissionService)
-
-        # data services
-        services.add_transient(ServerRepositoryABC, ServerRepositoryService)
-        services.add_transient(UserRepositoryABC, UserRepositoryService)
-        services.add_transient(ClientRepositoryABC, ClientRepositoryService)
-        services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService)
-        services.add_transient(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
-        services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
-
         provider = services.build_service_provider()
         # instantiate custom logger
         for c in CustomFileLoggerABC.__subclasses__():
             i: LoggerABC = provider.get_service(c)
 
+
+        logger: LoggerABC = provider.get_service(LoggerABC)
+        for flag in [f for f in FeatureFlagsEnum]:
+            logger.debug(__name__, f'Loaded feature-flag: {flag} = {self._feature_flags.get_flag(flag)}')
+
         return provider

src/bot/startup_module_extension.py

@@ -6,15 +6,9 @@ from cpl_core.console import Console, ForegroundColorEnum
 from cpl_core.dependency_injection import ServiceCollectionABC
 from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
-from cpl_query.extension import List
 
+from bot.module_list import ModuleList
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from modules.admin.admin_module import AdminModule
-from modules.base.base_module import BaseModule
-from modules.boot_log.boot_log_module import BootLogModule
-from modules.database.database_module import DatabaseModule
-from modules.moderator.moderator_module import ModeratorModule
-from modules.permission.permission_module import PermissionModule
 
 
 class StartupModuleExtension(StartupExtensionABC):
@@ -23,14 +17,7 @@ class StartupModuleExtension(StartupExtensionABC):
         self._config: Optional[ConfigurationABC] = None
         self._feature_flags: Optional[FeatureFlagsSettings] = None
 
-        self._modules = List(type, [
+        self._modules = ModuleList.get_modules()
-            AdminModule,
-            BaseModule,
-            DatabaseModule,
-            ModeratorModule,
-            PermissionModule,
-            BootLogModule  # has to be last!
-        ])
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         self._config = config
@@ -42,7 +29,7 @@ class StartupModuleExtension(StartupExtensionABC):
 
         for module_type in self._modules:
             module = module_type(dc_collection)
-            if not module.feature_flag(self._feature_flags):
+            if not self._feature_flags.get_flag(module.feature_flag):
                 continue
 
             Console.set_foreground_color(ForegroundColorEnum.green)

src/bot/startup_settings_extension.py

@@ -6,12 +6,9 @@ from cpl_core.application import StartupExtensionABC
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceCollectionABC
 from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_core.logging import LoggerABC
 
 from bot_core.configuration.bot_logging_settings import BotLoggingSettings
 from bot_core.configuration.bot_settings import BotSettings
-from bot_core.logging.command_logger import CommandLogger
-from bot_core.logging.database_logger import DatabaseLogger
 from modules.base.configuration.base_settings import BaseSettings
 from modules.boot_log.configuration.boot_log_settings import BootLogSettings
 from modules.permission.configuration.permission_settings import PermissionSettings
@@ -31,6 +28,8 @@ class StartupSettingsExtension(StartupExtensionABC):
         configuration.add_json_file(f'config/appsettings.json', optional=False)
         configuration.add_json_file(f'config/appsettings.{environment.environment_name}.json', optional=True)
         configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
+        # load feature-flags
+        configuration.add_json_file(f'config/feature-flags.json', optional=False)
 
         configuration.add_configuration('Startup_StartTime', str(self._start_time))
         self._configure_settings_with_sub_settings(configuration, BotSettings, lambda x: x.servers, lambda x: x.id)

src/bot/translation/de.json

@@ -4,6 +4,12 @@
     "bot_has_no_permission_message": "Ey!!!\nWas soll das?\nIch habe keine Berechtigungen :(\nScheiß System...",
     "no_permission_message": "Nein!\nIch höre nicht auf dich ¯\\_(ツ)_/¯",
     "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
+    "presence": {
+      "booting": "{} Ich fahre gerade hoch...",
+      "running": "{} Behalte Ruhe und iss Kekse :D",
+      "restart": "{} Muss neue Kekse holen...",
+      "shutdown": "{} Ich werde bestimmt wieder kommen..."
+    },
     "errors": {
       "error": "Es gab einen Fehler. Meld dich bitte bei einem Admin.",
       "command_error": "Es gab einen Fehler beim bearbeiten des Befehls. Meld dich bitte bei einem Admin.",

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/abc/client_utils_service_abc.py

@@ -19,3 +19,6 @@ class ClientUtilsServiceABC(ABC):
 
     @abstractmethod
     async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool: pass
+
+    @abstractmethod
+    async def presence_game(self, t_key: str): pass

src/bot_core/abc/module_abc.py

@@ -1,19 +1,20 @@
 from abc import abstractmethod
-from typing import Callable
 
 from cpl_core.application import StartupExtensionABC
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+
 
 class ModuleABC(StartupExtensionABC):
 
     @abstractmethod
-    def __init__(self, dc: DiscordCollectionABC, feature_flag: Callable = None):
+    def __init__(self, dc: DiscordCollectionABC, feature_flag: FeatureFlagsEnum):
         StartupExtensionABC.__init__(self)
 
         self._dc = dc
         self._feature_flag = feature_flag
 
     @property
-    def feature_flag(self) -> Callable:
+    def feature_flag(self) -> FeatureFlagsEnum:
         return self._feature_flag

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/configuration/bot_settings.py

@@ -14,7 +14,6 @@ class BotSettings(ConfigurationModelABC):
 
         self._servers: List[ServerSettings] = List(ServerSettings)
         self._technicians: List[int] = List(int)
-        self._deploy_file_path = './'
         self._wait_for_restart = 2
         self._wait_for_shutdown = 2
     
@@ -27,15 +26,21 @@ class BotSettings(ConfigurationModelABC):
         return self._technicians
 
     @property
-    def deploy_file_path(self) -> str:
+    def wait_for_restart(self) -> int:
-        return self._deploy_file_path
+        return self._wait_for_restart
+
+    @property
+    def wait_for_shutdown(self) -> int:
+        return self._wait_for_shutdown
 
     def from_dict(self, settings: dict):
         try:
             self._technicians = settings["Technicians"]
-            self._deploy_file_path = settings["DeployFilesPath"]
+            self._wait_for_restart = settings["WaitForRestart"]
+            self._wait_for_shutdown = settings["WaitForShutdown"]
             settings.pop("Technicians")
-            settings.pop("DeployFilesPath")
+            settings.pop("WaitForRestart")
+            settings.pop("WaitForShutdown")
             servers = List(ServerSettings)
             for s in settings:
                 st = ServerSettings()

src/bot_core/configuration/feature_flags_enum.py

@@ -0,0 +1,17 @@
+from enum import Enum
+
+
+class FeatureFlagsEnum(Enum):
+
+    # modules
+    admin_module = 'AdminModule'
+    base_module = 'BaseModule'
+    boot_log_module = 'BootLogModule'
+    core_module = 'CoreModule'
+    core_extension_module = 'CoreExtensionModule'
+    data_module = 'DataModule',
+    database_module = 'DatabaseModule',
+    moderator_module = 'ModeratorModule'
+    permission_module = 'PermissionModule'
+    # features
+    presence = 'Presence'

src/bot_core/configuration/feature_flags_settings.py

@@ -1,65 +1,47 @@
 import traceback
-from typing import Optional
+from typing import Optional, Callable
 
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl_core.console import Console
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+
 
 class FeatureFlagsSettings(ConfigurationModelABC):
 
     def __init__(self):
         ConfigurationModelABC.__init__(self)
 
-        self._admin_module = False  # 02.10.2022 #48
+        self._flags = {
-        self._base_module = True  # 02.10.2022 #48
+            # modules
-        self._boot_log_module = True  # 02.10.2022 #48
+            FeatureFlagsEnum.admin_module.value: False,  # 02.10.2022 #48
-        self._database_module = True  # 02.10.2022 #48
+            FeatureFlagsEnum.base_module.value: True,  # 02.10.2022 #48
-        self._moderator_module = False  # 02.10.2022 #48
+            FeatureFlagsEnum.boot_log_module.value: True,  # 02.10.2022 #48
-        self._permission_module = True  # 02.10.2022 #48
+            FeatureFlagsEnum.core_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.core_extension_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.data_module.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.database_module.value: True,  # 02.10.2022 #48
+            FeatureFlagsEnum.moderator_module.value: False,  # 02.10.2022 #48
+            FeatureFlagsEnum.permission_module.value: True,  # 02.10.2022 #48
+            # features
+            FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
+        }
 
-    @property
+    def get_flag(self, key: FeatureFlagsEnum) -> bool:
-    def admin_module(self) -> bool:
+        if key.value not in self._flags:
-        return self._admin_module
+            return False
+        return self._flags[key.value]
 
-    @property
+    def _load_flag(self, settings: dict, key: FeatureFlagsEnum):
-    def base_module(self) -> bool:
+        if key.value not in settings:
-        return self._base_module
+            return
 
-    @property
+        self._flags[key.value] = bool(settings[key.value])
-    def boot_log_module(self) -> bool:
-        return self._boot_log_module
-
-    @property
-    def database_module(self) -> bool:
-        return self._database_module
-
-    @property
-    def moderator_module(self) -> bool:
-        return self._moderator_module
-
-    @property
-    def permission_module(self) -> bool:
-        return self._permission_module
 
     def from_dict(self, settings: dict):
         try:
-            if 'AdminModule' in settings:
+            for flag in [f.value for f in FeatureFlagsEnum]:
-                self._admin_module = settings['AdminModule']
+                self._load_flag(settings, FeatureFlagsEnum(flag))
-
-            if 'BaseModule' in settings:
-                self._base_module = settings['BaseModule']
-
-            if 'BootLogModule' in settings:
-                self._boot_log_module = settings['BootLogModule']
-
-            if 'DatabaseModule' in settings:
-                self._database_module = settings['DatabaseModule']
-
-            if 'ModeratorModule' in settings:
-                self._moderator_module = settings['ModeratorModule']
-
-            if 'PermissionModule' in settings:
-                self._permission_module = settings['PermissionModule']
         except Exception as e:
             Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings')
             Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')

src/bot_core/core_extension/__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__ = 'bot_core.core_extension'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
+__version__ = '0.2.1'
+
+from collections import namedtuple
+
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/core_extension/core_extension_module.py

@@ -0,0 +1,21 @@
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironmentABC
+from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
+from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
+
+from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.core_extension.core_extension_on_ready_event import CoreExtensionOnReadyEvent
+
+
+class CoreExtensionModule(ModuleABC):
+
+    def __init__(self, dc: DiscordCollectionABC):
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_extension_module)
+
+    def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
+        pass
+
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, CoreExtensionOnReadyEvent)

src/bot_core/core_extension/core_extension_on_ready_event.py

@@ -0,0 +1,32 @@
+import asyncio
+
+from cpl_core.logging import LoggerABC
+from cpl_discord.events import OnReadyABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+
+
+class CoreExtensionOnReadyEvent(OnReadyABC):
+
+    def __init__(
+            self,
+            logger: LoggerABC,
+            bot: DiscordBotServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            t: TranslatePipe
+    ):
+        OnReadyABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._client_utils = client_utils
+        self._t = t
+
+        self._logger.info(__name__, f'Module {type(self)} loaded')
+
+    async def on_ready(self):
+        self._logger.debug(__name__, f'Module {type(self)} started')
+        await self._client_utils.presence_game('common.presence.running')
+        self._logger.trace(__name__, f'Module {type(self)} stopped')

src/bot_core/core_module.py

@@ -0,0 +1,32 @@
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironmentABC
+from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
+from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.events.core_on_ready_event import CoreOnReadyEvent
+from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
+from bot_core.service.client_utils_service import ClientUtilsService
+from bot_core.service.message_service import MessageService
+
+
+class CoreModule(ModuleABC):
+
+    def __init__(self, dc: DiscordCollectionABC):
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.core_module)
+
+    def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
+        pass
+
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        services.add_transient(MessageServiceABC, MessageService)
+        services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
+
+        # pipes
+        services.add_transient(DateTimeOffsetPipe)
+
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, CoreOnReadyEvent)

src/bot_core/events/__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__ = 'bot_core.events'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
+__version__ = '0.2.1'
+
+from collections import namedtuple
+
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/events/core_on_ready_event.py

@@ -0,0 +1,30 @@
+from cpl_core.logging import LoggerABC
+from cpl_discord.events import OnReadyABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+
+
+class CoreOnReadyEvent(OnReadyABC):
+
+    def __init__(
+            self,
+            logger: LoggerABC,
+            bot: DiscordBotServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            t: TranslatePipe,
+    ):
+        OnReadyABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._client_utils = client_utils
+        self._t = t
+
+        self._logger.info(__name__, f'Module {type(self)} loaded')
+
+    async def on_ready(self):
+        self._logger.debug(__name__, f'Module {type(self)} started')
+        await self._client_utils.presence_game('common.presence.booting')
+        self._logger.trace(__name__, f'Module {type(self)} stopped')

src/bot_core/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.helper'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_core/service/client_utils_service.py

@@ -1,3 +1,4 @@
+import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
@@ -8,6 +9,8 @@ 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.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 
@@ -23,7 +26,8 @@ class ClientUtilsService(ClientUtilsServiceABC):
             clients: ClientRepositoryABC,
             message_service: MessageServiceABC,
             db: DatabaseContextABC,
-            t: TranslatePipe
+            t: TranslatePipe,
+            feature_flags: FeatureFlagsSettings
     ):
         ClientUtilsServiceABC.__init__(self)
         self._config = config
@@ -34,6 +38,7 @@ class ClientUtilsService(ClientUtilsServiceABC):
         self._message_service = message_service
         self._db = db
         self._t = t
+        self._feature_flags = feature_flags
 
     def received_command(self, guild_id: int):
         server = self._servers.get_server_by_discord_id(guild_id)
@@ -61,3 +66,12 @@ class ClientUtilsService(ClientUtilsServiceABC):
         self._logger.debug(__name__, f'Bot is not ready yet {self._t.transform("common.errors.bot_not_ready_yet")}')
         await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
         return False
+
+    async def presence_game(self, t_key: str):
+        if not self._feature_flags.get_flag(FeatureFlagsEnum.presence):
+            return
+
+        import bot
+        name = self._t.transform(t_key).format(bot.__version__)
+        await self._bot.change_presence(activity=discord.Game(name=name))
+        self._logger.info(__name__, f'Set presence {name}')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/bot_data/data_module.py

@@ -0,0 +1,36 @@
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironmentABC
+from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
+
+from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_data.abc.client_repository_abc import ClientRepositoryABC
+from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_repository_abc import UserRepositoryABC
+from bot_data.service.client_repository_service import ClientRepositoryService
+from bot_data.service.known_user_repository_service import KnownUserRepositoryService
+from bot_data.service.server_repository_service import ServerRepositoryService
+from bot_data.service.user_joined_server_repository_service import UserJoinedServerRepositoryService
+from bot_data.service.user_joined_voice_channel_service import UserJoinedVoiceChannelRepositoryService
+from bot_data.service.user_repository_service import UserRepositoryService
+
+
+class DataModule(ModuleABC):
+
+    def __init__(self, dc: DiscordCollectionABC):
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.data_module)
+
+    def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
+        pass
+
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        services.add_transient(ServerRepositoryABC, ServerRepositoryService)
+        services.add_transient(UserRepositoryABC, UserRepositoryService)
+        services.add_transient(ClientRepositoryABC, ClientRepositoryService)
+        services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService)
+        services.add_transient(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
+        services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/admin/admin_module.py

@@ -4,6 +4,7 @@ from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.admin.command.restart_command import RestartCommand
 from modules.admin.command.shutdown_command import ShutdownCommand
 
@@ -11,12 +12,12 @@ from modules.admin.command.shutdown_command import ShutdownCommand
 class AdminModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.admin_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.admin_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         self._dc.add_command(RestartCommand)
         self._dc.add_command(ShutdownCommand)

src/modules/admin/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.admin.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/admin/command/restart_command.py

@@ -1,3 +1,6 @@
+import asyncio
+
+import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
@@ -7,6 +10,7 @@ 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 bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -22,6 +26,7 @@ class RestartCommand(DiscordCommandABC):
             client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
+            settings: BotSettings
     ):
         DiscordCommandABC.__init__(self)
 
@@ -32,6 +37,7 @@ class RestartCommand(DiscordCommandABC):
         self._client_utils = client_utils
         self._t = translate
         self._permissions = permissions
+        self._settings = settings
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
@@ -50,6 +56,8 @@ class RestartCommand(DiscordCommandABC):
             return
 
         self._config.add_configuration('IS_RESTART', 'true')
+        await self._client_utils.presence_game('common.presence.restart')
+        await asyncio.sleep(self._settings.wait_for_restart)
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.restart_message'))
         await self._bot.stop_async()
 

src/modules/admin/command/shutdown_command.py

@@ -1,3 +1,6 @@
+import asyncio
+
+import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
@@ -7,6 +10,7 @@ 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 bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -22,6 +26,7 @@ class ShutdownCommand(DiscordCommandABC):
             client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
+            settings: BotSettings
     ):
         DiscordCommandABC.__init__(self)
 
@@ -32,6 +37,7 @@ class ShutdownCommand(DiscordCommandABC):
         self._client_utils = client_utils
         self._t = translate
         self._permissions = permissions
+        self._settings = settings
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
@@ -49,6 +55,8 @@ class ShutdownCommand(DiscordCommandABC):
             self._logger.trace(__name__, f'Finished shutdown command')
             return
 
+        await self._client_utils.presence_game('common.presence.shutdown')
+        await asyncio.sleep(self._settings.wait_for_shutdown)
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.shutdown_message'))
         await self._bot.stop_async()
 

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/base/base_module.py

@@ -5,6 +5,8 @@ from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from modules.base.abc.base_helper_abc import BaseHelperABC
 from modules.base.command.afk_command import AFKCommand
 from modules.base.command.help_command import HelpCommand
 from modules.base.command.info_command import InfoCommand
@@ -16,17 +18,19 @@ from modules.base.events.base_on_member_join_event import BaseOnMemberJoinEvent
 from modules.base.events.base_on_member_remove_event import BaseOnMemberRemoveEvent
 from modules.base.events.base_on_message_event import BaseOnMessageEvent
 from modules.base.events.base_on_voice_state_update_event import BaseOnVoiceStateUpdateEvent
+from modules.base.service.base_helper_service import BaseHelperService
 
 
 class BaseModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.base_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.base_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        services.add_transient(BaseHelperABC, BaseHelperService)
         # commands
         self._dc.add_command(AFKCommand)
         self._dc.add_command(HelpCommand)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/base/command/info_command.py

@@ -60,7 +60,9 @@ class InfoCommand(DiscordCommandABC):
         embed.add_field(name=self._t.transform('modules.base.info.fields.deleted_message_count'), value=client.deleted_message_count, inline=False)
         embed.add_field(name=self._t.transform('modules.base.info.fields.received_command_count'), value=client.received_command_count)
         embed.add_field(name=self._t.transform('modules.base.info.fields.moved_users_count'), value=client.moved_users_count)
-        modules = ['Admin', 'Base', 'BootLog', 'Database', 'Moderator', 'Permission']
+        from bot.module_list import ModuleList
+        modules = ModuleList.get_modules()
+        modules = modules.select(lambda x: x.replace('Module', ''))
         embed.add_field(name=self._t.transform('modules.base.info.fields.modules'), value='\n'.join(modules), inline=False)
 
         await self._message_service.send_ctx_msg(ctx, embed, wait_before_delete=wait)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/boot_log/boot_log_extension.py

@@ -5,6 +5,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.logging import LoggerABC
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 
 
@@ -15,7 +16,7 @@ class BootLogExtension(ApplicationExtensionABC):
 
     async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
         feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
-        if not feature_flags.boot_log_module:
+        if not feature_flags.get_flag(FeatureFlagsEnum.boot_log_module):
             return
         logger: LoggerABC = services.get_service(LoggerABC)
         logger.debug(__name__, 'BootLog extension started')

src/modules/boot_log/boot_log_module.py

@@ -5,18 +5,19 @@ from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.boot_log.boot_log_on_ready_event import BootLogOnReadyEvent
 
 
 class BootLogModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.boot_log_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.boot_log_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         # events
         self._dc.add_event(DiscordEventTypesEnum.on_ready.value, BootLogOnReadyEvent)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/database/database_extension.py

@@ -5,6 +5,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_core.logging import LoggerABC
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_data.service.migration_service import MigrationService
@@ -17,7 +18,7 @@ class DatabaseExtension(ApplicationExtensionABC):
 
     async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
         feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
-        if not feature_flags.database_module:
+        if not feature_flags.get_flag(FeatureFlagsEnum.data_module):
             return
         logger: LoggerABC = services.get_service(DatabaseLogger)
         logger.debug(__name__, 'Database extension started')

src/modules/database/database_module.py

@@ -5,18 +5,19 @@ from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.database.database_on_ready_event import DatabaseOnReadyEvent
 
 
 class DatabaseModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.database_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.database_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         # events
         self._dc.add_event(DiscordEventTypesEnum.on_ready.value, DatabaseOnReadyEvent)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/moderator/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.moderator.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/moderator/moderator_module.py

@@ -4,18 +4,19 @@ from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.moderator.command.purge_command import PurgeCommand
 
 
 class ModeratorModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.moderator_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.moderator_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         self._dc.add_command(PurgeCommand)
         # events

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')

src/modules/permission/permission_module.py

@@ -5,19 +5,23 @@ from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
 from modules.permission.events.permission_on_member_update_event import PermissionOnMemberUpdateEvent
 from modules.permission.events.permission_on_ready_event import PermissionOnReadyEvent
+from modules.permission.service.permission_service import PermissionService
 
 
 class PermissionModule(ModuleABC):
 
     def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, lambda x: x.permission_module)
+        ModuleABC.__init__(self, dc, FeatureFlagsEnum.permission_module)
 
     def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
         pass
 
-    def configure_services(self, service: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        services.add_singleton(PermissionServiceABC, PermissionService)
         # commands
         # events
         self._dc.add_event(DiscordEventTypesEnum.on_ready.value, PermissionOnReadyEvent)

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__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='2', micro='0')
+version_info = VersionInfo(major='0', minor='2', micro='1')