Fixed deps

shutdown correct stack
Try filtering scheduled events
2023-12-13 12:11:09 +01:00 · 2023-12-13 11:59:21 +01:00 · 2023-12-13 11:25:51 +01:00 · 2023-12-12 11:49:43 +01:00 · 2023-12-11 21:34:38 +01:00 · 2023-12-10 19:50:44 +01:00
187 changed files with 1187 additions and 724 deletions
--- a/.gitea/workflows/deploy_dev.yaml
+++ b/.gitea/workflows/deploy_dev.yaml
@@ -6,9 +6,17 @@ on:
      - dev

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_dev
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@@ -22,10 +30,44 @@ jobs:

      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@@ -35,29 +77,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_dev
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-dev .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
          cp src/favicon.dev.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
--- a/.gitea/workflows/deploy_prod.yaml
+++ b/.gitea/workflows/deploy_prod.yaml
@@ -6,9 +6,17 @@ on:
      - master

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_prod
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@@ -22,10 +30,44 @@ jobs:

      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv) .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@@ -35,28 +77,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_prod
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
+          cp src/favicon.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv) .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv) sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@@ -6,9 +6,17 @@ on:
      - staging

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_staging
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@@ -22,10 +30,44 @@ jobs:

      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@@ -35,29 +77,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_staging
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-staging .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
          cp src/favicon.staging.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
--- a/bot/cpl-workspace.json
+++ b/bot/cpl-workspace.json
@@ -14,7 +14,6 @@
      "config": "src/modules/config/config.json",
      "database": "src/modules/database/database.json",
      "level": "src/modules/level/level.json",
-      "permission": "src/modules/permission/permission.json",
      "technician": "src/modules/technician/technician.json",
      "short-role-name": "src/modules/short_role_name/short-role-name.json",
      "special-offers": "src/modules/special_offers/special-offers.json",
