Improved open voice state check #292_shutdown_procedure

Reviewed-on: sh-edraft.de/kd_discord_bot#319

kdb-bot/src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/application.py

@@ -10,6 +10,7 @@ from cpl_translation import TranslatePipe, TranslationServiceABC, TranslationSet
 from bot_api.api_thread import ApiThread
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
+from bot_core.service.data_integrity_service import DataIntegrityService
 
 
 class Application(DiscordBotApplicationABC):
@@ -21,6 +22,7 @@ class Application(DiscordBotApplicationABC):
 
         # cpl-core
         self._logger: LoggerABC = services.get_service(LoggerABC)
+        self._data_integrity: DataIntegrityService = services.get_service(DataIntegrityService)
         # cpl-discord
         self._bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
         self._bot_settings: DiscordBotSettings = config.get_configuration(DiscordBotSettings)
@@ -68,6 +70,7 @@ class Application(DiscordBotApplicationABC):
             if self._feature_flags.get_flag(FeatureFlagsEnum.api_module):
                 self._api.stop()
 
+            self._data_integrity.check_data_integrity(is_for_shutdown=True)
             await self._bot.close()
             self._logger.info(__name__, f"Stopped {DiscordBotService.__name__}")
         except Exception as e:

kdb-bot/src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,23 +16,23 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.12.1.post3",
-      "cpl-translation==2022.12.1",
-      "cpl-query==2022.12.2.post2",
-      "cpl-discord==2022.12.2.post1",
-      "Flask==2.2.2",
+      "cpl-core==2023.4.0.post2",
+      "cpl-translation==2023.4.0.post1",
+      "cpl-query==2023.4.0.post1",
+      "cpl-discord==2023.4.0.post3",
+      "Flask==2.3.2",
       "Flask-Classful==0.14.2",
       "Flask-Cors==3.0.10",
-      "PyJWT==2.6.0",
+      "PyJWT==2.7.0",
       "waitress==2.1.2",
-      "Flask-SocketIO==5.3.2",
+      "Flask-SocketIO==5.3.4",
       "eventlet==0.33.3",
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3",
-      "ariadne==0.17.1"
+      "ariadne==0.19.1"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.1.post3",
+      "cpl-cli==2023.4.0.post3",
       "pygount==1.5.1"
     ],
     "PythonVersion": ">=3.10.4",

kdb-bot/src/bot/extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/module_list.py

@@ -25,10 +25,10 @@ class ModuleList:
                 DataModule,
                 GraphQLModule,
                 PermissionModule,
-                LevelModule,
                 DatabaseModule,
                 AutoRoleModule,
                 BaseModule,
+                LevelModule,
                 ApiModule,
                 TechnicianModule,
                 # has to be last!

kdb-bot/src/bot_api/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/bot-api.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/bot_api/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/controller/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/controller/graphql_controller.py

@@ -1,5 +1,5 @@
 from ariadne import graphql_sync
-from ariadne.constants import PLAYGROUND_HTML
+from ariadne.explorer import ExplorerGraphiQL
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.environment import ApplicationEnvironmentABC
 from flask import request, jsonify
@@ -30,7 +30,7 @@ class GraphQLController:
         if self._env.environment_name != "development":
             return "", 403
 
-        return PLAYGROUND_HTML, 200
+        return ExplorerGraphiQL().html(None), 200
 
     @Route.post(f"{BasePath}")
     @Route.authorize(by_api_key=True)

kdb-bot/src/bot_api/event/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/exception/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/filter/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/filter/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/model/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/route/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_api/transformer/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/bot-core.json

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

kdb-bot/src/bot_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/configuration/bot_logging_settings.py

@@ -1,32 +1,26 @@
-import traceback
-
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl_core.console import Console, ForegroundColorEnum
+from cpl_core.utils.json_processor import JSONProcessor
 from cpl_query.extension import List
 
 from bot_core.configuration.file_logging_settings import FileLoggingSettings
 
 
 class BotLoggingSettings(ConfigurationModelABC):
-    def __init__(self):
+    def __init__(self, custom_logs: dict = None):
         ConfigurationModelABC.__init__(self)
         self._files: List[FileLoggingSettings] = List(FileLoggingSettings)
 
+        if custom_logs is not None:
+            self._files_from_dict(custom_logs)
+
     @property
     def files(self) -> List[FileLoggingSettings]:
         return self._files
 
-    def from_dict(self, settings: dict):
-        try:
-            files = List(FileLoggingSettings)
-            for s in settings:
-                st = FileLoggingSettings()
-                settings[s]["Key"] = s
-                st.from_dict(settings[s])
-                files.append(st)
-            self._files = files
-        except Exception as e:
-            Console.set_foreground_color(ForegroundColorEnum.red)
-            Console.write_line(f"[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings")
-            Console.write_line(f"[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}")
-            Console.set_foreground_color(ForegroundColorEnum.default)
+    def _files_from_dict(self, settings: dict):
+        files = List(FileLoggingSettings)
+        for s in settings:
+            settings[s]["Key"] = s
+            st = JSONProcessor.process(FileLoggingSettings, settings[s])
+            files.append(st)
+        self._files = files

kdb-bot/src/bot_core/configuration/file_logging_settings.py

