Merge pull request '1.0.2 #283' (#284) from 1.0.2 into master

Reviewed-on: sh-edraft.de/kd_discord_bot#284
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #283

kdb-bot/cpl-workspace.json

@@ -14,6 +14,7 @@
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",
       "technician": "src/modules/technician/technician.json",
+      "checks": "tools/checks/checks.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
       "set-version": "tools/set_version/set-version.json"

kdb-bot/dockerfile

@@ -15,4 +15,7 @@ RUN apk add nano
 RUN pip install -r requirements.txt --extra-index-url https://pip.sh-edraft.de
 RUN pip install flask[async]
 
+# RUN pip install dnspython==2.2.1 # https://stackoverflow.com/questions/75137717/eventlet-dns-python-attribute-error-module-dns-rdtypes-has-no-attribute-any
+# ^ probably fixed py package updates
+
 CMD [ "bash", "/app/bot/bot"]

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

kdb-bot/src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -19,6 +19,7 @@
       "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",
       "Flask-Classful==0.14.2",
       "Flask-Cors==3.0.10",
@@ -28,8 +29,7 @@
       "eventlet==0.33.3",
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3",
-      "ariadne==0.17.1",
-      "cpl-discord==2022.12.2"
+      "ariadne==0.17.1"
     ],
     "DevDependencies": [
       "cpl-cli==2022.12.1.post3",

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

kdb-bot/src/bot/translation/de.json

@@ -86,10 +86,10 @@
     "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...",
-      "restart": "{} Muss neue Kekse holen...",
-      "running": "{} Ich esse Kekse :D",
-      "shutdown": "{} Ich werde bestimmt wieder kommen..."
+      "booting": "Ich fahre gerade hoch...",
+      "restart": "Muss neue Kekse holen...",
+      "running": "Ich esse Kekse :D",
+      "shutdown": "Ich werde bestimmt wieder kommen..."
     }
   },
   "modules": {

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

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

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

@@ -129,7 +129,6 @@ class AuthController:
         return "", 200
 
     @Route.post(f"{BasePath}/refresh")
-    @Route.authorize
     async def refresh(self) -> Response:
         dto: TokenDTO = JSONProcessor.process(TokenDTO, request.get_json(force=True, silent=True))
         result = await self._auth_service.refresh_async(dto)

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

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

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

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

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

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

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

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

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

@@ -483,18 +483,19 @@ class AuthService(AuthServiceABC):
         if user_dto is None:
             raise ServiceException(ServiceErrorCode.InvalidData, "User not set")
 
+        members = self._users.get_users_by_discord_id(dc_id)
+        if members.count() == 0:
+            raise ServiceException(ServiceErrorCode.InvalidUser, f"Member not found")
+
         added_user = False
         db_user = self._auth_users.find_auth_user_by_email(user_dto.email)
         if db_user is None:
             self.add_auth_user(user_dto)
             added_user = True
-            # raise ServiceException(ServiceErrorCode.InvalidUser, f'User not found')
 
         db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
         if db_user.users.count() == 0:
-            self._users.get_users_by_discord_id(dc_id).for_each(
-                lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x))
-            )
+            members.for_each(lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x)))
 
         if db_user.confirmation_id is not None and not added_user:
             raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")

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

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

@@ -2,9 +2,11 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 from typing import Callable
 
+import discord
 from cpl_query.extension import List
 from discord.ext.commands import Context
 
+from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.user import User
 from modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -59,3 +61,9 @@ class ClientUtilsABC(ABC):
     @abstractmethod
     def get_ontime_for_user(self, user: User) -> float:
         pass
+
+    @abstractmethod
+    async def react_to_message_by_auto_role_rule(
+        self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
+    ):
+        pass

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

@@ -25,7 +25,9 @@ class MessageServiceABC(ABC):
         self,
         channel: discord.TextChannel,
         message: Union[str, discord.Embed],
-        without_tracking=True,
+        is_persistent: bool = False,
+        wait_before_delete: int = None,
+        without_tracking=False,
     ):
         pass
 

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

@@ -10,11 +10,12 @@ class FeatureFlagsEnum(Enum):
     boot_log_module = "BootLogModule"
     core_module = "CoreModule"
     core_extension_module = "CoreExtensionModule"
-    data_module = ("DataModule",)
-    database_module = ("DatabaseModule",)
+    data_module = "DataModule"
+    database_module = "DatabaseModule"
     level_module = "LevelModule"
     moderator_module = "ModeratorModule"
     permission_module = "PermissionModule"
     # features
     api_only = "ApiOnly"
     presence = "Presence"