--- a/bot/docker
+++ b/bot/docker
--- a/bot/src/bot/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot/bot.json
+++ b/bot/src/bot/bot.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "Sven Heidemann",
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
    "LicenseName": "MIT",
    "LicenseDescription": "MIT, see LICENSE for more details.",
    "Dependencies": [
-      "cpl-core==2023.10.0",
+      "cpl-core==2023.10.1",
      "cpl-translation==2023.4.0.post1",
      "cpl-query==2023.10.0",
      "cpl-discord==2023.10.0.post1",
@@ -33,7 +33,8 @@
      "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"
    ],
    "DevDependencies": [
      "cpl-cli==2023.4.0.post3",
@@ -70,7 +71,6 @@
      "../modules/config/config.json",
      "../modules/database/database.json",
      "../modules/level/level.json",
-      "../modules/permission/permission.json",
      "../modules/short_role_name/short-role-name.json",
      "../modules/special_offers/special-offers.json",
      "../modules/technician/technician.json"
--- a/bot/src/bot/config
+++ b/bot/src/bot/config
--- a/bot/src/bot/extension/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot/module_list.py
+++ b/bot/src/bot/module_list.py
@@ -12,7 +12,6 @@ from modules.boot_log.boot_log_module import BootLogModule
 from modules.config.config_module import ConfigModule
 from modules.database.database_module import DatabaseModule
 from modules.level.level_module import LevelModule
-from modules.permission.permission_module import PermissionModule
 from modules.short_role_name.short_role_name_module import ShortRoleNameModule
 from modules.special_offers.special_offers_module import SteamSpecialOffersModule
 from modules.technician.technician_module import TechnicianModule
@@ -30,7 +29,6 @@ class ModuleList:
                ConfigModule,  # has to be before db check
                DatabaseModule,
                GraphQLModule,
-                PermissionModule,
                AutoRoleModule,
                BaseModule,
                LevelModule,
--- a/bot/src/bot/startup.py
+++ b/bot/src/bot/startup.py
@@ -15,6 +15,7 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.logging.database_logger import DatabaseLogger
+from bot_core.logging.event_logger import EventLogger
 from bot_core.logging.message_logger import MessageLogger
 from bot_core.logging.task_logger import TaskLogger
 from bot_data.db_context import DBContext
@@ -45,6 +46,7 @@ class Startup(StartupABC):
            services.add_singleton(CustomFileLoggerABC, DatabaseLogger)
            services.add_singleton(CustomFileLoggerABC, MessageLogger)
            services.add_singleton(CustomFileLoggerABC, TaskLogger)
+            services.add_singleton(CustomFileLoggerABC, EventLogger)

        if self._feature_flags.get_flag(FeatureFlagsEnum.api_module):
            services.add_singleton(CustomFileLoggerABC, ApiLogger)
--- a/bot/src/bot_api/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/abc/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/bot-api.json
+++ b/bot/src/bot_api/bot-api.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "",
    "AuthorEmail": "",
--- a/bot/src/bot_api/configuration/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/controller/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/event/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/exception/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/filter/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/filter/discord/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/logging/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/model/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/model/discord/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/route/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/service/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/transformer/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_api/transformer/auth_user_transformer.py
+++ b/bot/src/bot_api/transformer/auth_user_transformer.py
@@ -10,7 +10,7 @@ from bot_api.model.user_dto import UserDTO
 from bot_data.model.auth_role_enum import AuthRoleEnum
 from bot_data.model.auth_user import AuthUser
 from bot_data.model.user import User
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class AuthUserTransformer(TransformerABC):
--- a/bot/src/bot_core/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/abc/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/permission/abc/permission_service_abc.py
+++ b/bot/src/modules/permission/abc/permission_service_abc.py
--- a/bot/src/bot_core/bot-core.json
+++ b/bot/src/bot_core/bot-core.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "Sven Heidemann",
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
--- a/bot/src/bot_core/configuration/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/configuration/feature_flags_enum.py
+++ b/bot/src/bot_core/configuration/feature_flags_enum.py
@@ -15,7 +15,6 @@ class FeatureFlagsEnum(Enum):
    database_module = "DatabaseModule"
    level_module = "LevelModule"
    moderator_module = "ModeratorModule"
-    permission_module = "PermissionModule"
    short_role_name_module = "ShortRoleNameModule"
    steam_special_offers_module = "SteamSpecialOffersModule"
    # features
--- a/bot/src/bot_core/configuration/feature_flags_settings.py
+++ b/bot/src/bot_core/configuration/feature_flags_settings.py
@@ -16,7 +16,6 @@ class FeatureFlagsSettings(ConfigurationModelABC):
        FeatureFlagsEnum.data_module.value: True,  # 03.10.2022 #56
        FeatureFlagsEnum.database_module.value: True,  # 02.10.2022 #48
        FeatureFlagsEnum.moderator_module.value: False,  # 02.10.2022 #48
-        FeatureFlagsEnum.permission_module.value: True,  # 02.10.2022 #48
        FeatureFlagsEnum.config_module.value: True,  # 19.07.2023 #127
        FeatureFlagsEnum.short_role_name_module.value: True,  # 28.09.2023 #378
        FeatureFlagsEnum.steam_special_offers_module.value: True,  # 11.10.2023 #188
--- a/bot/src/bot_core/core_extension/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/core_extension/core_extension.py
+++ b/bot/src/bot_core/core_extension/core_extension.py
@@ -9,7 +9,7 @@ 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.helper.event_checks import EventChecks
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class CoreExtension(ApplicationExtensionABC):
--- a/bot/src/bot_core/core_extension/core_extension_on_ready_event.py
+++ b/bot/src/bot_core/core_extension/core_extension_on_ready_event.py
@@ -1,20 +1,18 @@
-import asyncio
-
 from cpl_core.configuration import ConfigurationABC
-from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe

 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.environment_variables import MAINTENANCE
+from bot_core.logging.event_logger import EventLogger


 class CoreExtensionOnReadyEvent(OnReadyABC):
    def __init__(
        self,
        config: ConfigurationABC,
-        logger: LoggerABC,
+        logger: EventLogger,
        bot: DiscordBotServiceABC,
        client_utils: ClientUtilsABC,
        t: TranslatePipe,
--- a/bot/src/bot_core/core_module.py
+++ b/bot/src/bot_core/core_module.py
@@ -7,6 +7,7 @@ from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.abc.module_abc import ModuleABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.events.core_on_ready_event import CoreOnReadyEvent
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
@@ -14,6 +15,7 @@ from bot_core.service.client_utils_service import ClientUtilsService
 from bot_core.service.config_service import ConfigService
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_core.service.message_service import MessageService
+from bot_core.service.permission_service import PermissionService


 class CoreModule(ModuleABC):
@@ -28,6 +30,7 @@ class CoreModule(ModuleABC):
        services.add_transient(MessageServiceABC, MessageService)
        services.add_transient(ClientUtilsABC, ClientUtilsService)
        services.add_transient(DataIntegrityService)
+        services.add_singleton(PermissionServiceABC, PermissionService)

        # pipes
        services.add_transient(DateTimeOffsetPipe)
--- a/bot/src/bot_core/events/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/events/core_on_ready_event.py
+++ b/bot/src/bot_core/events/core_on_ready_event.py
@@ -1,15 +1,15 @@
-from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe

 from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.logging.event_logger import EventLogger


 class CoreOnReadyEvent(OnReadyABC):
    def __init__(
        self,
-        logger: LoggerABC,
+        logger: EventLogger,
        bot: DiscordBotServiceABC,
        client_utils: ClientUtilsABC,
        t: TranslatePipe,
--- a/bot/src/bot_core/exception/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/helper/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/helper/command_checks.py
+++ b/bot/src/bot_core/helper/command_checks.py
@@ -7,7 +7,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.exception.check_error import CheckError
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class CommandChecks:
--- a/bot/src/bot_core/logging/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/logging/event_logger.py
+++ b/bot/src/bot_core/logging/event_logger.py
@@ -0,0 +1,15 @@
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.environment import ApplicationEnvironmentABC
+from cpl_core.time import TimeFormatSettings
+
+from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
+
+
+class EventLogger(CustomFileLoggerABC):
+    def __init__(
+        self,
+        config: ConfigurationABC,
+        time_format: TimeFormatSettings,
+        env: ApplicationEnvironmentABC,
+    ):
+        CustomFileLoggerABC.__init__(self, "Event", config, time_format, env)
--- a/bot/src/bot_core/pipes/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/service/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_core/service/permission_service.py
+++ b/bot/src/bot_core/service/permission_service.py
@@ -0,0 +1,114 @@
+from typing import Optional
+
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.logging import LoggerABC
+from cpl_discord.service import DiscordBotServiceABC
+
+from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
+from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
+from bot_core.abc.permission_service_abc import PermissionServiceABC
+
+
+class PermissionService(PermissionServiceABC):
+    def __init__(
+        self,
+        logger: LoggerABC,
+        bot: DiscordBotServiceABC,
+        config: ConfigurationABC,
+        servers: ServerRepositoryABC,
+        server_configs: ServerConfigRepositoryABC,
+        technician_configs: TechnicianConfigRepositoryABC,
+    ):
+        PermissionServiceABC.__init__(self)
+        self._logger = logger
+        self._bot = bot
+        self._config = config
+        self._servers = servers
+        self._server_configs = server_configs
+        self._technician_configs = technician_configs
+
+        # member_id: {team_member_type: {guild_id: bool}}
+        self._cache: dict[int, dict[TeamMemberTypeEnum, dict[int, bool]]] = {}
+
+    def reset_cache(self):
+        self._cache = {}
+
+    def get_cached_permission(
+        self, member_id: int, team_member_type: TeamMemberTypeEnum, guild_id: int = None
+    ) -> Optional[bool]:
+        if member_id not in self._cache:
+            self._cache[member_id] = {}
+
+        if team_member_type not in self._cache[member_id]:
+            self._cache[member_id][team_member_type] = {}
+            return None
+
+        if guild_id not in self._cache[member_id][team_member_type]:
+            return None
+
+        return self._cache[member_id][team_member_type][guild_id]
+
+    def set_cached_permission(
+        self, value: bool, member_id: int, team_member_type: TeamMemberTypeEnum, guild_id: int = None
+    ):
+        if member_id not in self._cache:
+            self._cache[member_id] = {}
+
+        if team_member_type not in self._cache[member_id]:
+            self._cache[member_id][team_member_type] = {}
+
+        self._cache[member_id][team_member_type][guild_id] = value
+
+    def _has_member_role(self, member: discord.Member, team_member_type: TeamMemberTypeEnum) -> bool:
+        if member is None or member.guild is None:
+            return False
+
+        try:
+            has_permission_cached = self.get_cached_permission(member.id, team_member_type, member.guild.id)
+            if has_permission_cached is not None:
+                return has_permission_cached
+
+            self._logger.debug(__name__, f"Checking is member {member.name} {team_member_type.value}")
+
+            has_permission = True in [
+                member.guild.get_role(x.role_id) in member.roles
+                for x in self._server_configs.get_server_config_by_server(
+                    self._servers.get_server_by_discord_id(member.guild.id).id
+                ).team_role_ids
+                if x.team_member_type == team_member_type
+            ]
+            self.set_cached_permission(has_permission, member.id, team_member_type, member.guild.id)
+            return has_permission
+        except Exception as e:
+            self._logger.error(__name__, "Permission check failed", e)
+
+        return False
+
+    def is_member_admin(self, member: discord.Member) -> bool:
+        return self._has_member_role(member, TeamMemberTypeEnum.admin)
+
+    def is_member_moderator(self, member: discord.Member) -> bool:
+        return self._has_member_role(member, TeamMemberTypeEnum.moderator) or self._has_member_role(
+            member, TeamMemberTypeEnum.admin
+        )
+
+    def is_member_technician(self, member: discord.Member) -> bool:
+        if member is None or member.guild is None:
+            return False
+
+        has_permission_cached = self.get_cached_permission(member.id, TeamMemberTypeEnum.technician)
+        if has_permission_cached is not None:
+            return has_permission_cached
+
+        self._logger.debug(__name__, f"Checking is member {member.name} technician")
+
+        try:
+            has_permission = member.id in self._technician_configs.get_technician_config().technician_ids
+            self.set_cached_permission(has_permission, member.id, TeamMemberTypeEnum.technician)
+            return has_permission
+        except Exception as e:
+            self._logger.error(__name__, "Permission check failed", e)
+            return False
--- a/bot/src/bot_data/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_data/abc/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_data/abc/user_repository_abc.py
+++ b/bot/src/bot_data/abc/user_repository_abc.py
@@ -31,6 +31,10 @@ class UserRepositoryABC(ABC):
    def get_users_by_server_id(self, server_id: int) -> List[User]:
        pass

+    @abstractmethod
+    def get_users_with_activity_by_server_id(self, server_id: int) -> List[User]:
+        pass
+
    @abstractmethod
    def get_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> User:
        pass
--- a/bot/src/bot_data/bot-data.json
+++ b/bot/src/bot_data/bot-data.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "Sven Heidemann",
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
--- a/bot/src/bot_data/model/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_data/model/team_member_type_enum.py
+++ b/bot/src/bot_data/model/team_member_type_enum.py
@@ -4,3 +4,4 @@ from enum import Enum
 class TeamMemberTypeEnum(Enum):
    moderator = "Moderator"
    admin = "Admin"
+    technician = "Technician"
--- a/bot/src/bot_data/model/user.py
+++ b/bot/src/bot_data/model/user.py
@@ -2,6 +2,7 @@ from datetime import datetime, date
 from typing import Optional

 from cpl_core.database import TableABC
+from cpl_core.database.context import DatabaseContextABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
@@ -31,6 +32,8 @@ class User(TableABC):
        self._birthday = birthday
        self._server = server

+        self._activity = 0
+
        TableABC.__init__(self)
        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
@@ -92,10 +95,40 @@ class User(TableABC):
    @property
    @ServiceProviderABC.inject
    def ontime(self, services: ServiceProviderABC) -> float:
-        from bot_core.abc.client_utils_abc import ClientUtilsABC
+        db: DatabaseContextABC = services.get_service(DatabaseContextABC)
+        result = db.select(
+            f"""
+            SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedVoiceChannel.LeavedOn, UserJoinedVoiceChannel.JoinedOn)) / 3600),2)
+            FROM UserJoinedVoiceChannel
+            WHERE UserId = {self._user_id};
+        """
+        )[0][0]
+        if result is None:
+            return 0
+        return float(result)

-        client_utils: ClientUtilsABC = services.get_service(ClientUtilsABC)
-        return client_utils.get_ontime_for_user(self)
+    @property
+    @ServiceProviderABC.inject
+    def game_ontime(self, services: ServiceProviderABC) -> float:
+        db: DatabaseContextABC = services.get_service(DatabaseContextABC)
+        result = db.select(
+            f"""
+            SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedGameServer.LeavedOn, UserJoinedGameServer.JoinedOn)) / 3600),2)
+            FROM UserJoinedGameServer
+            WHERE UserId = {self._user_id};
+        """
+        )[0][0]
+        if result is None:
+            return 0
+        return float(result)
+
+    @property
+    def activity(self) -> int:
+        return self._activity
+
+    @activity.setter
+    def activity(self, value: int):
+        self._activity = value

    @property
    @ServiceProviderABC.inject
@@ -135,6 +168,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(
--- a/bot/src/bot_data/service/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_data/service/user_repository_service.py
+++ b/bot/src/bot_data/service/user_repository_service.py
@@ -1,6 +1,8 @@
+import datetime
 from typing import Optional

 from cpl_core.database.context import DatabaseContextABC
+from cpl_core.type import T, R
 from cpl_query.extension import List

 from bot_core.logging.database_logger import DatabaseLogger
@@ -38,7 +40,9 @@ class UserRepositoryService(UserRepositoryABC):

    def get_users(self) -> List[User]:
        self._logger.trace(__name__, f"Send SQL command: {User.get_select_all_string()}")
-        return List(User, [self._from_result(user) for user in self._context.select(User.get_select_all_string())])
+        return List(
+            User, [self._from_result(user) for user in self._context.select(User.get_select_all_string())]
+        ).for_each(lambda x: self._set_user_activity(x))

    def get_user_by_id(self, id: int) -> User:
        self._logger.trace(__name__, f"Send SQL command: {User.get_select_by_id_string(id)}")
@@ -77,6 +81,16 @@ class UserRepositoryService(UserRepositoryABC):
            [self._from_result(user) for user in self._context.select(User.get_select_by_server_id_string(server_id))],
        )

+    def get_users_with_activity_by_server_id(self, server_id: int) -> List[User]:
+        self._logger.trace(
+            __name__,
+            f"Send SQL command: {User.get_select_by_server_id_string(server_id)}",
+        )
+        return List(
+            User,
+            [self._from_result(user) for user in self._context.select(User.get_select_by_server_id_string(server_id))],
+        ).for_each(lambda x: self._set_user_activity(x))
+
    def get_user_by_discord_id_and_server_id(self, discord_id: int, server_id: int) -> User:
        self._logger.trace(
            __name__,
@@ -109,3 +123,91 @@ class UserRepositoryService(UserRepositoryABC):
    def delete_user(self, user: User):
        self._logger.trace(__name__, f"Send SQL command: {user.delete_string}")
        self._context.cursor.execute(user.delete_string)
+
+    def _set_user_activity(self, user):
+        days = (datetime.date.today() - (datetime.date.today() - datetime.timedelta(days=7))).days
+        query = f"""
+            SELECT (
+                (
+                    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 = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserGotAchievements.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) +
+                (
+                    SELECT SUM(
+                        UserMessageCountPerHour.XPCount / (
+                            SELECT XpPerMessage
+                            FROM CFG_Server
+                            WHERE ServerId = {user.server.id}
+                        )
+                    )
+                    FROM UserMessageCountPerHour
+                    INNER JOIN Users ON UserMessageCountPerHour.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserMessageCountPerHour.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) +
+                (
+                    SELECT Count(UserJoinedVoiceChannel.CreatedAt)
+                    FROM UserJoinedVoiceChannel
+                    INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserJoinedVoiceChannel.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) +
+                (
+                    SELECT IFNULL(ROUND(SUM(TIME_TO_SEC(
+                        TIMEDIFF(UserJoinedVoiceChannel.LeavedOn, UserJoinedVoiceChannel.JoinedOn)
+                    ) / 3600), 2), 0)
+                    FROM UserJoinedVoiceChannel
+                    INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserJoinedVoiceChannel.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) +
+                (
+                    SELECT Count(UserJoinedGameServer.CreatedAt)
+                    FROM UserJoinedGameServer
+                    INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserJoinedGameServer.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) +
+                (
+                    SELECT IFNULL(ROUND(SUM(TIME_TO_SEC(
+                        TIMEDIFF(UserJoinedGameServer.LeavedOn, UserJoinedGameServer.JoinedOn)
+                    ) / 3600), 2), 0)
+                    FROM UserJoinedGameServer
+                    INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserJoinedGameServer.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                ) -
+                (
+                    SELECT COUNT(UserWarnings.CreatedAt)
+                    FROM UserWarnings
+                    INNER JOIN Users ON UserWarnings.UserId = Users.UserId
+                    WHERE Users.ServerId = {user.server.id}
+                    AND Users.UserId = {user.id}
+                    AND UserWarnings.CreatedAt >= "{datetime.date.today() - datetime.timedelta(days=7)}"
+                )
+           ) / {days} * 1000 as count;
+        """
+        user.activity = self._cast_query_result(query, int)
+
+    def _cast_query_result(self, query: str, r_type: T) -> Optional[R]:
+        results = self._context.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
--- a/bot/src/bot_graphql/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/abc/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/abc/query_abc.py
+++ b/bot/src/bot_graphql/abc/query_abc.py
@@ -12,6 +12,7 @@ from bot_api.exception.service_exception import ServiceException
 from bot_api.route.route import Route
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.environment_variables import MAINTENANCE
+from bot_core.service.permission_service import PermissionService
 from bot_data.model.achievement import Achievement
 from bot_data.model.auth_role_enum import AuthRoleEnum
 from bot_data.model.auth_user import AuthUser
@@ -32,7 +33,6 @@ from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.filter_abc import FilterABC
 from bot_graphql.filter.page import Page
 from bot_graphql.filter.sort import Sort
-from modules.permission.service.permission_service import PermissionService


 class QueryABC(ObjectType):
@@ -64,11 +64,9 @@ class QueryABC(ObjectType):
            if user == "system" or user.auth_role == AuthRoleEnum.admin:
                return self._resolve_collection(collection, *args, **kwargs)

-            for x in collection.to_list():
-                if not self._can_user_see_element(user, x):
-                    collection.remove(x)
-
-            return self._resolve_collection(collection, *args, **kwargs)
+            return self._resolve_collection(
+                collection.where(lambda x: self._can_user_see_element(user, x)), *args, **kwargs
+            )

        self.set_field(f"{name}s", wrapper)
        self.set_field(f"{name}Count", lambda *args: wrapper(*args).count())
--- a/bot/src/bot_graphql/bot-graphql.json
+++ b/bot/src/bot_graphql/bot-graphql.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "Sven Heidemann",
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
--- a/bot/src/bot_graphql/filter/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/graphql/query.gql
+++ b/bot/src/bot_graphql/graphql/query.gql
@@ -52,4 +52,5 @@ type Query {
    discord: Discord

    hasFeatureFlag(flag: String): FeatureFlag
+    featureFlags: [FeatureFlag]
 }
--- a/bot/src/bot_graphql/graphql/server.gql
+++ b/bot/src/bot_graphql/graphql/server.gql
@@ -40,6 +40,7 @@ type Server implements TableWithHistoryQuery {

    config: ServerConfig
    hasFeatureFlag(flag: String): FeatureFlag
+    featureFlags: [FeatureFlag]

    statistic(date: String): ServerStatistic

--- a/bot/src/bot_graphql/graphql/user.gql
+++ b/bot/src/bot_graphql/graphql/user.gql
@@ -7,7 +7,11 @@ type User implements TableWithHistoryQuery {
    reactionCount: Int
    birthday: String
    ontime: Float
+    gameOntime: Float
    level: Level
+    activityScore: Int
+
+    profilePictureURL: String

    joinedServers(filter: UserJoinedServerFilter, page: Page, sort: Sort): [UserJoinedServer]
    joinedServerCount: Int
--- a/bot/src/bot_graphql/model/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/mutations/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/mutations/achievement_mutation.py
+++ b/bot/src/bot_graphql/mutations/achievement_mutation.py
@@ -6,7 +6,7 @@ from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.achievement import Achievement
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
-from modules.permission.service.permission_service import PermissionService
+from bot_core.service.permission_service import PermissionService


 class AchievementMutation(QueryABC):
--- a/bot/src/bot_graphql/mutations/scheduled_event_mutation.py
+++ b/bot/src/bot_graphql/mutations/scheduled_event_mutation.py
@@ -10,7 +10,7 @@ from bot_data.model.scheduled_event import ScheduledEvent
 from bot_data.model.scheduled_event_interval_enum import ScheduledEventIntervalEnum
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
-from modules.permission.service.permission_service import PermissionService
+from bot_core.service.permission_service import PermissionService


 class ScheduledEventMutation(QueryABC):
--- a/bot/src/bot_graphql/mutations/server_config_mutation.py
+++ b/bot/src/bot_graphql/mutations/server_config_mutation.py
@@ -13,6 +13,7 @@ from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
 from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
 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 ServerConfigMutation(QueryABC):
@@ -24,6 +25,7 @@ class ServerConfigMutation(QueryABC):
        server_configs: ServerConfigRepositoryABC,
        db: DatabaseContextABC,
        config_service: ConfigService,
+        permissions: PermissionService,
    ):
        QueryABC.__init__(self, "ServerConfigMutation")

@@ -33,6 +35,7 @@ class ServerConfigMutation(QueryABC):
        self._server_configs = server_configs
        self._db = db
        self._config_service = config_service
+        self._permissions = permissions

        self.set_field("updateServerConfig", self.resolve_update_server_config)

@@ -175,11 +178,13 @@ class ServerConfigMutation(QueryABC):

    def _update_team_role_ids(self, new_config: ServerConfig):
        old_config = self._server_configs.get_server_config_by_server(new_config.server.id)
+        has_update = False
        for role_id in old_config.team_role_ids:
            if role_id.role_id in new_config.team_role_ids.select(lambda x: int(x.role_id)):
                continue

            self._server_configs.delete_server_team_role_id_config(role_id)
+            has_update = True

        for role_id in new_config.team_role_ids:
            guild = self._bot.get_guild(new_config.server.discord_id)
@@ -192,3 +197,7 @@ class ServerConfigMutation(QueryABC):
                continue

            self._server_configs.add_server_team_role_id_config(role_id)
+            has_update = True
+
+        if has_update:
+            self._permissions.reset_cache()
--- a/bot/src/bot_graphql/mutations/short_role_name_mutation.py
+++ b/bot/src/bot_graphql/mutations/short_role_name_mutation.py
@@ -6,7 +6,7 @@ from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryA
 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 modules.permission.service.permission_service import PermissionService
+from bot_core.service.permission_service import PermissionService


 class ShortRoleNameMutation(QueryABC):
--- a/bot/src/bot_graphql/mutations/technician_config_mutation.py
+++ b/bot/src/bot_graphql/mutations/technician_config_mutation.py
@@ -16,6 +16,7 @@ from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_data.service.technician_config_seeder import TechnicianConfigSeeder
 from bot_graphql.abc.query_abc import QueryABC
+from bot_core.service.permission_service import PermissionService


 class TechnicianConfigMutation(QueryABC):
@@ -30,6 +31,7 @@ class TechnicianConfigMutation(QueryABC):
        config_service: ConfigService,
        tech_seeder: TechnicianConfigSeeder,
        client_utils: ClientUtilsABC,
+        permissions: PermissionService,
    ):
        QueryABC.__init__(self, "TechnicianConfigMutation")

@@ -42,6 +44,7 @@ class TechnicianConfigMutation(QueryABC):
        self._config_service = config_service
        self._tech_seeder = tech_seeder
        self._client_utils = client_utils
+        self._permissions = permissions

        self.set_field("updateTechnicianConfig", self.resolve_update_technician_config)

@@ -126,11 +129,13 @@ class TechnicianConfigMutation(QueryABC):

    def _update_technician_ids(self, new_config: TechnicianConfig):
        old_config = self._technician_configs.get_technician_config()
+        has_update = False
        for technician_id in old_config.technician_ids:
            if technician_id in new_config.technician_ids:
                continue

            self._technician_configs.delete_technician_id_config(TechnicianIdConfig(technician_id))
+            has_update = True

        for technician_id in new_config.technician_ids:
            user = self._bot.get_user(technician_id)
@@ -142,3 +147,7 @@ class TechnicianConfigMutation(QueryABC):
                continue

            self._technician_configs.add_technician_id_config(TechnicianIdConfig(technician_id))
+            has_update = True
+
+        if has_update:
+            self._permissions.reset_cache()
--- a/bot/src/bot_graphql/mutations/user_joined_game_server_mutation.py
+++ b/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 modules.permission.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}")
--- a/bot/src/bot_graphql/mutations/user_mutation.py
+++ b/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 modules.permission.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
--- a/bot/src/bot_graphql/queries/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/queries/discord/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/bot_graphql/queries/server_query.py
+++ b/bot/src/bot_graphql/queries/server_query.py
@@ -86,7 +86,7 @@ class ServerQuery(DataQueryWithHistoryABC):
        )
        self.add_collection(
            "user",
-            lambda server, *_: self._users.get_users_by_server_id(server.id),
+            lambda server, *_: self._users.get_users_with_activity_by_server_id(server.id),
            UserFilter,
        )
        self.add_collection(
@@ -116,6 +116,10 @@ class ServerQuery(DataQueryWithHistoryABC):
            "hasFeatureFlag",
            lambda server, *_, **kwargs: self._resolve_has_feature_flag(server, *_, **kwargs),
        )
+        self.set_field(
+            "featureFlags",
+            lambda server, *_, **kwargs: self._resolve_feature_flags(server, *_),
+        )
        self.set_field("statistic", lambda server, *_, **kwargs: ServerStatistics(server, kwargs))

    @staticmethod
@@ -142,3 +146,13 @@ class ServerQuery(DataQueryWithHistoryABC):
            "key": kwargs["flag"],
            "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(kwargs["flag"])),
        }
+
+    def _resolve_feature_flags(self, server: Server, *_) -> list[dict]:
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.discord_id}")
+        return [
+            {
+                "key": flag,
+                "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(flag)),
+            }
+            for flag in [e.value for e in FeatureFlagsEnum]
+        ]
--- a/bot/src/bot_graphql/queries/server_statistic_query.py
+++ b/bot/src/bot_graphql/queries/server_statistic_query.py
@@ -114,7 +114,9 @@ class ServerStatisticQuery(QueryABC):

    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