@@ -1,23 +1,27 @@
-import traceback
-
-from cpl_core.console import Console
-from cpl_core.logging import LoggingSettings
+from cpl_core.logging import LoggingSettings, LoggingLevelEnum
 
 
 class FileLoggingSettings(LoggingSettings):
-    def __init__(self):
-        LoggingSettings.__init__(self)
+    def __init__(
+        self,
+        key: str,
+        path: str = None,
+        filename: str = None,
+        console_log_level: LoggingLevelEnum = None,
+        file_log_level: LoggingLevelEnum = None,
+    ):
+        LoggingSettings.__init__(self, path, filename, console_log_level, file_log_level)
 
-        self._key = ""
+        self._key = key
 
     @property
     def key(self) -> str:
         return self._key
 
-    def from_dict(self, settings: dict):
-        try:
-            self._key = settings["Key"]
-            super().from_dict(settings)
-        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()}")
+    # def from_dict(self, settings: dict):
+    #     try:
+    #         self._key = settings["Key"]
+    #         super().from_dict(settings)
+    #     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()}")

kdb-bot/src/bot_core/core_extension/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/core_module.py

@@ -11,6 +11,7 @@ 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.data_integrity_service import DataIntegrityService
 from bot_core.service.message_service import MessageService
 
 
@@ -24,6 +25,7 @@ class CoreModule(ModuleABC):
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(MessageServiceABC, MessageService)
         services.add_transient(ClientUtilsABC, ClientUtilsService)
+        services.add_transient(DataIntegrityService)
 
         # pipes
         services.add_transient(DateTimeOffsetPipe)

kdb-bot/src/bot_core/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/exception/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/helper/event_checks.py

@@ -1,13 +1,9 @@
 from typing import Optional
 
-from cpl_translation import TranslatePipe
 from discord.ext import commands
-from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
-from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.exception.check_error import CheckError
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class EventChecks:
@@ -23,7 +19,7 @@ class EventChecks:
     @classmethod
     def check_is_ready(cls):
         async def check_if_bot_is_ready() -> bool:
-            result = await cls._client_utils.check_if_bot_is_ready()
+            result = await cls._client_utils.check_if_bot_is_ready_yet()
             if not result:
                 raise CheckError(f"Bot is not ready")
             return result

kdb-bot/src/bot_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/service/data_integrity_service.py

