Merge pull request 'staging' (#464) from staging into master

Reviewed-on: #464

.gitea/workflows/deploy_prod.yaml

@@ -81,7 +81,6 @@ jobs:
         run: |
           cd web
           docker image prune -f
-          cp src/favicon.ico src/favicon.ico
           npm run build
           docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv) .
 

.gitea/workflows/deploy_staging.yaml

@@ -11,7 +11,7 @@ jobs:
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Shutdown stack
-        run: docker stack rm sdb_test
+        run: docker stack rm sdb_staging
 
   build-bot:
     needs: pre-build
@@ -124,6 +124,6 @@ jobs:
           portainer-username: "gitea_job"
           portainer-password: "${{ secrets.docker_job }}"
           portainer-endpoint: 2
-          name: sdb_test
+          name: sdb_staging
           file: bot/docker/docker-compose.staging.yml
           variables: '{}'

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,6 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2023.10.1",
       "cpl-translation==2023.4.0.post1",
       "cpl-query==2023.10.0",
       "cpl-discord==2023.10.0.post1",
@@ -33,7 +32,9 @@
       "cryptography==41.0.4",
       "discord==2.3.2",
       "bs4==0.0.1",
-      "lxml==4.9.3"
+      "lxml==4.9.3",
+      "python-valve==0.2.1",
+      "cpl-core==2023.10.2"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_api/bot-api.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "",
     "AuthorEmail": "",

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_core/bot-core.json

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

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_data/bot-data.json

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

bot/src/bot_data/db_context.py

@@ -40,6 +40,7 @@ class DBContext(DatabaseContext):
             self._fails += 1
             try:
                 time.sleep(0.5)
+                self._logger.debug(__name__, "Retry select")
                 return self.select(statement)
             except Exception as e:
                 pass

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_data/model/server_config.py

@@ -32,6 +32,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         default_role_id: Optional[int],
         short_role_name_only_set_highest_role: bool,
         game_offer_notification_chat_id: int,
+        reset_member_after_rejoin: bool,
         feature_flags: dict[FeatureFlagsEnum],
         server: Server,
         afk_channel_ids: List[int],
@@ -58,6 +59,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         self._default_role_id = default_role_id
         self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
         self._game_offer_notification_chat_id = game_offer_notification_chat_id
+        self._reset_member_after_rejoin = reset_member_after_rejoin
 
         self._feature_flags = feature_flags
         self._server = server
@@ -88,6 +90,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
             None,
             False,
             guild.system_channel.id,
+            False,
             {},
             server,
             List(int),
@@ -234,6 +237,14 @@ class ServerConfig(TableABC, ConfigurationModelABC):
     def game_offer_notification_chat_id(self, value: int):
         self._game_offer_notification_chat_id = value
 
+    @property
+    def reset_member_after_rejoin(self) -> bool:
+        return self._reset_member_after_rejoin
+
+    @reset_member_after_rejoin.setter
+    def reset_member_after_rejoin(self, value: bool):
+        self._reset_member_after_rejoin = value
+
     @property
     def feature_flags(self) -> dict[FeatureFlagsEnum]:
         return self._feature_flags
@@ -310,6 +321,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `DefaultRoleId`,
                     `ShortRoleNameSetOnlyHighest`,
                     `GameOfferNotificationChatId`,