+            SELECT IFNULL(ROUND(SUM(
+                TIME_TO_SEC(TIMEDIFF(UserJoinedVoiceChannel.LeavedOn, UserJoinedVoiceChannel.JoinedOn)) / 3600
+            ), 2), 0) FROM UserJoinedVoiceChannel
            INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId
            WHERE Users.ServerId = {server.server.id}
              AND UserJoinedVoiceChannel.CreatedAt >= "{self._get_date(**server.kwargs)}";
@@ -132,7 +134,10 @@ class ServerStatisticQuery(QueryABC):

    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
+            SELECT IFNULL(ROUND(SUM(
+                TIME_TO_SEC(TIMEDIFF(UserJoinedGameServer.LeavedOn, UserJoinedGameServer.JoinedOn)) / 3600
+            ), 2), 0)
+            FROM UserJoinedGameServer
            INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId
            WHERE Users.ServerId = {server.server.id}
              AND UserJoinedGameServer.CreatedAt >= "{self._get_date(**server.kwargs)}";
--- a/bot/src/bot_graphql/queries/user_query.py
+++ b/bot/src/bot_graphql/queries/user_query.py
@@ -2,6 +2,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC

 from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC
 from bot_data.abc.user_joined_game_server_repository_abc import (
    UserJoinedGameServerRepositoryABC,
@@ -11,7 +12,6 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import (
    UserJoinedVoiceChannelRepositoryABC,
 )
 from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC
-from bot_data.model.user import User
 from bot_data.model.user_history import UserHistory
 from bot_graphql.abc.data_query_with_history_abc import DataQueryWithHistoryABC
 from bot_graphql.filter.achievement_filter import AchievementFilter
@@ -22,7 +22,6 @@ from bot_graphql.filter.user_joined_voice_channel_filter import (
 )
 from bot_graphql.filter.user_warning_filter import UserWarningFilter
 from modules.level.service.level_service import LevelService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC


 class UserQuery(DataQueryWithHistoryABC):
@@ -50,15 +49,17 @@ class UserQuery(DataQueryWithHistoryABC):
        self._permissions = permissions
        self._achievements = achievements

-        self.set_field("id", self.resolve_id)
-        self.set_field("discordId", self.resolve_discord_id)
-        self.set_field("name", self.resolve_name)
-        self.set_field("xp", self.resolve_xp)
+        self.set_field("id", lambda user, *_: user.id)
+        self.set_field("discordId", lambda user, *_: user.discord_id)
+        self.set_field("name", lambda user, *_: user.name)
+        self.set_field("xp", lambda user, *_: user.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("ontime", self.resolve_ontime)
-        self.set_field("level", self.resolve_level)
+        self.set_field("ontime", lambda user, *_: user.ontime)
+        self.set_field("gameOntime", lambda user, *_: user.game_ontime)
+        self.set_field("level", lambda user, *_: user.level)
+        self.set_field("activityScore", lambda user, *_: user.activity)
        self.add_collection(
            "joinedServer",
            lambda user, *_: self._ujs.get_user_joined_servers_by_user_id(user.id),
@@ -85,37 +86,6 @@ class UserQuery(DataQueryWithHistoryABC):
            UserWarningFilter,
        )

-        self.set_field("server", self.resolve_server)
-        self.set_field("leftServer", self.resolve_left_server)
-
-    @staticmethod
-    def resolve_id(user: User, *_):
-        return user.id
-
-    @staticmethod
-    def resolve_discord_id(user: User, *_):
-        return user.discord_id
-
-    @staticmethod
-    def resolve_name(user: User, *_):
-        return user.name
-
-    @staticmethod
-    def resolve_xp(user: User, *_):
-        return user.xp
-
-    @staticmethod
-    def resolve_ontime(user: User, *_):
-        return user.ontime
-
-    @staticmethod
-    def resolve_level(user: User, *_):
-        return user.level
-
-    @staticmethod
-    def resolve_server(user: User, *_):
-        return user.server
-
-    @staticmethod
-    def resolve_left_server(user: User, *_):
-        return user.left_server
+        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)
--- a/bot/src/bot_graphql/query.py
+++ b/bot/src/bot_graphql/query.py
@@ -131,6 +131,10 @@ class Query(QueryABC):
            "hasFeatureFlag",
            lambda *_, **kwargs: self._resolve_has_feature_flag(*_, **kwargs),
        )