@@ -0,0 +1,373 @@
+from datetime import datetime, timedelta
+from typing import Union
+
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.database.context import DatabaseContextABC
+from cpl_discord.service import DiscordBotServiceABC
+
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
+from bot_data.abc.client_repository_abc import ClientRepositoryABC
+from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
+from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC
+from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
+from bot_data.abc.user_joined_voice_channel_repository_abc import (
+    UserJoinedVoiceChannelRepositoryABC,
+)
+from bot_data.abc.user_repository_abc import UserRepositoryABC
+from bot_data.model.client import Client
+from bot_data.model.known_user import KnownUser
+from bot_data.model.server import Server
+from bot_data.model.user import User
+from bot_data.model.user_joined_server import UserJoinedServer
+from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
+from bot_data.service.seeder_service import SeederService
+from bot_data.service.user_repository_service import ServerRepositoryABC
+from modules.base.configuration.base_server_settings import BaseServerSettings
+
+
+class DataIntegrityService:
+    def __init__(
+        self,
+        config: ConfigurationABC,
+        logger: DatabaseLogger,
+        seeder: SeederService,
+        bot: DiscordBotServiceABC,
+        db_context: DatabaseContextABC,
+        server_repo: ServerRepositoryABC,
+        user_repo: UserRepositoryABC,
+        client_repo: ClientRepositoryABC,
+        known_users: KnownUserRepositoryABC,
+        user_joins: UserJoinedServerRepositoryABC,
+        user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
+        user_joined_gs: UserJoinedGameServerRepositoryABC,
+        dtp: DateTimeOffsetPipe,
+    ):
+        self._config = config
+
+        self._logger = logger
+        self._seeder = seeder
+        self._bot = bot
+        self._db_context = db_context
+        self._servers = server_repo
+        self._users = user_repo
+        self._clients = client_repo
+        self._known_users = known_users
+        self._user_joins = user_joins
+        self._user_joins_vc = user_joins_vc
+        self._user_joined_gs = user_joined_gs
+        self._dtp = dtp
+
+        self._is_for_shutdown = False
+
+    def _check_known_users(self):
+        self._logger.debug(__name__, f"Start checking KnownUsers table, {len(self._bot.users)}")
+        for u in self._bot.users:
+            u: discord.User = u
+            try:
+                if u.bot:
+                    self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
+                    continue
+
+                user = self._known_users.find_user_by_discord_id(u.id)
+                if user is not None:
+                    continue
+
+                self._logger.warn(__name__, f"Unknown user: {u.id}")
+                self._logger.debug(__name__, f"Add user: {u.id}")
+                self._known_users.add_user(KnownUser(u.id))
+                self._db_context.save_changes()
+
+                user = self._known_users.find_user_by_discord_id(u.id)
+                if user is None:
+                    self._logger.fatal(__name__, f"Cannot add user: {u.id}")
+
+                self._logger.debug(__name__, f"Added user: {u.id}")
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get user", e)
+
+    def _check_servers(self):
+        self._logger.debug(__name__, f"Start checking Servers table")
+        for g in self._bot.guilds:
+            g: discord.Guild = g
+            try:
+                server = self._servers.find_server_by_discord_id(g.id)
+                if server is not None:
+                    continue
+
+                self._logger.warn(__name__, f"Server not found in database: {g.id}")
+                self._logger.debug(__name__, f"Add server: {g.id}")
+                self._servers.add_server(Server(g.id))
+                self._db_context.save_changes()
+
+                server = self._servers.find_server_by_discord_id(g.id)
+                if server is None:
+                    self._logger.fatal(__name__, f"Cannot add server: {g.id}")
+
+                self._logger.debug(__name__, f"Added server: {g.id}")
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get server", e)
+
+        results = self._servers.get_servers()
+        if results is None or len(results) == 0:
+            self._logger.error(__name__, f"Table Servers is empty!")
+
+    def _check_clients(self):
+        self._logger.debug(__name__, f"Start checking Clients table")
+        for g in self._bot.guilds:
+            g: discord.Guild = g
+            try:
+                server: Server = self._servers.find_server_by_discord_id(g.id)
+                if server is None:
+                    self._logger.fatal(__name__, f"Server not found in database: {g.id}")
+
+                client = self._clients.find_client_by_server_id(server.id)
+                if client is not None:
+                    continue
+
+                self._logger.warn(
+                    __name__,
+                    f"Client for server {g.id} not found in database: {self._bot.user.id}",
+                )
+                self._logger.debug(__name__, f"Add client: {self._bot.user.id}")
+                self._clients.add_client(Client(self._bot.user.id, 0, 0, 0, 0, 0, server))
+                self._db_context.save_changes()
+
+                client = self._clients.find_client_by_server_id(server.id)
+                if client is None:
+                    self._logger.fatal(
+                        __name__,
+                        f"Cannot add client {self._bot.user.id} for server {g.id}",
+                    )
+
+                self._logger.debug(__name__, f"Added client: {g.id}")
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get client", e)
+
+        results = self._servers.get_servers()
+        if results is None or len(results) == 0:
+            self._logger.error(__name__, f"Table Servers is empty!")
+
+    def _check_users(self):
+        self._logger.debug(__name__, f"Start checking Users table")
+        for g in self._bot.guilds:
+            g: discord.Guild = g
+
+            try:
+                server = self._servers.find_server_by_discord_id(g.id)
+                if server is None:
+                    self._logger.fatal(__name__, f"Server not found in database: {g.id}")
+
+                for u in g.members:
+                    u: Union[discord.Member, discord.User] = u
+                    if u.bot:
+                        self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
+                        continue
+
+                    user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
+                    if user is not None:
+                        continue
+
+                    self._logger.warn(__name__, f"User not found in database: {u.id}")
+                    self._logger.debug(__name__, f"Add user: {u.id}")
+                    self._users.add_user(User(u.id, 0, server))
+                    self._db_context.save_changes()
+
+                    self._logger.debug(__name__, f"Added User: {u.id}")
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get User", e)
+
+            results = self._users.get_users()
+            if results is None or len(results) == 0:
+                self._logger.error(__name__, f"Table Users is empty!")
+
+    def _check_user_joins(self):
+        self._logger.debug(__name__, f"Start checking UserJoinedServers table")
+        for guild in self._bot.guilds:
+            guild: discord.Guild = guild
+
+            server = self._servers.find_server_by_discord_id(guild.id)
+            if server is None:
+                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
+
+            try:
+                for u in guild.members:
+                    u: discord.User = u
+                    if u.bot:
+                        self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
+                        continue
+
+                    user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
+                    if user is None:
+                        self._logger.fatal(__name__, f"User not found in database: {u.id}")
+
+                    join = self._user_joins.find_active_user_joined_server_by_user_id(user.id)
+                    if join is not None:
+                        continue
+
+                    m: discord.Member = u
+                    self._logger.warn(
+                        __name__,
+                        f"Active UserJoinedServer not found in database: {guild.id}:{u.id}@{m.joined_at}",
+                    )
+                    self._logger.debug(
+                        __name__,
+                        f"Add UserJoinedServer: {guild.id}:{u.id}@{m.joined_at}",
+                    )
+                    self._user_joins.add_user_joined_server(
+                        UserJoinedServer(user, self._dtp.transform(m.joined_at), None)
+                    )
+                    self._db_context.save_changes()
+
+                    self._logger.debug(__name__, f"Added UserJoinedServer: {u.id}")
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get UserJoinedServer", e)
+
+            results = self._users.get_users()
+            if results is None or len(results) == 0:
+                self._logger.error(__name__, f"Table Users is empty!")
+
+            joins = self._user_joins.get_user_joined_servers()
+            for join in joins:
+                join: UserJoinedServer = join
+                if join.user.server.discord_id != guild.id:
+                    continue
+
+                if join.leaved_on is not None:
+                    continue
+
+                dc_user = guild.get_member(join.user.discord_id)
+                if dc_user is None:
+                    self._logger.warn(
+                        __name__,
+                        f"User {join.user.discord_id} already left the server.",
+                    )
+                    join.leaved_on = datetime.now()
+                    self._user_joins.update_user_joined_server(join)
+
+            self._db_context.save_changes()
+
+    def _check_user_joins_vc(self):
+        self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table")
+        for guild in self._bot.guilds:
+            guild: discord.Guild = guild
+            settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
+
+            server = self._servers.find_server_by_discord_id(guild.id)
+            if server is None:
+                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
+
+            try:
+                # close open voice states
+                for member in guild.members:
+                    if member.bot:
+                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
+                        continue
+
+                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
+                    if user is None:
+                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
+
+                    joins = self._user_joins_vc.find_active_user_joined_voice_channels_by_user_id(user.id)
+                    if joins is None or len(joins) == 0:
+                        continue
+
+                    for join in joins:
+                        self._logger.warn(
+                            __name__,
+                            f"Active UserJoinedVoiceChannel found in database: {guild.id}:{member.id}@{join.joined_on}",
+                        )
+                        join.leaved_on = datetime.now()
+
+                        if (
+                            (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
+                        ) > settings.max_voice_state_hours:
+                            join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
+
+                        self._user_joins_vc.update_user_joined_voice_channel(join)
+
+                        if self._is_for_shutdown:
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
+                            self._users.update_user(user)
+
+                        self._db_context.save_changes()
+                        if self._is_for_shutdown:
+                            return
+
+                # add open voice states
+                for member in guild.members:
+                    if member.bot:
+                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
+                        continue
+
+                    if member.voice is None or member.voice.channel.id in settings.afk_channel_ids:
+                        continue
+
+                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
+                    if user is None:
+                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
+
+                    join = UserJoinedVoiceChannel(user, member.voice.channel.id, datetime.now())
+                    self._user_joins_vc.add_user_joined_voice_channel(join)
+                    self._db_context.save_changes()
+
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get UserJoinedVoiceChannel", e)
+
+    def _check_user_joined_gs(self):
+        self._logger.debug(__name__, f"Start checking UserJoinedGameServer table")
+        for guild in self._bot.guilds:
+            guild: discord.Guild = guild
+
+            server = self._servers.find_server_by_discord_id(guild.id)
+            if server is None:
+                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
+
+            try:
+                for member in guild.members:
+                    if member.bot:
+                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
+                        continue
+
+                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
+                    if user is None:
+                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
+
+                    joins = self._user_joined_gs.find_active_user_joined_game_servers_by_user_id(user.id)
+                    if joins is None or len(joins) == 0:
+                        continue
+
+                    for join in joins:
+                        self._logger.warn(
+                            __name__,
+                            f"Active UserJoinedGameServer found in database: {guild.id}:{member.id}@{join.joined_on}",
+                        )
+                        join.leaved_on = datetime.now()
+                        settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
+
+                        if (
+                            (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
+                        ) > settings.max_voice_state_hours:
+                            join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
+
+                        self._user_joined_gs.update_user_joined_game_server(join)
+                        if self._is_for_shutdown:
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
+                            self._users.update_user(user)
+
+                        self._db_context.save_changes()
+            except Exception as e:
+                self._logger.error(__name__, f"Cannot get UserJoinedGameServer", e)
+
+    def check_data_integrity(self, is_for_shutdown=False):
+        if is_for_shutdown != self._is_for_shutdown:
+            self._is_for_shutdown = is_for_shutdown
+
+        self._check_known_users()
+        self._check_servers()
+        self._check_clients()
+        self._check_users()
+        self._check_user_joins()
+        self._check_user_joins_vc()
+        self._check_user_joined_gs()

kdb-bot/src/bot_data/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/bot-data.json

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

kdb-bot/src/bot_data/migration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_data/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/bot-graphql.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=1.0.4"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.0.4"
+      "cpl-core==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_graphql/filter/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/mutations/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/queries/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_graphql/queries/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/auto_role/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/auto_role/auto-role.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/auto_role/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/auto_role/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/auto_role/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/base.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/base/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/helper/base_reaction_handler.py

@@ -47,6 +47,10 @@ class BaseReactionHandler:
                 log_msg += f" with {payload.emoji.name}"
             try:
                 channel = guild.get_channel(payload.channel_id)
+                if channel is None:
+                    self._logger.warn(__name__, f"Channel not found")
+                    return
+
                 message = await channel.fetch_message(payload.message_id)
                 self._logger.info(
                     __name__,

kdb-bot/src/modules/base/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/base/thread/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.thread"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/boot_log/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.boot_log"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/boot_log/boot-log.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/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 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.database"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/database/database.json

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

kdb-bot/src/modules/database/database_on_ready_event.py

@@ -1,31 +1,11 @@
-from ctypes import Union
-from datetime import datetime, timedelta
+from datetime import datetime
 
-import discord
 from cpl_core.configuration import ConfigurationABC
-from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.events import OnReadyABC
-from cpl_discord.service import DiscordBotServiceABC
 
 from bot_core.logging.database_logger import DatabaseLogger
-from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
-from bot_data.abc.client_repository_abc import ClientRepositoryABC
-from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
-from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC
-from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import (
-    UserJoinedVoiceChannelRepositoryABC,
-)
-from bot_data.abc.user_repository_abc import UserRepositoryABC
-from bot_data.model.client import Client
-from bot_data.model.known_user import KnownUser
-from bot_data.model.server import Server
-from bot_data.model.user import User
-from bot_data.model.user_joined_server import UserJoinedServer
-from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
+from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_data.service.seeder_service import SeederService
-from bot_data.service.user_repository_service import ServerRepositoryABC
-from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
 class DatabaseOnReadyEvent(OnReadyABC):
@@ -34,31 +14,13 @@ class DatabaseOnReadyEvent(OnReadyABC):
         config: ConfigurationABC,
         logger: DatabaseLogger,
         seeder: SeederService,
-        bot: DiscordBotServiceABC,
-        db_context: DatabaseContextABC,
-        server_repo: ServerRepositoryABC,
-        user_repo: UserRepositoryABC,
-        client_repo: ClientRepositoryABC,
-        known_users: KnownUserRepositoryABC,
-        user_joins: UserJoinedServerRepositoryABC,
-        user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
-        user_joined_gs: UserJoinedGameServerRepositoryABC,
-        dtp: DateTimeOffsetPipe,
+        data_integrity: DataIntegrityService,
     ):
         self._config = config
 
         self._logger = logger
         self._seeder = seeder
-        self._bot = bot
-        self._db_context = db_context
-        self._servers = server_repo
-        self._users = user_repo
-        self._clients = client_repo
-        self._known_users = known_users
-        self._user_joins = user_joins
-        self._user_joins_vc = user_joins_vc
-        self._user_joined_gs = user_joined_gs
-        self._dtp = dtp
+        self._data_integrity = data_integrity
 
         OnReadyABC.__init__(self)
         self._logger.info(__name__, f"Module {type(self)} loaded")
@@ -83,306 +45,10 @@ class DatabaseOnReadyEvent(OnReadyABC):
             self._logger.error(__name__, "Database init time calculation failed", e)
             return
 
-    def _check_known_users(self):
-        self._logger.debug(__name__, f"Start checking KnownUsers table, {len(self._bot.users)}")
-        for u in self._bot.users:
-            u: discord.User = u
-            try:
-                if u.bot:
-                    self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
-                    continue
-
-                user = self._known_users.find_user_by_discord_id(u.id)
-                if user is not None:
-                    continue
-
-                self._logger.warn(__name__, f"Unknown user: {u.id}")
-                self._logger.debug(__name__, f"Add user: {u.id}")
-                self._known_users.add_user(KnownUser(u.id))
-                self._db_context.save_changes()
-
-                user = self._known_users.find_user_by_discord_id(u.id)
-                if user is None:
-                    self._logger.fatal(__name__, f"Cannot add user: {u.id}")
-
-                self._logger.debug(__name__, f"Added user: {u.id}")
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get user", e)
-
-    def _check_servers(self):
-        self._logger.debug(__name__, f"Start checking Servers table")
-        for g in self._bot.guilds:
-            g: discord.Guild = g
-            try:
-                server = self._servers.find_server_by_discord_id(g.id)
-                if server is not None:
-                    continue
-
-                self._logger.warn(__name__, f"Server not found in database: {g.id}")
-                self._logger.debug(__name__, f"Add server: {g.id}")
-                self._servers.add_server(Server(g.id))
-                self._db_context.save_changes()
-
-                server = self._servers.find_server_by_discord_id(g.id)
-                if server is None:
-                    self._logger.fatal(__name__, f"Cannot add server: {g.id}")
-
-                self._logger.debug(__name__, f"Added server: {g.id}")
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get server", e)
-
-        results = self._servers.get_servers()
-        if results is None or len(results) == 0:
-            self._logger.error(__name__, f"Table Servers is empty!")
-
-    def _check_clients(self):
-        self._logger.debug(__name__, f"Start checking Clients table")
-        for g in self._bot.guilds:
-            g: discord.Guild = g
-            try:
-                server: Server = self._servers.find_server_by_discord_id(g.id)
-                if server is None:
-                    self._logger.fatal(__name__, f"Server not found in database: {g.id}")
-
-                client = self._clients.find_client_by_server_id(server.id)
-                if client is not None:
-                    continue
-
-                self._logger.warn(
-                    __name__,
-                    f"Client for server {g.id} not found in database: {self._bot.user.id}",
-                )
-                self._logger.debug(__name__, f"Add client: {self._bot.user.id}")
-                self._clients.add_client(Client(self._bot.user.id, 0, 0, 0, 0, 0, server))
-                self._db_context.save_changes()
-
-                client = self._clients.find_client_by_server_id(server.id)
-                if client is None:
-                    self._logger.fatal(
-                        __name__,
-                        f"Cannot add client {self._bot.user.id} for server {g.id}",
-                    )
-
-                self._logger.debug(__name__, f"Added client: {g.id}")
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get client", e)
-
-        results = self._servers.get_servers()
-        if results is None or len(results) == 0:
-            self._logger.error(__name__, f"Table Servers is empty!")
-
-    def _check_users(self):
-        self._logger.debug(__name__, f"Start checking Users table")
-        for g in self._bot.guilds:
-            g: discord.Guild = g
-
-            try:
-                server = self._servers.find_server_by_discord_id(g.id)
-                if server is None:
-                    self._logger.fatal(__name__, f"Server not found in database: {g.id}")
-
-                for u in g.members:
-                    u: Union[discord.Member, discord.User] = u
-                    if u.bot:
-                        self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
-                        continue
-
-                    user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
-                    if user is not None:
-                        continue
-
-                    self._logger.warn(__name__, f"User not found in database: {u.id}")
-                    self._logger.debug(__name__, f"Add user: {u.id}")
-                    self._users.add_user(User(u.id, 0, server))
-                    self._db_context.save_changes()
-
-                    self._logger.debug(__name__, f"Added User: {u.id}")
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get User", e)
-
-            results = self._users.get_users()
-            if results is None or len(results) == 0:
-                self._logger.error(__name__, f"Table Users is empty!")
-
-    def _check_user_joins(self):
-        self._logger.debug(__name__, f"Start checking UserJoinedServers table")
-        for guild in self._bot.guilds:
-            guild: discord.Guild = guild
-
-            server = self._servers.find_server_by_discord_id(guild.id)
-            if server is None:
-                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
-
-            try:
-                for u in guild.members:
-                    u: discord.User = u
-                    if u.bot:
-                        self._logger.trace(__name__, f"User {u.id} is ignored, because its a bot")
-                        continue
-
-                    user = self._users.find_user_by_discord_id_and_server_id(u.id, server.id)
-                    if user is None:
-                        self._logger.fatal(__name__, f"User not found in database: {u.id}")
-
-                    join = self._user_joins.find_active_user_joined_server_by_user_id(user.id)
-                    if join is not None:
-                        continue
-
-                    m: discord.Member = u
-                    self._logger.warn(
-                        __name__,
-                        f"Active UserJoinedServer not found in database: {guild.id}:{u.id}@{m.joined_at}",
-                    )
-                    self._logger.debug(
-                        __name__,
-                        f"Add UserJoinedServer: {guild.id}:{u.id}@{m.joined_at}",
-                    )
-                    self._user_joins.add_user_joined_server(
-                        UserJoinedServer(user, self._dtp.transform(m.joined_at), None)
-                    )
-                    self._db_context.save_changes()
-
-                    self._logger.debug(__name__, f"Added UserJoinedServer: {u.id}")
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get UserJoinedServer", e)
-
-            results = self._users.get_users()
-            if results is None or len(results) == 0:
-                self._logger.error(__name__, f"Table Users is empty!")
-
-            joins = self._user_joins.get_user_joined_servers()
-            for join in joins:
-                join: UserJoinedServer = join
-                if join.user.server.discord_id != guild.id:
-                    continue
-
-                if join.leaved_on is not None:
-                    continue
-
-                dc_user = guild.get_member(join.user.discord_id)
-                if dc_user is None:
-                    self._logger.warn(
-                        __name__,
-                        f"User {join.user.discord_id} already left the server.",
-                    )
-                    join.leaved_on = datetime.now()
-                    self._user_joins.update_user_joined_server(join)
-
-            self._db_context.save_changes()
-
-    def _check_user_joins_vc(self):
-        self._logger.debug(__name__, f"Start checking UserJoinedVoiceChannel table")
-        for guild in self._bot.guilds:
-            guild: discord.Guild = guild
-            settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
-
-            server = self._servers.find_server_by_discord_id(guild.id)
-            if server is None:
-                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
-
-            try:
-                for member in guild.members:
-                    if member.bot:
-                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
-                        continue
-
-                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
-                    if user is None:
-                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
-
-                    joins = self._user_joins_vc.find_active_user_joined_voice_channels_by_user_id(user.id)
-                    if joins is None or len(joins) == 0:
-                        continue
-
-                    for join in joins:
-                        self._logger.warn(
-                            __name__,
-                            f"Active UserJoinedVoiceChannel found in database: {guild.id}:{member.id}@{join.joined_on}",
-                        )
-                        join.leaved_on = datetime.now()
-
-                        if (
-                            (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
-                        ) > settings.max_voice_state_hours:
-                            join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
-
-                        self._user_joins_vc.update_user_joined_voice_channel(join)
-                        # todo: maybe add XP
-                        self._db_context.save_changes()
-
-                for member in guild.members:
-                    if member.bot:
-                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
-                        continue
-
-                    if member.voice is None or member.voice.channel.id in settings.afk_channel_ids:
-                        continue
-
-                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
-                    if user is None:
-                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
-
-                    join = UserJoinedVoiceChannel(user, member.voice.channel.id, datetime.now())
-                    self._user_joins_vc.add_user_joined_voice_channel(join)
-                    self._db_context.save_changes()
-                    self._logger.warn(__name__, f"VS {member.voice}")
-
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get UserJoinedVoiceChannel", e)
-
-    def _check_user_joined_gs(self):
-        self._logger.debug(__name__, f"Start checking UserJoinedGameServer table")
-        for guild in self._bot.guilds:
-            guild: discord.Guild = guild
-
-            server = self._servers.find_server_by_discord_id(guild.id)
-            if server is None:
-                self._logger.fatal(__name__, f"Server not found in database: {guild.id}")
-
-            try:
-                for member in guild.members:
-                    if member.bot:
-                        self._logger.trace(__name__, f"User {member.id} is ignored, because its a bot")
-                        continue
-
-                    user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
-                    if user is None:
-                        self._logger.fatal(__name__, f"User not found in database: {member.id}")
-
-                    joins = self._user_joined_gs.find_active_user_joined_game_servers_by_user_id(user.id)
-                    if joins is None or len(joins) == 0:
-                        continue
-
-                    for join in joins:
-                        self._logger.warn(
-                            __name__,
-                            f"Active UserJoinedGameServer found in database: {guild.id}:{member.id}@{join.joined_on}",
-                        )
-                        join.leaved_on = datetime.now()
-                        settings: BaseServerSettings = self._config.get_configuration(f"BaseServerSettings_{guild.id}")
-
-                        if (
-                            (join.leaved_on - join.joined_on).total_seconds() / 60 / 60
-                        ) > settings.max_voice_state_hours:
-                            join.leaved_on = join.joined_on + timedelta(hours=settings.max_voice_state_hours)
-
-                        self._user_joined_gs.update_user_joined_game_server(join)
-                        # todo: maybe add XP
-                        self._db_context.save_changes()
-            except Exception as e:
-                self._logger.error(__name__, f"Cannot get UserJoinedGameServer", e)
-
     async def on_ready(self):
         self._logger.debug(__name__, f"Module {type(self)} started")
 
-        self._check_known_users()
-        self._check_servers()
-        self._check_clients()
-        self._check_users()
-        self._check_user_joins()
-        self._check_user_joins_vc()
-        self._check_user_joined_gs()
-
+        self._data_integrity.check_data_integrity()
         await self._seeder.seed()
 
         self._validate_init_time()

kdb-bot/src/modules/level/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/level/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/level/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/level/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/level/events/level_on_raw_reaction_add_event.py

@@ -0,0 +1,34 @@
+from cpl_core.logging import LoggerABC
+from cpl_discord.events.on_raw_reaction_add_abc import OnRawReactionAddABC
+from cpl_discord.service import DiscordBotServiceABC
+from discord import RawReactionActionEvent
+
+from bot_core.helper.event_checks import EventChecks
+from modules.level.service.level_service import LevelService
+
+
+class LevelOnRawReactionAddEvent(OnRawReactionAddABC):
+    def __init__(
+        self,
+        logger: LoggerABC,
+        bot: DiscordBotServiceABC,
+        level: LevelService,
+    ):
+        OnRawReactionAddABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._level = level
+
+    @EventChecks.check_is_ready()
+    async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
+        self._logger.debug(__name__, f"Module {type(self)} started")
+        try:
+            self._logger.trace(__name__, f"Handle reaction {payload} for level")
+
+            guild = self._bot.get_guild(payload.guild_id)
+            member = guild.get_member(payload.user_id)
+
+            await self._level.check_level(member)
+        except Exception as e:
+            self._logger.error(__name__, f"Level check by message failed", e)

kdb-bot/src/modules/level/events/level_on_raw_reaction_remove_event.py

@@ -0,0 +1,34 @@
+from cpl_core.logging import LoggerABC
+from cpl_discord.events.on_raw_reaction_remove_abc import OnRawReactionRemoveABC
+from cpl_discord.service import DiscordBotServiceABC
+from discord import RawReactionActionEvent
+
+from bot_core.helper.event_checks import EventChecks
+from modules.level.service.level_service import LevelService
+
+
+class LevelOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
+    def __init__(
+        self,
+        logger: LoggerABC,
+        bot: DiscordBotServiceABC,
+        level: LevelService,
+    ):
+        OnRawReactionRemoveABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._level = level
+
+    @EventChecks.check_is_ready()
+    async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
+        self._logger.debug(__name__, f"Module {type(self)} started")
+        try:
+            self._logger.trace(__name__, f"Handle reaction {payload} for level")
+
+            guild = self._bot.get_guild(payload.guild_id)
+            member = guild.get_member(payload.user_id)
+
+            await self._level.check_level(member)
+        except Exception as e:
+            self._logger.error(__name__, f"Level check by message failed", e)

kdb-bot/src/modules/level/level.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/level/level_module.py

@@ -12,6 +12,8 @@ from bot_data.abc.data_seeder_abc import DataSeederABC
 from modules.level.command.level_group import LevelGroup
 from modules.level.events.level_on_member_join_event import LevelOnMemberJoinEvent
 from modules.level.events.level_on_message_event import LevelOnMessageEvent
+from modules.level.events.level_on_raw_reaction_add_event import LevelOnRawReactionAddEvent
+from modules.level.events.level_on_raw_reaction_remove_event import LevelOnRawReactionRemoveEvent
 from modules.level.events.level_on_voice_state_update_event import (
     LevelOnVoiceStateUpdateEvent,
 )
@@ -43,3 +45,5 @@ class LevelModule(ModuleABC):
             LevelOnVoiceStateUpdateEvent,
         )
         self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, LevelOnMemberJoinEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, LevelOnRawReactionAddEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_remove.value, LevelOnRawReactionRemoveEvent)

kdb-bot/src/modules/level/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/permission/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/permission/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/permission/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/permission/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/permission/permission.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/permission/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/technician/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.technician"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/technician/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.technician.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 
 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="6")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/modules/technician/technician.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "6"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/tools/checks/checks.json

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