+                    `ResetMemberAfterRejoin`,
                     `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
@@ -330,6 +342,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {"NULL" if self._default_role_id is None else self._default_role_id},
                     {self._short_role_name_only_set_highest_role},
                     {self._game_offer_notification_chat_id},
+                    {self._reset_member_after_rejoin},
                     '{json.dumps(self._feature_flags)}',
                     {self._server.id}
                 );
@@ -358,6 +371,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `DefaultRoleId` = {"NULL" if self._default_role_id is None else self._default_role_id},
                 `ShortRoleNameSetOnlyHighest` = {self._short_role_name_only_set_highest_role},
                 `GameOfferNotificationChatId` = {self._game_offer_notification_chat_id},
+                `ResetMemberAfterRejoin` = {self._reset_member_after_rejoin},
                 `FeatureFlags` = '{json.dumps(self._feature_flags)}',
                 `ServerId` = {self._server.id}
                 WHERE `Id` = {self._id};

bot/src/bot_data/model/user.py

@@ -38,6 +38,11 @@ class User(TableABC):
         self._created_at = created_at if created_at is not None else self._created_at
         self._modified_at = modified_at if modified_at is not None else self._modified_at
 
+    def reset(self):
+        self._xp = 0
+        self._message_count = 0
+        self._reaction_count = 0
+
     @property
     def id(self) -> int:
         return self._user_id
@@ -168,6 +173,13 @@ class User(TableABC):
         game_idents_repo: UserGameIdentRepositoryABC = services.get_service(UserGameIdentRepositoryABC)
         return game_idents_repo.get_user_game_idents_by_user_id(self.id)
 
+    @property
+    @ServiceProviderABC.inject
+    def profile_picture_url(self, bot: DiscordBotServiceABC) -> str:
+        guild = bot.get_guild(self.server.discord_id)
+        user = guild.get_member(self._discord_id)
+        return None if user is None else user.avatar.url
+
     @staticmethod
     def get_select_all_string() -> str:
         return str(

bot/src/bot_data/scripts/1.2.4/1_ResetMemberAfterRejoin_down.sql

@@ -0,0 +1,7 @@
+ALTER TABLE CFG_Server
+    DROP COLUMN ResetMemberAfterRejoin;
+
+ALTER TABLE CFG_ServerHistory
+    DROP COLUMN ResetMemberAfterRejoin;
+
+

bot/src/bot_data/scripts/1.2.4/1_ResetMemberAfterRejoin_up.sql

@@ -0,0 +1,116 @@
+ALTER TABLE CFG_Server
+    ADD ResetMemberAfterRejoin BOOLEAN NOT NULL DEFAULT FALSE AFTER GameOfferNotificationChatId;
+
+
+
+ALTER TABLE CFG_ServerHistory
+    ADD ResetMemberAfterRejoin BOOLEAN NOT NULL DEFAULT FALSE AFTER GameOfferNotificationChatId;
+
+DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;;
+
+CREATE TRIGGER `TR_CFG_ServerUpdate`
+    AFTER UPDATE
+    ON `CFG_Server`
+    FOR EACH ROW
+BEGIN
+    INSERT INTO `CFG_ServerHistory` (`Id`,
+                                     `MessageDeleteTimer`,
+                                     `NotificationChatId`,
+                                     `MaxVoiceStateHours`,
+                                     `XpPerMessage`,
+                                     `XpPerReaction`,
+                                     `MaxMessageXpPerHour`,
+                                     `XpPerOntimeHour`,
+                                     `XpPerEventParticipation`,
+                                     `XpPerAchievement`,
+                                     `AFKCommandChannelId`,
+                                     `HelpVoiceChannelId`,
+                                     `TeamChannelId`,
+                                     `LoginMessageChannelId`,
+                                     `DefaultRoleId`,
+                                     `ShortRoleNameSetOnlyHighest`,
+                                     `GameOfferNotificationChatId`,
+                                     `ResetMemberAfterRejoin`,
+                                     `FeatureFlags`,
+                                     `ServerId`,
+                                     `DateFrom`,
+                                     `DateTo`)
+    VALUES (OLD.Id,
+            OLD.MessageDeleteTimer,
+            OLD.NotificationChatId,
+            OLD.MaxVoiceStateHours,
+            OLD.XpPerMessage,
+            OLD.XpPerReaction,
+            OLD.MaxMessageXpPerHour,
+            OLD.XpPerOntimeHour,
+            OLD.XpPerEventParticipation,
+            OLD.XpPerAchievement,
+            OLD.AFKCommandChannelId,
+            OLD.HelpVoiceChannelId,
+            OLD.TeamChannelId,
+            OLD.LoginMessageChannelId,
+            OLD.DefaultRoleId,
+            OLD.ShortRoleNameSetOnlyHighest,
+            OLD.GameOfferNotificationChatId,
+            OLD.ResetMemberAfterRejoin,
+            OLD.FeatureFlags,
+            OLD.ServerId,
+            OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
+END;;
+
+DROP TRIGGER IF EXISTS `TR_CFG_ServerDelete`;;
+
+CREATE TRIGGER `TR_CFG_ServerDelete`
+    AFTER DELETE
+    ON `CFG_Server`
+    FOR EACH ROW
+BEGIN
+    INSERT INTO `CFG_ServerHistory` (`Id`,
+                                     `MessageDeleteTimer`,
+                                     `NotificationChatId`,
+                                     `MaxVoiceStateHours`,
+                                     `XpPerMessage`,
+                                     `XpPerReaction`,
+                                     `MaxMessageXpPerHour`,
+                                     `XpPerOntimeHour`,
+                                     `XpPerEventParticipation`,
+                                     `XpPerAchievement`,
+                                     `AFKCommandChannelId`,
+                                     `HelpVoiceChannelId`,
+                                     `TeamChannelId`,
+                                     `LoginMessageChannelId`,
+                                     `DefaultRoleId`,
+                                     `ShortRoleNameSetOnlyHighest`,
+                                     `GameOfferNotificationChatId`,
+                                     `ResetMemberAfterRejoin`,
+                                     `ServerId`,
+                                     `FeatureFlags`,
+                                     `Deleted`,
+                                     `DateFrom`,
+                                     `DateTo`)
+    VALUES (OLD.Id,
+            OLD.MessageDeleteTimer,
+            OLD.NotificationChatId,
+            OLD.MaxVoiceStateHours,
+            OLD.XpPerMessage,
+            OLD.XpPerReaction,
+            OLD.MaxMessageXpPerHour,
+            OLD.XpPerOntimeHour,
+            OLD.XpPerEventParticipation,
+            OLD.XpPerAchievement,
+            OLD.AFKCommandChannelId,
+            OLD.HelpVoiceChannelId,
+            OLD.TeamChannelId,
+            OLD.LoginMessageChannelId,
+            OLD.DefaultRoleId,
+            OLD.ShortRoleNameSetOnlyHighest,
+            OLD.GameOfferNotificationChatId,
+            OLD.ResetMemberAfterRejoin,
+            OLD.FeatureFlags,
+            OLD.ServerId,
+            TRUE,
+            OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
+END;;
+

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_data/service/level_repository_service.py

@@ -37,6 +37,8 @@ class LevelRepositoryService(LevelRepositoryABC):
             int(self._get_value_from_result(sql_result[3])),  # min xp
             int(self._get_value_from_result(sql_result[4])),  # permissions
             self._servers.get_server_by_id(sql_result[5]),  # server
+            sql_result[6],  # created_at
+            sql_result[7],  # modified_at
             id=self._get_value_from_result(sql_result[0]),  # id
         )
 

bot/src/bot_data/service/server_config_repository_service.py

@@ -79,12 +79,13 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
             result[15],
             result[16],
             result[17],
-            json.loads(result[18]),
-            self._servers.get_server_by_id(result[19]),
-            self._get_afk_channel_ids(result[19]),
-            self._get_team_role_ids(result[19]),
-            result[20],
+            result[18],
+            json.loads(result[19]),
+            self._servers.get_server_by_id(result[20]),
+            self._get_afk_channel_ids(result[20]),
+            self._get_team_role_ids(result[20]),
             result[21],
+            result[22],
             id=result[0],
         )
 

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_graphql/bot-graphql.json

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

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_graphql/graphql/serverConfig.gql

@@ -17,6 +17,7 @@ type ServerConfig implements TableWithHistoryQuery {
     defaultRoleId: String
     shortRoleNameOnlySetHighestRole: Boolean
     gameOfferNotificationChatId: String
+    resetMemberAfterRejoin: Boolean
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -50,7 +51,7 @@ type ServerConfigHistory implements HistoryTableQuery {
     loginMessageChannelId: String
     defaultRoleId: String
     shortRoleNameOnlySetHighestRole: Boolean
-    gameOfferNotificationChatId: String
+    resetMemberAfterRejoin: Boolean
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -103,6 +104,7 @@ input ServerConfigInput {
     defaultRoleId: String
     shortRoleNameOnlySetHighestRole: Boolean
     gameOfferNotificationChatId: String
+    resetMemberAfterRejoin: Boolean
     featureFlags: [FeatureFlagInput]
 
     afkChannelIds: [String]

bot/src/bot_graphql/graphql/user.gql

@@ -11,6 +11,8 @@ type User implements TableWithHistoryQuery {
     level: Level
     activityScore: Int
 
+    profilePictureURL: String
+
     joinedServers(filter: UserJoinedServerFilter, page: Page, sort: Sort): [UserJoinedServer]
     joinedServerCount: Int
 

bot/src/bot_graphql/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_graphql/mutations/server_config_mutation.py

@@ -105,6 +105,11 @@ class ServerConfigMutation(QueryABC):
             if "gameOfferNotificationChatId" in input
             else server_config.game_offer_notification_chat_id
         )
+        server_config.reset_member_after_rejoin = (
+            input["resetMemberAfterRejoin"]
+            if "resetMemberAfterRejoin" in input
+            else server_config.reset_member_after_rejoin
+        )
         server_config.feature_flags = (
             dict(
                 zip(

bot/src/bot_graphql/mutations/short_role_name_mutation.py

@@ -7,6 +7,7 @@ from bot_data.model.short_role_name import ShortRoleName
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
 from bot_core.service.permission_service import PermissionService
+from modules.short_role_name.service.short_role_name_service import ShortRoleNameService
 
 
 class ShortRoleNameMutation(QueryABC):
@@ -17,6 +18,7 @@ class ShortRoleNameMutation(QueryABC):
         bot: DiscordBotServiceABC,
         db: DatabaseContextABC,
         permissions: PermissionService,
+        short_role_name_service: ShortRoleNameService,
     ):
         QueryABC.__init__(self, "ShortRoleNameMutation")
 
@@ -25,6 +27,7 @@ class ShortRoleNameMutation(QueryABC):
         self._bot = bot
         self._db = db
         self._permissions = permissions
+        self._short_role_name_service = short_role_name_service
 
         self.set_field("createShortRoleName", self.resolve_create_short_role_name)
         self.set_field("updateShortRoleName", self.resolve_update_short_role_name)
@@ -79,6 +82,7 @@ class ShortRoleNameMutation(QueryABC):
         short_role_name = self._short_role_names.get_short_role_name_by_id(id)
         self._can_user_mutate_data(short_role_name.server, UserRoleEnum.admin)
 
+        self._bot.loop.create_task(self._short_role_name_service.remove_short_role_from_members(short_role_name))
         self._short_role_names.delete_short_role_name(short_role_name)
         self._db.save_changes()
 

bot/src/bot_graphql/mutations/user_joined_game_server_mutation.py

@@ -11,6 +11,7 @@ from flask import request
 from bot_api.configuration.authentication_settings import AuthenticationSettings
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
+from bot_core.service.permission_service import PermissionService
 from bot_data.abc.api_key_repository_abc import ApiKeyRepositoryABC
 from bot_data.abc.game_server_repository_abc import GameServerRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -24,7 +25,6 @@ from bot_data.model.server_config import ServerConfig
 from bot_data.model.user_joined_game_server import UserJoinedGameServer
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
-from bot_core.service.permission_service import PermissionService
 
 
 class UserJoinedGameServerMutation(QueryABC):
@@ -79,7 +79,10 @@ class UserJoinedGameServerMutation(QueryABC):
         )
 
     def resolve_user_joined(self, *_, input: dict):
-        game_ident = self._user_game_idents.get_user_game_ident_by_ident(input["ident"])
+        game_ident = self._user_game_idents.find_user_game_ident_by_ident(input["ident"])
+        if game_ident is None:
+            return
+
         user = game_ident.user
 
         settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{user.server.discord_id}")

bot/src/bot_graphql/mutations/user_mutation.py

@@ -4,6 +4,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
 
 from bot_api.route.route import Route
+from bot_core.service.permission_service import PermissionService
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -13,7 +14,6 @@ from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
 from modules.base.service.user_warnings_service import UserWarningsService
 from modules.level.service.level_service import LevelService
-from bot_core.service.permission_service import PermissionService
 
 
 class UserMutation(QueryABC):
@@ -50,7 +50,7 @@ class UserMutation(QueryABC):
         member = self._bot.get_guild(user.server.discord_id).get_member(
             auth_user.users.where(lambda x: x.server.id == user.server.id).single().discord_id
         )
-        if member.id != user.discord_id:
+        if self._permissions.is_member_moderator(member) or member.id != user.discord_id:
             self._can_user_mutate_data(user.server, UserRoleEnum.moderator)
 
             new_xp = None

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/bot_graphql/queries/server_config_query.py

@@ -37,6 +37,7 @@ class ServerConfigQuery(DataQueryWithHistoryABC):
             "gameOfferNotificationChatId",
             lambda config, *_: config.game_offer_notification_chat_id,
         )
+        self.set_field("resetMemberAfterRejoin", lambda config, *_: config.reset_member_after_rejoin)
         self.add_collection(
             "featureFlag",
             lambda config, *_: List(

bot/src/bot_graphql/queries/server_query.py

@@ -77,7 +77,7 @@ class ServerQuery(DataQueryWithHistoryABC):
         )
         self.add_collection(
             "level",
-            lambda server, *_: self._levels.get_levels_by_server_id(server.id),
+            lambda server, *_: self._levels.get_levels_by_server_id(server.id).order_by_descending(lambda x: x.min_xp),
             LevelFilter,
         )
         self.set_field(

bot/src/bot_graphql/queries/user_query.py

@@ -88,3 +88,4 @@ class UserQuery(DataQueryWithHistoryABC):
 
         self.set_field("server", lambda user, *_: user.server)
         self.set_field("leftServer", lambda user, *_: user.left_server)
+        self.set_field("profilePictureURL", lambda user, *_: user.profile_picture_url)

bot/src/modules/achievements/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.achievements"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/achievements/achievements.json

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

bot/src/modules/achievements/commands/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/achievements/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/achievements/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "",
     "AuthorEmail": "",

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/base/base.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "",
     "AuthorEmail": "",

bot/src/modules/base/base_module.py

@@ -62,8 +62,8 @@ class BaseModule(ModuleABC):
         services.add_transient(BaseReactionHandler)
         services.add_singleton(EventService)
         services.add_transient(UserWarningsService)
-        services.add_singleton(TaskABC, BirthdayWatcher)
-        services.add_singleton(TaskABC, ScheduledEventsWatcher)
+        services.add_transient(TaskABC, BirthdayWatcher)
+        services.add_transient(TaskABC, ScheduledEventsWatcher)
 
         # forms
         services.add_transient(BugReportForm)

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/base/command/afk_command.py

@@ -1,3 +1,4 @@
+import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
@@ -8,6 +9,7 @@ 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.abc.permission_service_abc import PermissionServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.model.server_config import ServerConfig
@@ -22,6 +24,7 @@ class AFKCommand(DiscordCommandABC):
         bot: DiscordBotServiceABC,
         client_utils: ClientUtilsABC,
         translate: TranslatePipe,
+        permissions: PermissionServiceABC,
     ):
         DiscordCommandABC.__init__(self)
 
@@ -29,6 +32,7 @@ class AFKCommand(DiscordCommandABC):
         self._config = config
         self._message_service = message_service
         self._bot = bot
+        self._permissions = permissions
         self._client_utils = client_utils
         self._t = translate
 
@@ -37,7 +41,12 @@ class AFKCommand(DiscordCommandABC):
     @commands.hybrid_command()
     @commands.guild_only()
     @CommandChecks.check_is_ready()
-    async def afk(self, ctx: Context):
+    async def afk(self, ctx: Context, member: discord.Member = None):
+        is_mod = self._permissions.is_member_moderator(ctx.author)
+        if member is not None and not is_mod:
+            await self._message_service.send_ctx_msg(ctx, self._t.transform("common.no_permission_message"))
+            return
+
         self._logger.debug(__name__, f"Received command afk {ctx}")
         settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{ctx.guild.id}")
 
@@ -54,7 +63,10 @@ class AFKCommand(DiscordCommandABC):
         )
         channel: VoiceChannel = ctx.guild.get_channel(settings.afk_command_channel_id)
         try:
-            await ctx.author.move_to(channel)
+            if member is not None:
+                await member.move_to(channel)
+            else:
+                await ctx.author.move_to(channel)
             self._client_utils.moved_user(ctx.guild.id)
         except Exception as e:
             self._logger.error(

bot/src/modules/base/command/register_group.py

@@ -9,6 +9,7 @@ from cpl_translation import TranslatePipe
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
+from valve.steam.id import SteamID
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.abc.message_service_abc import MessageServiceABC
@@ -50,6 +51,17 @@ class RegisterGroup(DiscordCommandABC):
 
         self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
 
+    async def _game_server_autocomplete(
+        self, interaction: discord.Interaction, current: str
+    ) -> TList[app_commands.Choice[str]]:
+        server = self._servers.get_server_by_discord_id(interaction.guild.id)
+        game_servers = self._game_server.get_game_servers_by_server_id(server.id)
+
+        return [
+            app_commands.Choice(name=gs.name, value=gs.id)
+            for gs in self._client_utils.get_auto_complete_list(game_servers, current, lambda x: x.name)
+        ]
+
     @commands.hybrid_group()
     @commands.guild_only()
     async def register(self, ctx: Context):
@@ -101,10 +113,44 @@ class RegisterGroup(DiscordCommandABC):
     async def game_server_autocomplete(
         self, interaction: discord.Interaction, current: str
     ) -> TList[app_commands.Choice[str]]:
-        server = self._servers.get_server_by_discord_id(interaction.guild.id)
-        game_servers = self._game_server.get_game_servers_by_server_id(server.id)
+        return await self._game_server_autocomplete(interaction, current)
 
-        return [
-            app_commands.Choice(name=gs.name, value=gs.id)
-            for gs in self._client_utils.get_auto_complete_list(game_servers, current, lambda x: x.name)
-        ]
+    @register.command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def gmod(self, ctx: Context, member: discord.Member, game_server: int, steam_url: str):
+        self._logger.debug(__name__, f"Received command register gmod {ctx}")
+
+        steam_id = None
+        try:
+            self._logger.debug(__name__, f"Try to get steam id for {id}")
+            steam_id = SteamID.from_community_url(steam_url)
+        except Exception as e:
+            self._logger.error(__name__, f"Get steam id for {steam_id} failed", e)
+            await self._message_service.send_interaction_msg(
+                ctx.interaction, self._t.transform("modules.base.register.not_found")
+            )
+
+        if steam_id is None:
+            return
+
+        server = self._servers.get_server_by_discord_id(ctx.guild.id)
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
+        gs = self._game_server.get_game_server_by_id(game_server)
+
+        game_ident = UserGameIdent(user, gs, steam_id)
+        self._user_game_ident.add_user_game_ident(game_ident)
+        self._db.save_changes()
+
+        await self._message_service.send_interaction_msg(
+            ctx.interaction, self._t.transform("modules.base.register.success")
+        )
+
+        self._logger.trace(__name__, f"Finished register gmod command")
+
+    @gmod.autocomplete("game_server")
+    async def game_server_autocomplete(
+        self, interaction: discord.Interaction, current: str
+    ) -> TList[app_commands.Choice[str]]:
+        return await self._game_server_autocomplete(interaction, current)

bot/src/modules/base/command/scheduled_events_group.py

@@ -1,22 +1,34 @@
+from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
+from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
+from bot_core.service.message_service import MessageService
+from bot_data.model.server_config import ServerConfig
 from modules.base.service.event_service import EventService
 
 
 class ScheduledEventsCommand(DiscordCommandABC):
     def __init__(
         self,
+        config: ConfigurationABC,
         logger: CommandLogger,
         events: EventService,
+        message_service: MessageService,
+        t: TranslatePipe,
     ):
         DiscordCommandABC.__init__(self)
 
+        self._config = config
         self._logger = logger
         self._events = events
+        self._message_service = message_service
+        self._t = t
 
         self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
 
@@ -30,6 +42,12 @@ class ScheduledEventsCommand(DiscordCommandABC):
     @CommandChecks.check_is_ready()
     @CommandChecks.check_is_member_moderator()
     async def reload(self, ctx: Context):
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{ctx.guild.id}")
+        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.scheduled_events):
+            self._logger.debug(__name__, f"Skipping scheduled event check for {ctx.guild.id}. Feature is disabled.")
+            await self._message_service.send_ctx_msg(ctx, self._t.transform("common.feature_not_activated"))
+            return
+
         self._logger.debug(__name__, "Running scheduled-events reload")
         try:
             await self._events.check_and_create_scheduled_events(ctx.guild)

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/base/events/base_on_member_join_event.py

@@ -78,6 +78,12 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
             user = self._users.find_user_by_discord_id_and_server_id(member.id, server.id)
             if user is not None:
                 self._user_joins.add_user_joined_server(UserJoinedServer(user, datetime.now()))
+
+                server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{member.guild.id}")
+                if server_config.reset_member_after_rejoin:
+                    user.reset()
+                    self._users.update_user(user)
+
                 self._db.save_changes()
                 return
 

bot/src/modules/base/forms/__init__.py

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

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/base/service/event_service.py

@@ -9,7 +9,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.container import Guild
 from cpl_query.extension import List
-from discord import PrivacyLevel
+from discord import PrivacyLevel, EventStatus
 from discord.scheduled_event import ScheduledEvent as DiscordEvent
 
 from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC
@@ -106,6 +106,7 @@ class EventService:
                 lambda x: x.name == scheduled_event.name
                 and x.description == scheduled_event.description
                 and x.entity_type == scheduled_event.entity_type
+                and x.status == EventStatus.scheduled
             )
             if from_guild.count() != 0:
                 self._logger.debug(__name__, f"Event {scheduled_event.name} already exists on discord server")

bot/src/modules/base/tasks/__init__.py

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

bot/src/modules/base/tasks/birthday_watcher.py

@@ -37,7 +37,7 @@ class BirthdayWatcher(TaskABC):
         if not self._is_maintenance():
             self.watch.start()
 
-    @tasks.loop(time=datetime.time(hour=8, minute=0))
+    @tasks.loop(time=datetime.time(hour=8, minute=0), reconnect=True)
     async def watch(self):
         self._logger.info(__name__, "Watching birthdays")
         try:

bot/src/modules/base/tasks/scheduled_events_watcher.py

@@ -5,9 +5,12 @@ from cpl_translation import TranslatePipe
 from discord.ext import tasks
 
 from bot_core.abc.task_abc import TaskABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.task_logger import TaskLogger
 from bot_core.service.message_service import MessageService
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.model.server_config import ServerConfig
 from modules.base.service.event_service import EventService
 
 
@@ -37,11 +40,18 @@ class ScheduledEventsWatcher(TaskABC):
         if not self._is_maintenance():
             self.watch.start()
 
-    @tasks.loop(hours=12)
+    @tasks.loop(hours=3, reconnect=True)
     async def watch(self):
         self._logger.info(__name__, "Watching scheduled events")
         try:
             for guild in self._bot.guilds:
+                settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
+                if not FeatureFlagsSettings.get_flag_from_dict(
+                    settings.feature_flags, FeatureFlagsEnum.scheduled_events
+                ):
+                    self._logger.debug(__name__, f"Skipping scheduled event check for {guild.id}. Feature is disabled.")
+                    continue
+
                 await self._events.check_and_create_scheduled_events(guild)
         except Exception as e:
             self._logger.error(__name__, f"Watching scheduled events failed", e)

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "",
     "AuthorEmail": "",

bot/src/modules/config/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.config"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/config/config.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "3"
+      "Micro": "5"
     },
     "Author": "",
     "AuthorEmail": "",

bot/src/modules/config/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.config.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/config/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.config.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

bot/src/modules/database/database.json

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

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")

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.2.3"
+__version__ = "1.2.5"
 
 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="2", micro="3")
+version_info = VersionInfo(major="1", minor="2", micro="5")