+        self.set_field(
+            "featureFlags",
+            lambda *_, **kwargs: self._resolve_feature_flags(*_),
+        )

    def _resolve_has_feature_flag(self, *_, **kwargs):
        settings: TechnicianConfig = self._config.get_configuration(TechnicianConfig)
@@ -140,3 +144,13 @@ class Query(QueryABC):
            "key": kwargs["flag"],
            "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(kwargs["flag"])),
        }
+
+    def _resolve_feature_flags(self, *_) -> list[dict]:
+        settings: TechnicianConfig = self._config.get_configuration(TechnicianConfig)
+        return [
+            {
+                "key": flag,
+                "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(flag)),
+            }
+            for flag in [e.value for e in FeatureFlagsEnum]
+        ]
--- a/bot/src/modules/achievements/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/achievements/achievements.json
+++ b/bot/src/modules/achievements/achievements.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "Sven Heidemann",
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
--- a/bot/src/modules/achievements/commands/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/achievements/events/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/achievements/model/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/auto_role/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/auto_role/auto-role.json
+++ b/bot/src/modules/auto_role/auto-role.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "",
    "AuthorEmail": "",
--- a/bot/src/modules/auto_role/command/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/auto_role/command/auto_role_group.py
+++ b/bot/src/modules/auto_role/command/auto_role_group.py
@@ -22,7 +22,7 @@ from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.auto_role import AutoRole
 from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class AutoRoleGroup(DiscordCommandABC):
