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

Reviewed-on: #434

.gitea/workflows/deploy_dev.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

.gitea/workflows/deploy_prod.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

.gitea/workflows/deploy_staging.yaml

@@ -8,15 +8,8 @@ on:
 jobs:
   on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
+    container: sh-edraft.de/act-runner:latest
     steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-      - run: python -v
-
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
       - run: docker -v
@@ -30,7 +23,7 @@ jobs:
       - name: Prepare bot build
         run: |
           cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
           cpl i
 
       - name: Setup node

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

bot/src/bot/bot.json

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

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

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

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

bot/src/bot_api/bot-api.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

bot/src/bot_core/bot-core.json

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

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

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

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

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

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

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

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

bot/src/bot_core/service/data_integrity_service.py

@@ -398,6 +398,9 @@ class DataIntegrityService:
                 if user is None:
                     continue
 
+                for join in self._user_joins.get_user_joined_servers_by_user_id(user.id):
+                    self._user_joins.delete_user_joined_server(join)
+
                 self._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id)
                 self._users.delete_user(user)
                 self._db_context.save_changes()

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

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

bot/src/bot_data/bot-data.json

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

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

bot/src/bot_data/migration/fix_user_history_migration.py

@@ -17,14 +17,10 @@ class FixUserHistoryMigration(MigrationABC):
 
         # fix 1.1.0_AchievementsMigration
         self._cursor.execute(
-            str(
-                f"""ALTER TABLE UsersHistory ADD COLUMN IF NOT EXISTS ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;"""
-            )
+            str(f"""ALTER TABLE UsersHistory ADD COLUMN ReactionCount BIGINT NOT NULL DEFAULT 0 AFTER XP;""")
         )
         self._cursor.execute(
-            str(
-                f"""ALTER TABLE UsersHistory ADD COLUMN IF NOT EXISTS MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount;"""
-            )
+            str(f"""ALTER TABLE UsersHistory ADD COLUMN MessageCount BIGINT NOT NULL DEFAULT 0 AFTER ReactionCount;""")
         )
         self._exec(__file__, "users.sql")
 

bot/src/bot_data/migration/steam_special_offer_migration.py

@@ -36,7 +36,7 @@ class SteamSpecialOfferMigration(MigrationABC):
             str(
                 f"""
                     ALTER TABLE CFG_Server
-                    ADD COLUMN IF NOT EXISTS GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
+                    ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
                 """
             )
         )
@@ -45,7 +45,7 @@ class SteamSpecialOfferMigration(MigrationABC):
             str(
                 f"""
                     ALTER TABLE CFG_ServerHistory
-                    ADD COLUMN IF NOT EXISTS GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
+                    ADD COLUMN GameOfferNotificationChatId BIGINT NULL AFTER ShortRoleNameSetOnlyHighest;
                 """
             )
         )

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

bot/src/bot_data/model/user.py

@@ -82,11 +82,11 @@ class User(TableABC):
         self._reaction_count = value
 
     @property
-    def birthday(self) -> Optional[datetime]:
+    def birthday(self) -> Optional[date]:
         return self._birthday
 
     @birthday.setter
-    def birthday(self, value: Optional[datetime]):
+    def birthday(self, value: Optional[date]):
         self._birthday = value
 
     @property

bot/src/bot_data/model/user_history.py

@@ -1,3 +1,6 @@
+from datetime import date
+from typing import Optional
+
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_query.extension import List
 
@@ -11,6 +14,7 @@ class UserHistory(HistoryTableABC):
         xp: int,
         message_count: int,
         reaction_count: int,
+        birthday: Optional[date],
         server: int,
         deleted: bool,
         date_from: str,
@@ -24,6 +28,7 @@ class UserHistory(HistoryTableABC):
         self._xp = xp
         self._message_count = message_count
         self._reaction_count = reaction_count
+        self._birthday = birthday
         self._server = server
 
         self._deleted = deleted
@@ -50,6 +55,10 @@ class UserHistory(HistoryTableABC):
     def reaction_count(self) -> int:
         return self._reaction_count
 
+    @property
+    def birthday(self) -> Optional[date]:
+        return self._birthday
+
     @property
     def server(self) -> int:
         return self._server

bot/src/bot_data/model/user_joined_server.py

@@ -124,6 +124,6 @@ class UserJoinedServer(TableABC):
         return str(
             f"""
             DELETE FROM `UserJoinedServers`
-            WHERE `Id` = {self._join_id};
+            WHERE `JoinId` = {self._join_id};
         """
         )

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

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

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

bot/src/bot_graphql/bot-graphql.json

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

bot/src/bot_graphql/graphql/serverStatistic.gql