kdb-bot/tools/get_version/get-version.json

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

kdb-bot/tools/post_build/post-build.json

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

kdb-bot/tools/set_version/application.py

@@ -2,8 +2,6 @@ import os
 import traceback
 
 from cpl_cli.configuration import ProjectSettings
-from cpl_core.utils import String
-
 from cpl_cli.configuration.version_settings_name_enum import VersionSettingsNameEnum
 from cpl_cli.configuration.workspace_settings import WorkspaceSettings
 from cpl_core.application.application_abc import ApplicationABC
@@ -11,6 +9,8 @@ from cpl_core.configuration.configuration_abc import ConfigurationABC
 from cpl_core.console.console import Console
 from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
 from cpl_core.pipes.version_pipe import VersionPipe
+from cpl_core.utils import String
+
 from set_version.git_service import GitService
 from set_version.version_setter_service import VersionSetterService
 
@@ -65,6 +65,10 @@ class Application(ApplicationABC):
                 version[VersionSettingsNameEnum.minor.value] = ps.version.minor
                 version[VersionSettingsNameEnum.micro.value] = f'dev{branch.split("#")[1]}'
             else:
+                if "." not in branch and "." in suffix:
+                    branch = suffix
+                    suffix = ""
+
                 version[VersionSettingsNameEnum.major.value] = branch.split(".")[0]
                 version[VersionSettingsNameEnum.minor.value] = branch.split(".")[1]
                 if len(branch.split(".")) == 2:

kdb-bot/tools/set_version/set-version.json

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

kdb-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",
@@ -51,4 +51,4 @@
         "tslib": "^2.4.1",
         "typescript": "~4.9.5"
     }
-}
+}

kdb-web/src/app/models/data/user.model.ts

@@ -23,17 +23,6 @@ export interface User extends DataWithHistory {
 
   userJoinedGameServerCount?: number;
   userJoinedGameServers?: UserJoinedGameServer[];
-
-  // history?: UserHistory[];
-}
-
-export interface UserHistory extends History {
-  id?: number;
-  discordId?: number;
-  xp?: number;
-  level?: number;
-  server?: number;
-  leftServer?: boolean;
 }
 
 export interface UserFilter {

kdb-web/src/app/models/graphql/queries.model.ts

@@ -62,6 +62,17 @@ export class Queries {
           }
           createdAt
           modifiedAt
+        }
+      }
+    }
+  `;
+
+  static levelWithHistoryQuery = `
+    query LevelHistory($serverId: ID, $id: ID) {
+      servers(filter: {id: $serverId}) {
+        levelCount
+        levels(filter: {id: $id}) {
+          id
 
           history {
             id
@@ -94,6 +105,29 @@ export class Queries {
             name
           }
           leftServer
+
+          createdAt
+          modifiedAt
+        }
+      }
+    }
+  `;
+
+  static userProfile = `
+    query UserProfile($serverId: ID, $userId: ID, $page: Page, $sort: Sort) {
+      servers(filter: {id: $serverId}) {
+        userCount
+        users(filter: {id: $userId}, page: $page, sort: $sort) {
+          id
+          discordId
+          name
+          xp
+          ontime
+          level {
+            id
+            name
+          }
+          leftServer
           server {
             id
             name
@@ -124,9 +158,17 @@ export class Queries {
             joinedOn
             leavedOn
           }
+        }
+      }
+    }
+  `;
 
-          createdAt
-          modifiedAt
+  static userQueryWithHistory = `
+    query UsersWithHistory($serverId: ID, $id: ID) {
+      servers(filter: {id: $serverId}) {
+        userCount
+        users(filter: {id: $id}) {
+          id
 
           history {
             id
@@ -159,6 +201,17 @@ export class Queries {
 
           createdAt
           modifiedAt
+        }
+      }
+    }
+  `;
+
+  static autoRolesWithHistoryQuery = `
+    query AutoRoleWithHistoryQuery($serverId: ID, $id: ID) {
+      servers(filter: {id: $serverId}) {
+        autoRoleCount
+        autoRoles(filter: {id: $id}) {
+          id
 
           history {
             id
@@ -191,6 +244,19 @@ export class Queries {
 
             createdAt
             modifiedAt
+          }
+        }
+      }
+    }
+  `;
+
+  static autoRoleRulesHistoryQuery = `
+    query AutoRoleRuleHistoryQuery($serverId: ID, $autoRoleId: ID, $id: ID) {
+      servers(filter: {id: $serverId}) {
+        autoRoles(filter: {id: $autoRoleId}) {
+          autoRoleRuleCount
+          autoRoleRules(filter: {id: $id}) {
+            id
 
             history {
               id

kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.ts

@@ -40,7 +40,7 @@ export class ForgetPasswordComponent implements OnInit {
 
   ngOnInit(): void {
     this.spinnerService.showSpinner();
-    if (!this.authService.isLoggedIn$.value) {
+    if (this.authService.isLoggedIn$.value) {
       this.router.navigate(["/dashboard"]);
     }