--- a/bot/src/modules/auto_role/events/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/auto_role/helper/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/base/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/base/base.json
+++ b/bot/src/modules/base/base.json
@@ -4,7 +4,7 @@
    "Version": {
      "Major": "1",
      "Minor": "2",
-      "Micro": "2"
+      "Micro": "3"
    },
    "Author": "",
    "AuthorEmail": "",
--- a/bot/src/modules/base/base_module.py
+++ b/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)
--- a/bot/src/modules/base/command/init.py
+++ b/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.2"
+__version__ = "1.2.3"

 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="2")
+version_info = VersionInfo(major="1", minor="2", micro="3")
--- a/bot/src/modules/base/command/game_server_group.py
+++ b/bot/src/modules/base/command/game_server_group.py
@@ -23,7 +23,7 @@ from bot_data.abc.user_game_ident_repository_abc import UserGameIdentRepositoryA
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.game_server import GameServer
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class GameServerGroup(DiscordCommandABC):
--- a/bot/src/modules/base/command/ping_command.py
+++ b/bot/src/modules/base/command/ping_command.py
@@ -11,7 +11,7 @@ from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.technician_config import TechnicianConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class PingCommand(DiscordCommandABC):
--- a/bot/src/modules/base/command/purge_command.py
+++ b/bot/src/modules/base/command/purge_command.py
@@ -11,7 +11,7 @@ from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC


 class PurgeCommand(DiscordCommandABC):