@@ -6,10 +6,10 @@ type ServerStatistic {
     activeUserCount: Int
 
     userJoinedVoiceChannelCount: Int
-    userJoinedVoiceChannelOntime: Int
+    userJoinedVoiceChannelOntime: Float
 
     userJoinedGameServerCount: Int
-    userJoinedGameServerOntime: Int
+    userJoinedGameServerOntime: Float
 
     userWarningCount: Int
 

bot/src/bot_graphql/graphql/user.gql

@@ -37,6 +37,9 @@ type UserHistory implements HistoryTableQuery {
     id: ID
     discordId: String
     xp: Int
+    messageCount: Int
+    reactionCount: Int
+    birthday: String
 
     server: ID
 

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

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

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

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

bot/src/bot_graphql/queries/server_statistic_query.py

@@ -1,6 +1,9 @@
 import datetime
+from typing import Optional
 
 from cpl_core.configuration import ConfigurationABC
+from cpl_core.database.context import DatabaseContextABC
+from cpl_core.type import R, T
 
 from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC
 from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC
@@ -8,7 +11,6 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoic
 from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC
-from bot_data.model.server_config import ServerConfig
 from bot_graphql.abc.query_abc import QueryABC
 
 
@@ -22,10 +24,13 @@ class ServerStatisticQuery(QueryABC):
         user_messages: UserMessageCountPerHourRepositoryABC,
         user_warnings: UserWarningsRepositoryABC,
         achievements: AchievementRepositoryABC,
+        db: DatabaseContextABC,
     ):
         QueryABC.__init__(self, "ServerStatistic")
 
         self._config = config
+        self._db = db
+
         self._users = users
         self._user_joined_voice_channels = user_joined_voice_channels
         self._user_joined_game_servers = user_joined_game_servers
@@ -44,7 +49,7 @@ class ServerStatisticQuery(QueryABC):
         )
 
         self.set_field("userCount", lambda server, *_: self._users.get_users_by_server_id(server.server.id).count())
-        self.set_field("activeUserCount", self._resolve_active_count)
+        self.set_field("activeUserCount", self._resolve_active_user_count)
 
         self.set_field("userJoinedVoiceChannelCount", self._resolve_voice_channel_count)
         self.set_field("userJoinedVoiceChannelOntime", self._resolve_voice_channel_ontime)
@@ -56,6 +61,93 @@ class ServerStatisticQuery(QueryABC):
 
         self.set_field("activityScore", self._resolve_activity_score)
 
+    def _resolve_active_user_count(self, server, *_):
+        return self._users.get_users_by_server_id(server.server.id).where(lambda x: not x.left_server).count()
+
+    def _cast_query_result(self, query: str, r_type: T) -> Optional[R]:
+        results = self._db.select(query)
+        if len(results) == 0 or len(results[0]) == 0:
+            return None
+        result = results[0][0]
+        default = None
+        if r_type is int or r_type is float:
+            default = 0
+        elif r_type is str:
+            default = ""
+
+        return r_type(result) if result is not None else default
+
+    def _resolve_achievements(self, server, *_):
+        query = f"""
+            SELECT Count(UserGotAchievements.CreatedAt) FROM UserGotAchievements
+            INNER JOIN Achievements ON UserGotAchievements.AchievementId = Achievements.Id
+            INNER JOIN Users ON UserGotAchievements.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+                AND UserGotAchievements.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, int)
+
+    def _resolve_message_count(self, server, *_):
+        query = f"""
+            SELECT SUM(
+                UserMessageCountPerHour.XPCount / (
+                    SELECT XpPerMessage
+                    FROM CFG_Server
+                    WHERE ServerId = {server.server.id}
+                )
+            )
+            FROM UserMessageCountPerHour
+                     INNER JOIN Users ON UserMessageCountPerHour.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserMessageCountPerHour.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, int)
+
+    def _resolve_voice_channel_count(self, server, *_):
+        query = f"""
+            SELECT Count(UserJoinedVoiceChannel.CreatedAt) FROM UserJoinedVoiceChannel
+            INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserJoinedVoiceChannel.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, int)
+
+    def _resolve_voice_channel_ontime(self, server, *_):
+        query = f"""
+            SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedVoiceChannel.LeavedOn, UserJoinedVoiceChannel.JoinedOn)) / 3600),{server.server.id}) FROM UserJoinedVoiceChannel
+            INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserJoinedVoiceChannel.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, float)
+
+    def _resolve_game_server_count(self, server, *_):
+        query = f"""
+            SELECT Count(UserJoinedGameServer.CreatedAt) FROM UserJoinedGameServer
+            INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserJoinedGameServer.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, int)
+
+    def _resolve_game_server_ontime(self, server, *_):
+        query = f"""
+            SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedGameServer.LeavedOn, UserJoinedGameServer.JoinedOn)) / 3600),{server.server.id}) FROM UserJoinedGameServer
+            INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserJoinedGameServer.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, float)
+
+    def _resolve_user_warning_count(self, server, *_):
+        query = f"""
+            SELECT COUNT(UserWarnings.CreatedAt) FROM UserWarnings
+            INNER JOIN Users ON UserWarnings.UserId = Users.UserId
+            WHERE Users.ServerId = {server.server.id}
+              AND UserWarnings.CreatedAt >= "{self._get_date(**server.kwargs)}";
+        """
+        return self._cast_query_result(query, int)
+
     def _resolve_activity_score(self, server, *_):
         days = (datetime.date.today() - self._get_date(**server.kwargs)).days
         return int(
@@ -69,87 +161,12 @@ class ServerStatisticQuery(QueryABC):
                     + self._resolve_game_server_ontime(server, *_)
                     - self._resolve_user_warning_count(server, *_)
                 )