+    version_in_presence = "VersionInPresence"

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

@@ -1,5 +1,4 @@
 import traceback
-from typing import Optional, Callable
 
 from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
 from cpl_core.console import Console
@@ -27,6 +26,7 @@ class FeatureFlagsSettings(ConfigurationModelABC):
             # features
             FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
             FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
+            FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
         }
 
     def get_flag(self, key: FeatureFlagsEnum) -> bool:

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

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

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

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

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

@@ -9,6 +9,7 @@ from cpl_core.time import TimeFormatSettings
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from cpl_translation import TranslatePipe
+from discord import Guild
 from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
@@ -23,6 +24,7 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import (
 from bot_data.abc.user_message_count_per_hour_repository_abc import (
     UserMessageCountPerHourRepositoryABC,
 )
+from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.user import User
 from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
 from modules.base.configuration.base_server_settings import BaseServerSettings
@@ -111,7 +113,11 @@ class ClientUtilsService(ClientUtilsABC):
 
         import bot
 
-        name = self._t.transform(t_key).format(bot.__version__)
+        if self._feature_flags.get_flag(FeatureFlagsEnum.version_in_presence):
+            name = f"{bot.__version__} {self._t.transform(t_key)}"
+        else:
+            name = self._t.transform(t_key)
+
         await self._bot.change_presence(activity=discord.Game(name=name))
         self._logger.info(__name__, f"Set presence {name}")
 
@@ -188,3 +194,27 @@ class ClientUtilsService(ClientUtilsABC):
             .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
             2,
         )
+
+    async def react_to_message_by_auto_role_rule(
+        self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
+    ):
+        try:
+            guild: Guild = self._bot.guilds.where(lambda g: g == guild).single()
+            channel = guild.get_channel(discord_channel_id)
+            message = await channel.fetch_message(discord_message_id)
+            emoji = List(discord.Emoji, guild.emojis).where(lambda x: x.name == rule.emoji_name).single()
+
+            if emoji is None:
+                self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found")
+                return
+            await message.add_reaction(emoji)
+            self._logger.debug(
+                __name__,
+                f"Added reaction {rule.emoji_name} to message: {discord_message_id}",
+            )
+        except Exception as e:
+            self._logger.error(
+                __name__,
+                f"Cannot add reaction {rule.emoji_name} to message: {discord_message_id}",
+                e,
+            )

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

kdb-bot/src/bot_data/data_module.py

@@ -27,6 +27,7 @@ from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC
 from bot_data.service.api_key_repository_service import ApiKeyRepositoryService
 from bot_data.service.auth_user_repository_service import AuthUserRepositoryService
 from bot_data.service.auto_role_repository_service import AutoRoleRepositoryService
+from bot_data.service.cache_service import CacheService
 from bot_data.service.client_repository_service import ClientRepositoryService
 from bot_data.service.game_server_repository_service import GameServerRepositoryService
 from bot_data.service.known_user_repository_service import KnownUserRepositoryService
@@ -56,6 +57,8 @@ class DataModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        services.add_singleton(CacheService)
+
         services.add_transient(ApiKeyRepositoryABC, ApiKeyRepositoryService)
         services.add_transient(AuthUserRepositoryABC, AuthUserRepositoryService)
         services.add_transient(ServerRepositoryABC, ServerRepositoryService)

kdb-bot/src/bot_data/db_context.py

@@ -1,3 +1,5 @@
+import time
+
 from cpl_core.database import DatabaseSettings
 from cpl_core.database.context import DatabaseContext
 
@@ -31,4 +33,9 @@ class DBContext(DatabaseContext):
             return super(DBContext, self).select(statement)
         except Exception as e:
             self._logger.error(__name__, f"Database error caused by {statement}", e)
+            try:
+                time.sleep(0.5)
+                return self.select(statement)
+            except Exception as e:
+                pass
             return []

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

kdb-bot/src/bot_data/migration/db_history_scripts/api_keys.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `ApiKeys`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `ApiKeys`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `ApiKeys`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ApiKeysHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auth_user_users_relation.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `AuthUserUsersRelations`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AuthUserUsersRelations`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `AuthUserUsersRelations`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 
 CREATE TABLE IF NOT EXISTS `AuthUserUsersRelationsHistory`

kdb-bot/src/bot_data/migration/db_history_scripts/auth_users.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `AuthUsers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AuthUsers`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `AuthUsers`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AuthUsersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auto_role_rules.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `AutoRoleRules`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AutoRoleRules`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `AutoRoleRules`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AutoRoleRulesHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/auto_roles.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `AutoRoles`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `AutoRoles`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `AutoRoles`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `AutoRolesHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/clients.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `Clients`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Clients`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `Clients`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ClientsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/game_servers.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `GameServers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `GameServers`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `GameServers`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `GameServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/known_users.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `KnownUsers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `KnownUsers`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `KnownUsers`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `KnownUsersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/levels.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `Levels`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Levels`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `Levels`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `LevelsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/servers.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `Servers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Servers`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `Servers`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `ServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_game_idents.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserGameIdents`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserGameIdents`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserGameIdents`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserGameIdentsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_game_servers.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserJoinedGameServer`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedGameServer`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserJoinedGameServer`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedGameServerHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_servers.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserJoinedServers`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedServers`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserJoinedServers`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedServersHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_joined_voice_channel.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserJoinedVoiceChannel`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserJoinedVoiceChannel`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserJoinedVoiceChannel`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserJoinedVoiceChannelHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_message_count_per_hour.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserMessageCountPerHour`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserMessageCountPerHour`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserMessageCountPerHour`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserMessageCountPerHourHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/user_warnings.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `UserWarnings`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `UserWarnings`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `UserWarnings`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UserWarningsHistory`
 (

kdb-bot/src/bot_data/migration/db_history_scripts/users.sql

@@ -1,11 +1,8 @@
 ALTER TABLE `Users`
-    MODIFY `LastModifiedAt` DATETIME(6) NULL ON UPDATE CURRENT_TIMESTAMP(6);
+    CHANGE `CreatedAt` `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6);
 
 ALTER TABLE `Users`
-    ALTER COLUMN `CreatedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
-
-ALTER TABLE `Users`
-    ALTER COLUMN `LastModifiedAt` SET DEFAULT CURRENT_TIMESTAMP(6);
+    CHANGE `LastModifiedAt` `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
 
 CREATE TABLE IF NOT EXISTS `UsersHistory`
 (

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

@@ -0,0 +1,16 @@
+from cpl_query.extension import List
+
+from bot_data.model.server import Server
+
+
+class CacheService:
+    def __init__(self):
+        self._cached_server = List(Server)
+
+    @property
+    def cached_server(self) -> List[Server]:
+        return self._cached_server
+
+    @cached_server.setter
+    def cached_server(self, value: List[Server]):
+        self._cached_server = value

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

@@ -8,12 +8,14 @@ from bot_core.logging.database_logger import DatabaseLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.filtered_result import FilteredResult
 from bot_data.model.server import Server
+from bot_data.service.cache_service import CacheService
 
 
 class ServerRepositoryService(ServerRepositoryABC):
-    def __init__(self, logger: DatabaseLogger, db_context: DatabaseContextABC):
+    def __init__(self, logger: DatabaseLogger, db_context: DatabaseContextABC, cache: CacheService):
         self._logger = logger
         self._context = db_context
+        self._cache = cache
 
         ServerRepositoryABC.__init__(self)
 
@@ -24,6 +26,7 @@ class ServerRepositoryService(ServerRepositoryABC):
         for result in results:
             servers.append(Server(result[1], result[2], result[3], id=result[0]))
 
+        self._cache.cached_server = List(Server, servers)
         return servers
 
     def get_filtered_servers(self, criteria: ServerSelectCriteria) -> FilteredResult:
@@ -52,11 +55,21 @@ class ServerRepositoryService(ServerRepositoryABC):
         return result
 
     def get_server_by_id(self, server_id: int) -> Server:
+        cs = self._cache.cached_server.where(lambda x: x.id == server_id).single_or_default()
+        if cs is not None:
+            return cs
+
         self._logger.trace(__name__, f"Send SQL command: {Server.get_select_by_id_string(server_id)}")
         result = self._context.select(Server.get_select_by_id_string(server_id))[0]
-        return Server(result[1], result[2], result[3], id=result[0])
+        server = Server(result[1], result[2], result[3], id=result[0])
+        self._cache.cached_server.add(server)
+        return server
 
     def get_server_by_discord_id(self, discord_id: int) -> Server:
+        cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
+        if cs is not None:
+            return cs
+
         self._logger.trace(
             __name__,
             f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",
@@ -65,6 +78,10 @@ class ServerRepositoryService(ServerRepositoryABC):
         return Server(result[1], result[2], result[3], id=result[0])
 
     def find_server_by_discord_id(self, discord_id: int) -> Optional[Server]:
+        cs = self._cache.cached_server.where(lambda x: x.discord_id == discord_id).single_or_default()
+        if cs is not None:
+            return cs
+
         self._logger.trace(
             __name__,
             f"Send SQL command: {Server.get_select_by_discord_id_string(discord_id)}",

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

@@ -82,7 +82,7 @@ class QueryABC(ObjectType):
                     break
 
         elif type(element) == AutoRoleRule:
-            element: AutoRole = element.game_server
+            element: AutoRole = element
             for u in user.users:
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
@@ -124,28 +124,36 @@ class QueryABC(ObjectType):
         elif type(element) == User:
             for u in user.users:
                 u: User = u
-                if u.id == element.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedServer:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedVoiceChannel:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
         elif type(element) == UserJoinedGameServer:
             for u in user.users:
                 u: User = u
-                if u.id == element.user.id:
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
@@ -182,10 +190,10 @@ class QueryABC(ObjectType):
         if filter is not None:
             collection = filter.filter(collection)
 
-        if page is not None:
-            collection = page.filter(collection)
-
         if sort is not None:
             collection = sort.filter(collection)
 
+        if page is not None:
+            collection = page.filter(collection)
+
         return collection

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "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.0.rc1"
+      "cpl-core>=1.0.2"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.0.0.rc1"
+      "cpl-cli>=1.0.2"
     ],
     "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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

kdb-bot/src/bot_graphql/model/user.gql

@@ -30,7 +30,6 @@ type UserHistory implements HistoryTableQuery {
     xp: Int
 
     server: ID
-    leftServer: Boolean
 
     deleted: Boolean
     dateFrom: String

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

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

@@ -1,5 +1,7 @@
 from cpl_core.database.context import DatabaseContextABC
+from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.auto_role_rule import AutoRoleRule
@@ -10,15 +12,19 @@ from bot_graphql.abc.query_abc import QueryABC
 class AutoRoleRuleMutation(QueryABC):
     def __init__(
         self,
+        bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         auto_roles: AutoRoleRepositoryABC,
         db: DatabaseContextABC,
+        client_utils: ClientUtilsABC,
     ):
         QueryABC.__init__(self, "AutoRoleRuleMutation")
 
+        self._bot = bot
         self._servers = servers
         self._auto_roles = auto_roles
         self._db = db
+        self._client_utils = client_utils
 
         self.set_field("createAutoRoleRule", self.resolve_create_auto_role_rule)
         self.set_field("updateAutoRoleRule", self.resolve_update_auto_role_rule)
@@ -40,6 +46,14 @@ class AutoRoleRuleMutation(QueryABC):
                 and x.role_id == int(input["roleId"])
             )
 
+        self._bot.loop.create_task(
+            self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_rule.auto_role.discord_channel_id,
+                auto_role_rule.auto_role.discord_message_id,
+                auto_role_rule,
+                self._bot.get_guild(auto_role_rule.auto_role.server.discord_id),
+            )
+        )
         return self._auto_roles.get_auto_role_rules_by_auto_role_id(auto_role_rule.auto_role.id).where(get_new).last()
 
     def resolve_update_auto_role_rule(self, *_, input: dict):
@@ -53,6 +67,14 @@ class AutoRoleRuleMutation(QueryABC):
         self._db.save_changes()
 
         auto_role_rule = self._auto_roles.get_auto_role_rule_by_id(input["id"])
+        self._bot.loop.create_task(
+            self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_rule.auto_role.discord_channel_id,
+                auto_role_rule.auto_role.discord_message_id,
+                auto_role_rule,
+                self._bot.get_guild(auto_role_rule.auto_role.server.discord_id),
+            )
+        )
         return auto_role_rule
 
     def resolve_delete_auto_role_rule(self, *_, id: int):

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

@@ -39,9 +39,10 @@ class UserMutation(QueryABC):
 
         if "levelId" in input:
             level = self._levels.get_level_by_id(input["levelId"])
-            user.xp = level.min_xp
-
-        user.xp = input["xp"] if "xp" in input else user.xp
+            if user.level.id != level.id:
+                user.xp = level.min_xp
+        else:
+            user.xp = input["xp"] if "xp" in input else user.xp
 
         self._users.update_user(user)
         self._db.save_changes()

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

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

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

@@ -10,7 +10,6 @@ class UserHistoryQuery(HistoryQueryABC):
         self.set_field("discordId", self.resolve_discord_id)
         self.set_field("xp", self.resolve_xp)
         self.set_field("server", self.resolve_server)
-        self.set_field("leftServer", self.resolve_left_server)
 
     @staticmethod
     def resolve_id(user: User, *_):
@@ -27,7 +26,3 @@ class UserHistoryQuery(HistoryQueryABC):
     @staticmethod
     def resolve_server(user: User, *_):
         return user.server
-
-    @staticmethod
-    def resolve_left_server(user: User, *_):
-        return user.left_server

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

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

@@ -6,7 +6,7 @@ from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from cpl_translation import TranslatePipe
-from discord import app_commands, Guild
+from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
@@ -312,26 +312,13 @@ class AutoRoleGroup(DiscordCommandABC):
             .where(lambda r: r.emoji_name == emoji.name and int(role_id) == role.id)
             .single()
         )
-        try:
-            guild: Guild = self._bot.guilds.where(lambda g: g == ctx.guild).single()
-            channel = guild.get_channel(auto_role_from_db.discord_channel_id)
-            message = await channel.fetch_message(auto_role_from_db.discord_message_id)
-            emoji = List(discord.Emoji, guild.emojis).where(lambda x: x.name == rule.emoji_name).single()
 
-            if emoji is None:
-                self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found")
-                return
-            await message.add_reaction(emoji)
-            self._logger.debug(
-                __name__,
-                f"Added reaction {rule.emoji_name} to message: {auto_role_from_db.discord_message_id}",
-            )
-        except Exception as e:
-            self._logger.error(
-                __name__,
-                f"Cannot add reaction {rule.emoji_name} to message: {auto_role_from_db.discord_message_id}",
-                e,
+        # as task to run in background
+        self._bot.loop.create_task(
+            await self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_from_db.discord_channel_id, auto_role_from_db.discord_message_id, rule, ctx.guild
             )
+        )
 
         await self._message_service.send_ctx_msg(
             ctx,

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

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

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

@@ -32,9 +32,9 @@ class AutoRoleReactionHandler:
             return
 
         guild = self._bot.get_guild(payload.guild_id)
-        user = guild.get_member(payload.user_id)
+        user = guild.get_member(payload.id)
         if user is None:
-            self._logger.warn(__name__, f"User {payload.user_id} in {guild.name} not found - skipping")
+            self._logger.warn(__name__, f"User {payload.id} in {guild.name} not found - skipping")
             return
 
         if user.bot:

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "2"
     },
     "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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

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

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

@@ -102,6 +102,9 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         server = self._servers.get_server_by_discord_id(member.guild.id)
 
         try:
+            if before.channel == after.channel:
+                return
+
             # join
             if (
                 before.channel is None

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

@@ -52,12 +52,12 @@ class BaseOnVoiceStateUpdateEventScheduledEventBonus(OnVoiceStateUpdateABC):
             return
 
         server = self._servers.get_server_by_discord_id(member.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.server_id)
-        if active_event.participants.any(lambda x: x.user_id == user.user_id):
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
+        if active_event.participants.any(lambda x: x.id == user.id):
             self._logger.debug(__name__, f"Module {type(self)} stopped")
             return
 
-        settings: BaseServerSettings = self._base_helper.get_config(server.discord_server_id)
+        settings: BaseServerSettings = self._base_helper.get_config(server.discord_id)
         user.xp += settings.xp_per_event_participation
         self._users.update_user(user)
         self._db.save_changes()

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

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

@@ -1,12 +1,12 @@
 from datetime import datetime
 
 from cpl_core.database.context import DatabaseContextABC
-from cpl_core.logging import LoggerABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.helper.log_message_helper import LogMessageHelper
+from bot_core.logging.message_logger import MessageLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from modules.base.abc.base_helper_abc import BaseHelperABC
@@ -16,7 +16,7 @@ from modules.base.configuration.base_server_settings import BaseServerSettings
 class BaseReactionHandler:
     def __init__(
         self,
-        logger: LoggerABC,
+        logger: MessageLogger,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         users: UserRepositoryABC,

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

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.0rc1"
+__version__ = "1.0.2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="0", micro="0.rc1")
+version_info = VersionInfo(major="1", minor="0", micro="2")

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

@@ -57,7 +57,9 @@ class UserWarningsService:
             else:
                 translation = self._t.transform("modules.base.warnings.team_warned").format(member.mention, description)
 
-            self._bot.loop.create_task(self._message_service.send_channel_message(channel, translation))
+            self._bot.loop.create_task(
+                self._message_service.send_channel_message(channel, translation, is_persistent=True)
+            )
         except Exception as e:
             self._logger.error(__name__, f"Team notification for user warning failed!", e)