--- a/bot/src/modules/base/command/register_group.py
+++ b/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)
--- a/bot/src/modules/base/command/scheduled_events_group.py
+++ b/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)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sven Heidemann	266dacb301	Fixed deps All checks were successful Deploy staging on push / pre-build (push) Successful in 2s Details Deploy staging on push / build-bot (push) Successful in 3m12s Details Deploy staging on push / build-web (push) Successful in 2m1s Details Deploy staging on push / deploy (push) Successful in 26s Details Deploy dev on push / pre-build (push) Successful in 2s Details Deploy dev on push / build-bot (push) Successful in 1m55s Details Deploy dev on push / build-web (push) Successful in 1m46s Details Deploy dev on push / deploy (push) Successful in 23s Details	2023-12-13 12:11:09 +01:00
Sven Heidemann	280cd9827d	shutdown correct stack All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 2m1s Details Deploy staging on push / build-web (push) Successful in 1m57s Details Deploy staging on push / deploy (push) Successful in 22s Details	2023-12-13 11:59:21 +01:00
Sven Heidemann	36998470e8	Try filtering scheduled events All checks were successful Deploy staging on push / pre-build (push) Successful in 2s Details Deploy staging on push / build-bot (push) Successful in 3m0s Details Deploy staging on push / build-web (push) Successful in 2m7s Details Deploy staging on push / deploy (push) Successful in 24s Details	2023-12-13 11:25:51 +01:00
Sven Heidemann	53c6bf4208	Merge pull request 'Added gmod support #277 ' (#459 ) from #277 into staging All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 3m8s Details Deploy staging on push / build-web (push) Successful in 1m47s Details Deploy staging on push / deploy (push) Successful in 24s Details Reviewed-on: #459	2023-12-12 11:49:43 +01:00
Sven Heidemann	4e80e3ccb7	Added gmod support #277	2023-12-11 21:34:38 +01:00
Sven Heidemann	ba173a6743	Improved xp knob #409 All checks were successful Deploy staging on push / pre-build (push) Successful in 2s Details Deploy staging on push / build-bot (push) Successful in 3m4s Details Deploy staging on push / build-web (push) Successful in 1m56s Details Deploy staging on push / deploy (push) Successful in 26s Details	2023-12-10 19:50:44 +01:00
Sven Heidemann	84ff2a8a9b	Fixed update user #455	2023-12-10 19:18:20 +01:00
Sven Heidemann	13bc38fea8	Updated profile #409	2023-12-10 19:00:00 +01:00
Sven Heidemann	dfdf0555d7	Added feature flag check for scheduled events #455 All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 3m6s Details Deploy staging on push / build-web (push) Successful in 1m57s Details Deploy staging on push / deploy (push) Successful in 28s Details	2023-12-10 17:08:26 +01:00
Sven Heidemann	39299eb11b	Made watchers transient All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 3m46s Details Deploy staging on push / build-web (push) Successful in 2m5s Details Deploy staging on push / deploy (push) Successful in 28s Details	2023-12-10 13:13:24 +01:00
Sven Heidemann	dfb6751bf9	Set event watcher loop from 12 to 3 hours All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 2m52s Details Deploy staging on push / build-web (push) Successful in 1m53s Details Deploy staging on push / deploy (push) Successful in 32s Details	2023-12-10 11:18:30 +01:00
Sven Heidemann	4a75635a55	Fixed actions All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 1m47s Details Deploy staging on push / build-web (push) Successful in 1m42s Details Deploy staging on push / deploy (push) Successful in 22s Details	2023-12-09 22:48:37 +01:00
Sven Heidemann	f6b2739394	Merge pull request 'Fixed actions' (#458 ) from dev into staging All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 1m52s Details Deploy staging on push / build-web (push) Successful in 1m44s Details Deploy staging on push / deploy (push) Successful in 23s Details Reviewed-on: #458	2023-12-09 22:38:35 +01:00
Sven Heidemann	36d2605655	Merge branch 'staging' into dev All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m53s Details Deploy dev on push / build-web (push) Successful in 1m47s Details Deploy dev on push / deploy (push) Successful in 21s Details	2023-12-09 22:38:16 +01:00
Sven Heidemann	af891fa588	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m51s Details Deploy dev on push / build-web (push) Successful in 1m50s Details Deploy dev on push / deploy (push) Successful in 23s Details	2023-12-09 22:33:14 +01:00
Sven Heidemann	af348b85a4	Merge pull request 'dev into staging' (#457 ) from dev into staging All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 1m46s Details Deploy staging on push / build-web (push) Successful in 1m44s Details Deploy staging on push / deploy (push) Successful in 27s Details Reviewed-on: #457	2023-12-09 22:23:06 +01:00
Sven Heidemann	7ed621a25b	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m52s Details Deploy dev on push / build-web (push) Successful in 1m41s Details Deploy dev on push / deploy (push) Successful in 21s Details	2023-12-09 22:17:56 +01:00
Sven Heidemann	013f953a7f	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m53s Details Deploy dev on push / build-web (push) Successful in 1m42s Details Deploy dev on push / deploy (push) Successful in 23s Details	2023-12-09 22:10:04 +01:00
Sven Heidemann	4163532696	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m52s Details Deploy dev on push / build-web (push) Successful in 1m57s Details Deploy dev on push / deploy (push) Successful in 6s Details	2023-12-09 22:02:57 +01:00
Sven Heidemann	b6a1172cc1	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m0s Details Deploy dev on push / build-web (push) Successful in 1m47s Details Deploy dev on push / deploy (push) Successful in 6s Details	2023-12-09 21:51:47 +01:00
Sven Heidemann	20bdb6bd98	Updated compose files All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m1s Details Deploy dev on push / build-web (push) Successful in 1m42s Details Deploy dev on push / deploy (push) Successful in 5s Details	2023-12-09 21:46:01 +01:00
Sven Heidemann	3f13f65932	Updated other env actions	2023-12-09 21:43:34 +01:00
Sven Heidemann	711e184895	Fixed dev action All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m48s Details Deploy dev on push / build-web (push) Successful in 1m53s Details Deploy dev on push / deploy (push) Successful in 5s Details	2023-12-09 21:34:21 +01:00
Sven Heidemann	7e3975f4be	Fixed dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m13s Details Deploy dev on push / build-web (push) Successful in 1m43s Details Deploy dev on push / deploy (push) Failing after 1s Details	2023-12-09 21:28:15 +01:00
Sven Heidemann	d4f4f39522	Fixed dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Failing after 1m55s Details Deploy dev on push / build-web (push) Failing after 1m45s Details Deploy dev on push / deploy (push) Has been skipped Details	2023-12-09 21:22:00 +01:00
Sven Heidemann	af9c55e4b1	Updated dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 2s Details Deploy dev on push / build-bot (push) Failing after 2m3s Details Deploy dev on push / build-web (push) Failing after 2m5s Details Deploy dev on push / deploy (push) Has been skipped Details	2023-12-09 21:00:20 +01:00
Sven Heidemann	e3172d6f24	Fixed event logger All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 4m22s Details	2023-12-09 14:11:34 +01:00
Sven Heidemann	0706579f62	Fixed set timestamp for scheduled events #456 All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 4m9s Details	2023-12-09 14:05:35 +01:00
Sven Heidemann	ad3fc94923	Improved logging for event_service All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 4m13s Details	2023-12-09 13:58:38 +01:00
Sven Heidemann	69882af0bd	Added event logger Some checks reported warnings Deploy staging on push / on-push-deploy_sh-edraft (push) Has been cancelled Details	2023-12-09 13:55:40 +01:00
Sven Heidemann	b0fb12f841	Removed native password & disable ssl All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 5m13s Details	2023-12-06 17:59:23 +01:00
Sven Heidemann	4d980331e2	Merge pull request 'Added user activity score #451 ' (#452 ) from dev into staging All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 3m18s Details Reviewed-on: #452	2023-12-04 22:55:03 +01:00
Sven Heidemann	e6667c78c8	Added user activity score #451 All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m14s Details	2023-12-04 22:48:26 +01:00
Sven Heidemann	9976c59302	Fixed permission service All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 4m42s Details Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 3m27s Details	2023-12-03 16:42:33 +01:00
Sven Heidemann	293c8cd81c	Merge pull request 'dev into staging' (#450 ) from dev into staging All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 3m34s Details Reviewed-on: #450	2023-12-03 16:08:24 +01:00
Sven Heidemann	8f4ea56184	Merge branch 'staging' into dev All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m2s Details	2023-12-03 16:07:29 +01:00
Sven Heidemann	898e005978	Merge pull request 'Improved ontime loading & added game ontime #446 ' (#449 ) from #446 into dev All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 4m58s Details Reviewed-on: #449	2023-12-03 16:06:50 +01:00
Sven Heidemann	db3e6183ba	Merge branch 'dev' into #446	2023-12-03 16:06:36 +01:00
Sven Heidemann	0a47393510	Improved ontime loading & added game ontime #446	2023-12-03 16:04:56 +01:00
Sven Heidemann	6c5b514b41	Set new version All checks were successful Deploy dev on push / on-push-deploy_sh-edraft (push) Successful in 5m20s Details	2023-12-03 15:31:29 +01:00
Sven Heidemann	84f994fd58	Merge pull request '#446 ' (#448 ) from #446 into dev Some checks reported warnings Deploy dev on push / on-push-deploy_sh-edraft (push) Has been cancelled Details Reviewed-on: #448	2023-12-03 15:28:07 +01:00
Sven Heidemann	3d21123786	Fixed profile design #446	2023-12-03 15:24:53 +01:00
Sven Heidemann	36887f1bdf	Improved feature flag loading in frontend #446	2023-12-03 15:13:20 +01:00
Sven Heidemann	0e4419312b	Improved permission loading #446	2023-12-03 15:03:40 +01:00
Sven Heidemann	919eef79f6	Merge branch 'master' into staging All checks were successful Deploy staging on push / on-push-deploy_sh-edraft (push) Successful in 3m58s Details	2023-12-02 19:33:58 +01:00
Sven Heidemann	5de6710261	Merge pull request 'staging' (#435 ) from staging into master All checks were successful Deploy prod on push / on-push-deploy_sh-edraft (push) Successful in 3m34s Details Reviewed-on: #435	2023-11-07 20:37:13 +01:00