-                / self._resolve_active_count(server, *_)
+                / self._resolve_active_user_count(server, *_)
             )
             / days
             * 1000
         )
 
-    def _resolve_message_count(self, server, *_):
-        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.server.discord_id}")
-        return (
-            self._user_messages.get_user_message_count_per_hours()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .sum(lambda x: x.xp_count / settings.xp_per_message)
-        )
-
-    def _resolve_active_count(self, server, *_):
-        return self._users.get_users_by_server_id(server.server.id).where(lambda x: not x.left_server).count()
-
-    def _resolve_voice_channel_count(self, server, *_):
-        return (
-            self._user_joined_voice_channels.get_user_joined_voice_channels()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .count()
-        )
-
-    def _resolve_voice_channel_ontime(self, server, *_):
-        return (
-            self._user_joined_voice_channels.get_user_joined_voice_channels()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .sum(lambda x: x.time)
-        )
-
-    def _resolve_game_server_count(self, server, *_):
-        return (
-            self._user_joined_game_servers.get_user_joined_game_servers()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .count()
-        )
-
-    def _resolve_game_server_ontime(self, server, *_):
-        return (
-            self._user_joined_game_servers.get_user_joined_game_servers()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .sum(lambda x: x.time)
-        )
-
-    def _resolve_user_warning_count(self, server, *_):
-        return (
-            self._user_warnings.get_user_warnings()
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .count()
-        )
-
-    def _resolve_achievements(self, server, *_):
-        return (
-            self._achievements.get_achievements_by_server_id(server.server.id)
-            .select_many(lambda x: self._achievements.get_user_got_achievements_by_achievement_id(x.id))
-            .where(
-                lambda x: x.user.server.id == server.server.id
-                and x.created_at.date() >= self._get_date(**server.kwargs)
-            )
-            .count()
-        )
-
     def _get_date(self, **kwargs) -> datetime.date:
         if "date" not in kwargs:
             return datetime.date.today() - datetime.timedelta(days=7)

bot/src/bot_graphql/queries/user_history_query.py

@@ -9,6 +9,9 @@ class UserHistoryQuery(HistoryQueryABC):
         self.set_field("id", self.resolve_id)
         self.set_field("discordId", self.resolve_discord_id)
         self.set_field("xp", self.resolve_xp)
+        self.set_field("messageCount", lambda x, *_: x.message_count)
+        self.set_field("reactionCount", lambda x, *_: x.reaction_count)
+        self.set_field("birthday", lambda x, *_: None if x.birthday is None else x.birthday.strftime("%d.%m.%Y"))
         self.set_field("server", self.resolve_server)
 
     @staticmethod

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

bot/src/modules/achievements/achievements.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "0"
+      "Micro": "1"
     },
     "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.2.0"
+      "cpl-core>=1.2.1"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.2.0"
+      "cpl-cli>=1.2.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

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

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

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

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

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

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

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

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

bot/src/modules/base/base.json

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

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@ __title__ = "modules.base.thread"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

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

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

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

bot/src/modules/config/config.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=1.2.0"
+      "cpl-core>=1.2.1"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.2.0"
+      "cpl-cli>=1.2.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {

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

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

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

bot/src/modules/database/database.json

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

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

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

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

bot/src/modules/level/level.json

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

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

@@ -15,7 +15,7 @@ __title__ = "modules.level.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

bot/src/modules/permission/__init__.py

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

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

@@ -15,7 +15,7 @@ __title__ = "modules.permission.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

bot/src/modules/permission/permission.json

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

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

@@ -15,7 +15,7 @@ __title__ = "modules.permission.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

bot/src/modules/short_role_name/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.short_role_name"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

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

@@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

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

@@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

bot/src/modules/short_role_name/short-role-name.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=1.2.0"
+      "cpl-core>=1.2.1"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.2.0"
+      "cpl-cli>=1.2.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {

bot/src/modules/special_offers/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.special_offers"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="1")

bot/src/modules/special_offers/special-offers.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "2",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=1.2.0"
+      "cpl-core>=1.2.1"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.2.0"
+      "cpl-cli>=1.2.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {