Merge pull request 'dev' (#400) from dev into master

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

.gitea/issue_template.md

@@ -0,0 +1,17 @@
+#### Beschreibung
+
+Als Produktmanager muss ich nun dieses Ticket ausfüllen.
+
+#### Aktuelles Verhalten
+
+* Was macht die Software aktuell?
+
+#### Gewünschtes Verhalten
+
+* Was soll die Software anders machen?
+
+#### Akzeptanzkriterien
+
+* Was muss erfüllt sein, damit das Ticket als abgeschlossen angesehen werden kann?
+
+#### Anmerkungen

.gitea/pull_request_template.md

@@ -0,0 +1,7 @@
+#### Ticket Referenz:
+
+#1
+
+#### Gibt es etwas beim Review zu beachten?
+
+Nein

.gitea/workflows/deploy_dev.yaml

@@ -0,0 +1,65 @@
+name: Deploy dev on push
+run-name: Deploy dev on push
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  on-push-deploy_sh-edraft:
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
+      - 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
+
+      - name: Shutdown stack
+        run: docker stack rm kdb_staging
+
+      - name: Prepare bot build
+        run: |
+          cd kdb-bot
+          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cpl i
+
+      - name: Build docker bot
+        run: |
+          cd kdb-bot
+          docker image prune -f
+          cpl docker-build
+
+      - name: Setup node
+        uses: https://github.com/actions/setup-node@v3
+
+      - name: Prepare web build
+        run: |
+          cd kdb-web
+          npm install -g ts-node
+          npm i
+
+      - name: Build docker web
+        run: |
+          cd kdb-web
+          docker image prune -f
+          npm run docker-build
+
+      - name: Deploy Stack to sh-edraft.de
+        uses: https://github.com/kgierke/portainer-stack-deployment@v1
+        with:
+          portainer-url: "https://docker.sh-edraft.de"
+          portainer-username: "gitea_job"
+          portainer-password: "${{ secrets.docker_job }}"
+          portainer-endpoint: 2
+          name: kdb_staging
+          file: ./docker-compose.staging.yml
+          variables: '{}'

.gitea/workflows/deploy_prod.yaml

@@ -0,0 +1,65 @@
+name: Deploy dev on push
+run-name: Deploy dev on push
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  on-push-deploy_sh-edraft:
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
+      - 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
+
+      - name: Shutdown stack
+        run: docker stack rm kdb_prod
+
+      - name: Prepare bot build
+        run: |
+          cd kdb-bot
+          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cpl i
+
+      - name: Build docker bot
+        run: |
+          cd kdb-bot
+          docker image prune -f
+          cpl docker-build
+
+      - name: Setup node
+        uses: https://github.com/actions/setup-node@v3
+
+      - name: Prepare web build
+        run: |
+          cd kdb-web
+          npm install -g ts-node
+          npm i
+
+      - name: Build docker web
+        run: |
+          cd kdb-web
+          docker image prune -f
+          npm run docker-build
+
+      - name: Deploy Stack to sh-edraft.de
+        uses: https://github.com/kgierke/portainer-stack-deployment@v1
+        with:
+          portainer-url: "https://docker.sh-edraft.de"
+          portainer-username: "gitea_job"
+          portainer-password: "${{ secrets.docker_job }}"
+          portainer-endpoint: 2
+          name: kdb_prod
+          file: ./docker-compose.yml
+          variables: '{}'

docker-compose.staging.yml

@@ -0,0 +1,87 @@
+version: "3.9"
+
+volumes:
+  kdb_db_staging_1:
+
+services:
+  kdb_bot_staging_1:
+    image: sh-edraft.de/kdb-bot:1.1.10
+    restart: unless-stopped
+    depends_on:
+      - kdb_db_staging_1
+    networks:
+      - kdb_test
+      - reverse_proxy
+    volumes:
+      - /opt/kdb/staging/bot/config:/app/bot/config
+      - /opt/kdb/staging/bot/api_config:/app/bot_api/config
+      - /opt/kdb/staging/bot/logs:/app/bot/logs
+    environment:
+      KDB_ENVIRONMENT: "staging"
+      KDB_TOKEN: "OTk4MTU5ODAyMzkzOTY0NTk0.G-csct.b2Y-HxvLz0SfFLl5HpukROv2GaiWhcMABbMzYE"
+      KDB_PREFIX: "!kt "
+    command: bash /app/bot/bot -stage
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        reservations:
+          cpus: "0.5"
+          memory: 1024M
+
+  kdb_web_staging_1:
+    image: sh-edraft.de/kdb-web:1.1.10
+    depends_on:
+      - kdb_bot_staging_1
+    networks:
+      - kdb_test
+      - reverse_proxy
+    volumes:
+      - /opt/kdb/staging/web/config.json:/usr/share/nginx/html/assets/config.json
+    environment:
+      BOT_CONTAINER_NAME: "kdb_bot_staging_1"
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        limits:
+          cpus: "0.4"
+          memory: 400M
+        reservations:
+          cpus: "0.1"
+          memory: 20M
+
+  kdb_db_staging_1:
+    image: mysql:latest
+    command: mysqld --default-authentication-plugin=mysql_native_password --log_bin_trust_function_creators=1
+    networks:
+      - kdb_test
+    environment:
+      MYSQL_ROOT_PASSWORD: "kd_kdb"
+      MYSQL_USER: "kd_kdb"
+      MYSQL_PASSWORD: "~qELxjvtjJ3r7yg4PZr5!,V}d.{TC4rg"
+      MYSQL_DATABASE: "kd_kdb"
+    ports:
+      - "3308:3306"
+    volumes:
+      - kdb_db_staging_1:/var/lib/mysql
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        reservations:
+          cpus: "0.1"
+          memory: 150M
+
+networks:
+  reverse_proxy:
+    external: true
+  kdb_test:
+    driver: overlay
+    attachable: true

docker-compose.yml

@@ -0,0 +1,87 @@
+version: "3.9"
+
+volumes:
+  kdb_db_prod_1:
+
+services:
+  kdb_bot_prod_1:
+    image: sh-edraft.de/kdb-bot:1.1.10
+    restart: unless-stopped
+    depends_on:
+      - kdb_db_prod_1
+    networks:
+      - kdb_prod
+      - reverse_proxy
+    volumes:
+      - /opt/kdb/production/bot/config:/app/bot/config
+      - /opt/kdb/production/bot/api_config:/app/bot_api/config
+      - /opt/kdb/production/bot/logs:/app/bot/logs
+    environment:
+      KDB_ENVIRONMENT: "production"
+      KDB_TOKEN: "OTk4MTU5NTEyNDYyNzA4Nzg2.Gx0hSB.Ouq2dfRKxLBJvHfEq8OrFBHVUF24AQrVf55coM"
+      KDB_PREFIX: "!k "
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        reservations:
+          cpus: "0.5"
+          memory: 1024M
+
+  kdb_web_prod_1:
+    image: sh-edraft.de/kdb-web:1.1.10
+    depends_on:
+      - kdb_bot_prod_1
+    networks:
+      - kdb_prod
+      - reverse_proxy
+    volumes:
+      - /opt/kdb/production/web/config.json:/usr/share/nginx/html/assets/config.json
+    environment:
+      BOT_CONTAINER_NAME: "kdb_bot_prod_1"
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        limits:
+          cpus: "0.4"
+          memory: 400M
+        reservations:
+          cpus: "0.1"
+          memory: 20M
+
+  kdb_db_prod_1:
+    image: mysql:latest
+    command: mysqld --default-authentication-plugin=mysql_native_password --log_bin_trust_function_creators=1
+    networks:
+      - kdb_prod
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: "kd_kdb"
+      MYSQL_USER: "kd_kdb"
+      MYSQL_PASSWORD: ",2#MzfN4J=7r(q,Tz3npDkCR§>VE&}7T"
+      MYSQL_DATABASE: "kd_kdb"
+    ports:
+      - "3307:3306"
+    volumes:
+      - kdb_db_prod_1:/var/lib/mysql
+    deploy:
+      mode: replicated
+      replicas: 1
+      placement:
+        constraints: [node.role == manager]
+      resources:
+        reservations:
+          cpus: "0.1"
+          memory: 150M
+
+networks:
+  reverse_proxy:
+    external: true
+  kdb_prod:
+    driver: overlay
+    attachable: true

kdb-bot/cpl-workspace.json

@@ -16,6 +16,7 @@
       "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",
       "checks": "tools/checks/checks.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
@@ -35,7 +36,7 @@
       "stage": "export KDB_ENVIRONMENT=staging; export KDB_NAME=KDB-Stage; cpl start;",
       "pre-dev": "cpl build",
       "dev": "export KDB_ENVIRONMENT=development; export KDB_NAME=KDB-Dev; cpl start;",
-      "docker-build": "cpl build $ARGS; docker build -t kdb-bot/kdb-bot:$(cpl gv) .;",
+      "docker-build": "cpl build $ARGS; docker build -t sh-edraft.de/kdb-bot:$(cpl gv) .;",
       "dc-up": "docker-compose up -d",
       "dc-down": "docker-compose down",
       "docker": "cpl dc-down; cpl docker-build; cpl dc-up;"

kdb-bot/src/bot/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

kdb-bot/src/bot/bot.json

@@ -4,12 +4,12 @@
     "Version": {
       "Major": "1",
       "Minor": "1",
-      "Micro": "4"
+      "Micro": "10"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
-    "Description": "Keksdose bot",
+    "Description": "sh-edraft.de Discord bot",
-    "LongDescription": "Discord bot  for the Keksdose discord Server",
+    "LongDescription": "Discord bot for customers of sh-edraft.de",
     "URL": "https://www.sh-edraft.de",
     "CopyrightDate": "2022 - 2023",
     "CopyrightName": "sh-edraft.de",
@@ -68,6 +68,7 @@
       "../modules/database/database.json",
       "../modules/level/level.json",
       "../modules/permission/permission.json",
+      "../modules/short_role_name/short-role-name.json",
       "../modules/technician/technician.json"
     ]
   }

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

kdb-bot/src/bot/module_list.py

@@ -13,6 +13,7 @@ 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.technician.technician_module import TechnicianModule
 
 
@@ -35,6 +36,7 @@ class ModuleList:
                 ApiModule,
                 TechnicianModule,
                 AchievementsModule,
+                ShortRoleNameModule,
                 # has to be last!
                 BootLogModule,
                 CoreExtensionModule,

kdb-bot/src/bot/startup_migration_extension.py

@@ -13,9 +13,12 @@ from bot_data.migration.config_feature_flags_migration import ConfigFeatureFlags
 from bot_data.migration.config_migration import ConfigMigration
 from bot_data.migration.db_history_migration import DBHistoryMigration
 from bot_data.migration.default_role_migration import DefaultRoleMigration
+from bot_data.migration.fix_updates_migration import FixUpdatesMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
 from bot_data.migration.remove_stats_migration import RemoveStatsMigration
+from bot_data.migration.short_role_name_migration import ShortRoleNameMigration
+from bot_data.migration.short_role_name_only_highest_migration import ShortRoleNameOnlyHighestMigration
 from bot_data.migration.stats_migration import StatsMigration
 from bot_data.migration.user_joined_game_server_migration import UserJoinedGameServerMigration
 from bot_data.migration.user_message_count_per_hour_migration import (
@@ -50,3 +53,6 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, ConfigMigration)  # 19.07.2023 #127 - 1.1.0
         services.add_transient(MigrationABC, ConfigFeatureFlagsMigration)  # 15.08.2023 #334 - 1.1.0
         services.add_transient(MigrationABC, DefaultRoleMigration)  # 24.09.2023 #360 - 1.1.3
+        services.add_transient(MigrationABC, ShortRoleNameMigration)  # 28.09.2023 #378 - 1.1.7
+        services.add_transient(MigrationABC, FixUpdatesMigration)  # 28.09.2023 #378 - 1.1.7
+        services.add_transient(MigrationABC, ShortRoleNameOnlyHighestMigration)  # 02.10.2023 #391 - 1.1.9

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

@@ -82,6 +82,7 @@
       "unexpected_quote_error": "Fehler: Unerwarteter Fehler beim Anführungszeichen!",
       "user_input_error": "Fehler: Eingabefehler!"
     },
+    "feature_not_activated": "Diese Funktion ist deaktiviert",
     "hello_world": "Hallo Welt",
     "no_permission_message": "Nein!\nIch höre nicht auf dich ¯\\_(ツ)_/¯",
     "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
@@ -94,10 +95,10 @@
   },
   "modules": {
     "achievements": {
-      "got_new_achievement": "{} hat die Errungenschaft {} freigeschaltet :D",
       "commands": {
         "check": "Alles klar, ich schaue eben nach... nom nom"
-      }
+      },
+      "got_new_achievement": "{} hat die Errungenschaft {} freigeschaltet :D"
     },
     "auto_role": {
       "add": {
@@ -122,6 +123,9 @@
         },
         "success": "auto-role {} wurde entfernt :D"
       },
+      "react": {
+        "success": "Alle Reaktionen wurden hinzugefügt"
+      },
       "rule": {
         "add": {
           "error": {
@@ -151,33 +155,37 @@
       }
     },
     "base": {
-      "member_left_message": "{} hat uns leider verlassen :(",
-      "complaints": {
-        "title": "Beschwerde einreichen",
-        "label": "Beschwerde",
-        "message": "{} hat eine Beschwerde eingereicht:\n{}",
-        "response": "Danke für deine Beschwerde"
-      },
-      "bug": {
-        "title": "Bug melden",
-        "label": "Bug",
-        "message": "{} meldet einen Bug:\n{}",
-        "response": "Danke für dein Feedback :D"
-      },
       "afk_command_channel_missing_message": "Zu unfähig einem Sprachkanal beizutreten?",
       "afk_command_move_message": "Ich verschiebe dich ja schon... (◔_◔)",
+      "bug": {
+        "label": "Bug",
+        "message": "{} meldet einen Bug:\n{}",
+        "response": "Danke für dein Feedback :D",
+        "title": "Bug melden"
+      },
+      "complaints": {
+        "label": "Beschwerde",
+        "message": "{} hat eine Beschwerde eingereicht:\n{}",
+        "response": "Danke für deine Beschwerde",
+        "title": "Beschwerde einreichen"
+      },
       "game_server": {
+        "add": {
+          "success": "Gameserver {} wurde hinzugefügt :)"
+        },
         "error": {
           "nothing_found": "Keine Gameserver gefunden."
         },
         "list": {
-          "title": "Gameserver",
+          "api_key": "API Key",
           "description": "Konfigurierte Gameserver:",
           "name": "Name",
-          "api_key": "API Key"
+          "title": "Gameserver"
         },
-        "add": {
+        "list_members": {
-          "success": "Gameserver {} wurde hinzugefügt :)"
+          "description": "Konfigurierte Mitglieder:",
+          "title": "Mitglieder",
+          "users": "Mitglieder"
         },
         "remove": {
           "success": "Gameserver wurde entfernt :D"
@@ -204,6 +212,7 @@
         "moved": "Alle Personen aus {} wurden nach {} verschoben."
       },
       "member_joined_help_voice_channel": "{} braucht Hilfe, bitte kümmere dich drum :D",
+      "member_left_message": "{} hat uns leider verlassen :(",
       "pong": "Pong",
       "presence": {
         "changed": "Presence wurde geändert.",
@@ -340,6 +349,9 @@
     "moderator": {
       "purge_message": "Na gut..., ich lösche alle Nachrichten wenns sein muss."
     },
+    "short_role_name": {
+      "checked_message": "Die Rollen Kürzel wurden überprüft"
+    },
     "technician": {
       "api_key": {
         "add": {
@@ -353,7 +365,8 @@
       },
       "log_message": "Hier sind deine Logdateien! :)",
       "restart_message": "Bin gleich wieder da :D",
-      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, euer Freund. Lebt lange und in Frieden :)"
+      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, euer Freund. Lebt lange und in Frieden :)",
+      "synced_message": "Der Sync wurde abgeschlossen."
     }
   }
 }

kdb-bot/src/bot_api/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

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

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

kdb-bot/src/bot_core/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

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

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -16,7 +16,12 @@ class FeatureFlagsEnum(Enum):
     level_module = "LevelModule"
     moderator_module = "ModeratorModule"
     permission_module = "PermissionModule"
+    short_role_name_module = "ShortRoleNameModule"
     # features
     api_only = "ApiOnly"
     presence = "Presence"
     version_in_presence = "VersionInPresence"
+    game_server = "GameServer"
+    sync_xp = "SyncXp"
+    short_role_name = "ShortRoleName"
+    technician_full_access = "TechnicianFullAccess"

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

@@ -18,10 +18,15 @@ class FeatureFlagsSettings(ConfigurationModelABC):
         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
         # features
         FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
         FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
         FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
+        FeatureFlagsEnum.game_server.value: False,  # 25.09.2023 #366
+        FeatureFlagsEnum.sync_xp.value: False,  # 25.09.2023 #366
+        FeatureFlagsEnum.short_role_name.value: False,  # 28.09.2023 #378
+        FeatureFlagsEnum.technician_full_access.value: False,  # 03.10.2023 #393
     }
 
     def __init__(self, **kwargs: dict):

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -228,7 +228,7 @@ class ClientUtilsService(ClientUtilsABC):
                 return
 
             default_role = member.guild.get_role(settings.default_role_id)
-            if default_role in member.roles:
+            if default_role is None or default_role in member.roles:
                 return
 
             await member.add_roles(default_role)

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

@@ -7,8 +7,6 @@ from bot_data.abc.technician_config_repository_abc import TechnicianConfigReposi
 from bot_data.model.server import Server
 from bot_data.model.technician_config import TechnicianConfig
 from bot_data.service.server_config_seeder import ServerConfigSeeder
-from bot_data.service.technician_config_seeder import TechnicianConfigSeeder
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class ConfigService:
@@ -18,7 +16,6 @@ class ConfigService:
         services: ServiceProviderABC,
         technician_config_repo: TechnicianConfigRepositoryABC,
         server_config_repo: ServerConfigRepositoryABC,
-        tech_seeder: TechnicianConfigSeeder,
         server_seeder: ServerConfigSeeder,
     ):
         self._config = config
@@ -26,13 +23,9 @@ class ConfigService:
         self._technician_config_repo = technician_config_repo
         self._server_config_repo = server_config_repo
 
-        self._tech_seeder = tech_seeder
         self._server_seeder = server_seeder
 
-    async def reload_technician_config(self):
+    def reload_technician_config(self):
-        if not self._technician_config_repo.does_technician_config_exists():
-            await self._tech_seeder.seed()
-
         technician_config = self._technician_config_repo.get_technician_config()
         self._config.add_configuration(TechnicianConfig, technician_config)
         self._config.add_configuration(FeatureFlagsSettings, FeatureFlagsSettings(**technician_config.feature_flags))
@@ -45,6 +38,3 @@ class ConfigService:
         self._config.add_configuration(
             f"{type(server_config).__name__}_{server_config.server.discord_id}", server_config
         )
-
-        permissions: PermissionServiceABC = self._services.get_service(PermissionServiceABC)
-        permissions.on_ready()

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

@@ -24,7 +24,6 @@ from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_joined_server import UserJoinedServer
 from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
-from bot_data.service.seeder_service import SeederService
 from bot_data.service.user_repository_service import ServerRepositoryABC
 from modules.achievements.achievement_service import AchievementService
 
@@ -34,7 +33,6 @@ class DataIntegrityService:
         self,
         config: ConfigurationABC,
         logger: DatabaseLogger,
-        seeder: SeederService,
         bot: DiscordBotServiceABC,
         db_context: DatabaseContextABC,
         server_repo: ServerRepositoryABC,
@@ -51,7 +49,6 @@ class DataIntegrityService:
         self._config = config
 
         self._logger = logger
-        self._seeder = seeder
         self._bot = bot
         self._db_context = db_context
         self._servers = server_repo

kdb-bot/src/bot_data/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_data"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -23,7 +23,7 @@ class GameServerRepositoryABC(ABC):
         pass
 
     @abstractmethod
-    def get_game_server_by_api_key_id(self, id: int) -> GameServer:
+    def get_game_servers_by_api_key_id(self, id: int) -> List[GameServer]:
         pass
 
     @abstractmethod

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

@@ -1,13 +1,20 @@
+import os
 from abc import ABC, abstractmethod
 
+from cpl_core.dependency_injection import ServiceProviderABC
+from mysql.connector.cursor import MySQLCursorBuffered
+
+from bot_data.db_context import DBContext
+
 
 class MigrationABC(ABC):
     name = None
     prio = 0
 
     @abstractmethod
-    def __init__(self):
+    @ServiceProviderABC.inject
-        pass
+    def __init__(self, db: DBContext):
+        self._cursor: MySQLCursorBuffered = db.cursor
 
     @abstractmethod
     def upgrade(self):
@@ -16,3 +23,10 @@ class MigrationABC(ABC):
     @abstractmethod
     def downgrade(self):
         pass
+
+    def _exec(self, self_file: str, file: str):
+        path = f"{os.path.dirname(os.path.realpath(self_file))}/db_history_scripts"
+        sql = open(f"{path}/{file}").read()
+
+        for statement in sql.split("\n\n"):
+            self._cursor.execute(statement + ";")

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

@@ -0,0 +1,39 @@
+from abc import ABC, abstractmethod
+
+from cpl_query.extension import List
+
+from bot_data.model.short_role_name import ShortRoleName
+
+
+class ShortRoleNameRepositoryABC(ABC):
+    @abstractmethod
+    def __init__(self):
+        pass
+
+    @abstractmethod
+    def get_short_role_names(self) -> List[ShortRoleName]:
+        pass
+
+    @abstractmethod
+    def get_short_role_name_by_id(self, id: int) -> ShortRoleName:
+        pass
+
+    @abstractmethod
+    def find_short_role_names_by_role_id(self, role_id: int) -> List[ShortRoleName]:
+        pass
+
+    @abstractmethod
+    def get_short_role_names_by_server_id(self, id: int) -> List[ShortRoleName]:
+        pass
+
+    @abstractmethod
+    def add_short_role_name(self, short_role_name: ShortRoleName):
+        pass
+
+    @abstractmethod
+    def update_short_role_name(self, short_role_name: ShortRoleName):
+        pass
+
+    @abstractmethod
+    def delete_short_role_name(self, short_role_name: ShortRoleName):
+        pass

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

@@ -14,6 +14,10 @@ class UserGameIdentRepositoryABC(ABC):
     def get_user_game_idents(self) -> List[UserGameIdent]:
         pass
 
+    @abstractmethod
+    def get_user_game_idents_by_game_server_id(self, id: int) -> List[UserGameIdent]:
+        pass
+
     @abstractmethod
     def get_user_game_ident_by_id(self, id: int) -> UserGameIdent:
         pass

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

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

kdb-bot/src/bot_data/data_module.py

@@ -16,6 +16,7 @@ from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC
 from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
 from bot_data.abc.user_game_ident_repository_abc import UserGameIdentRepositoryABC
 from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC
@@ -41,6 +42,7 @@ from bot_data.service.seeder_service import SeederService
 from bot_data.service.server_config_repository_service import ServerConfigRepositoryService
 from bot_data.service.server_config_seeder import ServerConfigSeeder
 from bot_data.service.server_repository_service import ServerRepositoryService
+from bot_data.service.short_role_name_repository_service import ShortRoleNameRepositoryService
 from bot_data.service.technician_config_repository_service import TechnicianConfigRepositoryService
 from bot_data.service.technician_config_seeder import TechnicianConfigSeeder
 from bot_data.service.user_game_ident_repository_service import UserGameIdentRepositoryService
@@ -89,6 +91,7 @@ class DataModule(ModuleABC):
         services.add_transient(AchievementRepositoryABC, AchievementRepositoryService)
         services.add_transient(TechnicianConfigRepositoryABC, TechnicianConfigRepositoryService)
         services.add_transient(ServerConfigRepositoryABC, ServerConfigRepositoryService)
+        services.add_transient(ShortRoleNameRepositoryABC, ShortRoleNameRepositoryService)
 
         services.add_transient(SeederService)
         services.add_transient(DataSeederABC, TechnicianConfigSeeder)

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,5 +1,3 @@
-import os
-
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_data.abc.migration_abc import MigrationABC
 from bot_data.db_context import DBContext
@@ -12,26 +10,18 @@ class ConfigMigration(MigrationABC):
         MigrationABC.__init__(self)
         self._logger = logger
         self._db = db
-        self._cursor = db.cursor
-
-    def _exec(self, file: str):
-        path = f"{os.path.dirname(os.path.realpath(__file__))}/db_history_scripts"
-        sql = open(f"{path}/{file}").read()
-
-        for statement in sql.split("\n\n"):
-            self._cursor.execute(statement + ";")
 
     def upgrade(self):
         self._logger.debug(__name__, "Running upgrade")
         self._server_upgrade()
         self._technician_upgrade()
 
-        self._exec("config/server.sql")
+        self._exec(__file__, "config/server.sql")
-        self._exec("config/server_afk_channels.sql")
+        self._exec(__file__, "config/server_afk_channels.sql")
-        self._exec("config/server_team_roles.sql")
+        self._exec(__file__, "config/server_team_roles.sql")
-        self._exec("config/technician.sql")
+        self._exec(__file__, "config/technician.sql")
-        self._exec("config/technician_ids.sql")
+        self._exec(__file__, "config/technician_ids.sql")
-        self._exec("config/technician_ping_urls.sql")
+        self._exec(__file__, "config/technician_ping_urls.sql")
 
     def _server_upgrade(self):
         self._cursor.execute(

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

@@ -1,5 +1,3 @@
-import os
-
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_data.abc.migration_abc import MigrationABC
 from bot_data.db_context import DBContext
@@ -15,33 +13,26 @@ class DBHistoryMigration(MigrationABC):
         self._db = db
         self._cursor = db.cursor
 
-    def _exec(self, file: str):
-        path = f"{os.path.dirname(os.path.realpath(__file__))}/db_history_scripts"
-        sql = open(f"{path}/{file}").read()
-
-        for statement in sql.split("\n\n"):
-            self._cursor.execute(statement + ";")
-
     def upgrade(self):
         self._logger.debug(__name__, "Running upgrade")
 
-        self._exec("api_keys.sql")
+        self._exec(__file__, "api_keys.sql")
-        self._exec("auth_users.sql")
+        self._exec(__file__, "auth_users.sql")
-        self._exec("auth_user_users_relation.sql")
+        self._exec(__file__, "auth_user_users_relation.sql")
-        self._exec("auto_role_rules.sql")
+        self._exec(__file__, "auto_role_rules.sql")
-        self._exec("auto_roles.sql")
+        self._exec(__file__, "auto_roles.sql")
-        self._exec("clients.sql")
+        self._exec(__file__, "clients.sql")
-        self._exec("game_servers.sql")
+        self._exec(__file__, "game_servers.sql")
-        self._exec("known_users.sql")
+        self._exec(__file__, "known_users.sql")
-        self._exec("levels.sql")
+        self._exec(__file__, "levels.sql")
-        self._exec("servers.sql")
+        self._exec(__file__, "servers.sql")
-        self._exec("user_game_idents.sql")
+        self._exec(__file__, "user_game_idents.sql")
-        self._exec("user_joined_game_servers.sql")
+        self._exec(__file__, "user_joined_game_servers.sql")
-        self._exec("user_joined_servers.sql")
+        self._exec(__file__, "user_joined_servers.sql")
-        self._exec("user_joined_voice_channel.sql")
+        self._exec(__file__, "user_joined_voice_channel.sql")
-        self._exec("user_message_count_per_hour.sql")
+        self._exec(__file__, "user_message_count_per_hour.sql")
-        self._exec("users.sql")
+        self._exec(__file__, "users.sql")
-        self._exec("user_warnings.sql")
+        self._exec(__file__, "user_warnings.sql")
 
         self._logger.debug(__name__, "Finished history upgrade")
 

kdb-bot/src/bot_data/migration/db_history_scripts/config/server.sql

@@ -1,23 +1,26 @@
 CREATE TABLE IF NOT EXISTS `CFG_ServerHistory`
 (
-    `Id`    BIGINT(20)  NOT NULL,
+    `Id`                          BIGINT(20)  NOT NULL,
-    `MessageDeleteTimer` BIGINT NOT NULL DEFAULT 6,
+    `MessageDeleteTimer`          BIGINT      NOT NULL DEFAULT 6,
-    `NotificationChatId` BIGINT NOT NULL,
+    `NotificationChatId`          BIGINT      NOT NULL,
-    `MaxVoiceStateHours` BIGINT NOT NULL DEFAULT 6,
+    `MaxVoiceStateHours`          BIGINT      NOT NULL DEFAULT 6,
-    `XpPerMessage` BIGINT NOT NULL DEFAULT 1,
+    `XpPerMessage`                BIGINT      NOT NULL DEFAULT 1,
-    `XpPerReaction` BIGINT NOT NULL DEFAULT 1,
+    `XpPerReaction`               BIGINT      NOT NULL DEFAULT 1,
-    `MaxMessageXpPerHour` BIGINT NOT NULL DEFAULT 20,
+    `MaxMessageXpPerHour`         BIGINT      NOT NULL DEFAULT 20,
-    `XpPerOntimeHour` BIGINT NOT NULL DEFAULT 10,
+    `XpPerOntimeHour`             BIGINT      NOT NULL DEFAULT 10,
-    `XpPerEventParticipation` BIGINT NOT NULL DEFAULT 10,
+    `XpPerEventParticipation`     BIGINT      NOT NULL DEFAULT 10,
-    `XpPerAchievement` BIGINT NOT NULL DEFAULT 10,
+    `XpPerAchievement`            BIGINT      NOT NULL DEFAULT 10,
-    `AFKCommandChannelId` BIGINT NOT NULL,
+    `AFKCommandChannelId`         BIGINT      NOT NULL,
-    `HelpVoiceChannelId` BIGINT NOT NULL,
+    `HelpVoiceChannelId`          BIGINT      NOT NULL,
-    `TeamChannelId` BIGINT NOT NULL,
+    `TeamChannelId`               BIGINT      NOT NULL,
-    `LoginMessageChannelId` BIGINT NOT NULL,
+    `LoginMessageChannelId`       BIGINT      NOT NULL,
-    `ServerId` BIGINT NOT NULL,
+    `DefaultRoleId`               BIGINT      NULL,
-    `Deleted` BOOL DEFAULT FALSE,
+    `ShortRoleNameSetOnlyHighest` BOOLEAN     NOT NULL DEFAULT FALSE,
-    `DateFrom` DATETIME(6) NOT NULL,
+    `FeatureFlags`                JSON        NULL     DEFAULT ('{}'),
-    `DateTo` DATETIME(6) NOT NULL
+    `ServerId`                    BIGINT      NOT NULL,
+    `Deleted`                     BOOL                 DEFAULT FALSE,
+    `DateFrom`                    DATETIME(6) NOT NULL,
+    `DateTo`                      DATETIME(6) NOT NULL
 );
 
 DROP TRIGGER IF EXISTS `TR_CFG_ServerUpdate`;
@@ -27,44 +30,46 @@ CREATE TRIGGER `TR_CFG_ServerUpdate`
     ON `CFG_Server`
     FOR EACH ROW
 BEGIN
-    INSERT INTO `CFG_ServerHistory` (
+    INSERT INTO `CFG_ServerHistory` (`Id`,
-        `Id`,
+                                     `MessageDeleteTimer`,
-        `MessageDeleteTimer`,
+                                     `NotificationChatId`,
-        `NotificationChatId`,
+                                     `MaxVoiceStateHours`,
-        `MaxVoiceStateHours`,
+                                     `XpPerMessage`,
-        `XpPerMessage`,
+                                     `XpPerReaction`,
-        `XpPerReaction`,
+                                     `MaxMessageXpPerHour`,
-        `MaxMessageXpPerHour`,
+                                     `XpPerOntimeHour`,
-        `XpPerOntimeHour`,
+                                     `XpPerEventParticipation`,
-        `XpPerEventParticipation`,
+                                     `XpPerAchievement`,
-        `XpPerAchievement`,
+                                     `AFKCommandChannelId`,
-        `AFKCommandChannelId`,
+                                     `HelpVoiceChannelId`,
-        `HelpVoiceChannelId`,
+                                     `TeamChannelId`,
-        `TeamChannelId`,
+                                     `LoginMessageChannelId`,
-        `LoginMessageChannelId`,
+                                     `DefaultRoleId`,
-        `ServerId`,
+                                     `ShortRoleNameSetOnlyHighest`,
-        `DateFrom`,
+                                     `FeatureFlags`,
-        `DateTo`
+                                     `ServerId`,
-    )
+                                     `DateFrom`,
-    VALUES (
+                                     `DateTo`)
-        OLD.Id,
+    VALUES (OLD.Id,
-        OLD.MessageDeleteTimer,
+            OLD.MessageDeleteTimer,
-        OLD.NotificationChatId,
+            OLD.NotificationChatId,
-        OLD.MaxVoiceStateHours,
+            OLD.MaxVoiceStateHours,
-        OLD.XpPerMessage,
+            OLD.XpPerMessage,
-        OLD.XpPerReaction,
+            OLD.XpPerReaction,
-        OLD.MaxMessageXpPerHour,
+            OLD.MaxMessageXpPerHour,
-        OLD.XpPerOntimeHour,
+            OLD.XpPerOntimeHour,
-        OLD.XpPerEventParticipation,
+            OLD.XpPerEventParticipation,
-        OLD.XpPerAchievement,
+            OLD.XpPerAchievement,
-        OLD.AFKCommandChannelId,
+            OLD.AFKCommandChannelId,
-        OLD.HelpVoiceChannelId,
+            OLD.HelpVoiceChannelId,
-        OLD.TeamChannelId,
+            OLD.TeamChannelId,
-        OLD.LoginMessageChannelId,
+            OLD.LoginMessageChannelId,
-        OLD.ServerId,
+            OLD.DefaultRoleId,
-        OLD.LastModifiedAt,
+            OLD.ShortRoleNameSetOnlyHighest,
-        CURRENT_TIMESTAMP(6)
+            OLD.FeatureFlags,
-    );
+            OLD.ServerId,
+            OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
 END;
 
 DROP TRIGGER IF EXISTS `TR_CFG_ServerDelete`;
@@ -74,44 +79,46 @@ CREATE TRIGGER `TR_CFG_ServerDelete`
     ON `CFG_Server`
     FOR EACH ROW
 BEGIN
-    INSERT INTO `CFG_ServerHistory` (
+    INSERT INTO `CFG_ServerHistory` (`Id`,
-        `Id`,
+                                     `MessageDeleteTimer`,
-        `MessageDeleteTimer`,
+                                     `NotificationChatId`,
-        `NotificationChatId`,
+                                     `MaxVoiceStateHours`,
-        `MaxVoiceStateHours`,
+                                     `XpPerMessage`,
-        `XpPerMessage`,
+                                     `XpPerReaction`,
-        `XpPerReaction`,
+                                     `MaxMessageXpPerHour`,
-        `MaxMessageXpPerHour`,
+                                     `XpPerOntimeHour`,
-        `XpPerOntimeHour`,
+                                     `XpPerEventParticipation`,
-        `XpPerEventParticipation`,
+                                     `XpPerAchievement`,
-        `XpPerAchievement`,
+                                     `AFKCommandChannelId`,
-        `AFKCommandChannelId`,
+                                     `HelpVoiceChannelId`,
-        `HelpVoiceChannelId`,
+                                     `TeamChannelId`,
-        `TeamChannelId`,
+                                     `LoginMessageChannelId`,
-        `LoginMessageChannelId`,
+                                     `DefaultRoleId`,
-        `ServerId`,
+                                     `ShortRoleNameSetOnlyHighest`,
-        `Deleted`,
+                                     `ServerId`,
-        `DateFrom`,
+                                     `FeatureFlags`,
-        `DateTo`
+                                     `Deleted`,
-    )
+                                     `DateFrom`,
-    VALUES (
+                                     `DateTo`)
-        OLD.Id,
+    VALUES (OLD.Id,
-        OLD.MessageDeleteTimer,
+            OLD.MessageDeleteTimer,
-        OLD.NotificationChatId,
+            OLD.NotificationChatId,
-        OLD.MaxVoiceStateHours,
+            OLD.MaxVoiceStateHours,
-        OLD.XpPerMessage,
+            OLD.XpPerMessage,
-        OLD.XpPerReaction,
+            OLD.XpPerReaction,
-        OLD.MaxMessageXpPerHour,
+            OLD.MaxMessageXpPerHour,
-        OLD.XpPerOntimeHour,
+            OLD.XpPerOntimeHour,
-        OLD.XpPerEventParticipation,
+            OLD.XpPerEventParticipation,
-        OLD.XpPerAchievement,
+            OLD.XpPerAchievement,
-        OLD.AFKCommandChannelId,
+            OLD.AFKCommandChannelId,
-        OLD.HelpVoiceChannelId,
+            OLD.HelpVoiceChannelId,
-        OLD.TeamChannelId,
+            OLD.TeamChannelId,
-        OLD.LoginMessageChannelId,
+            OLD.LoginMessageChannelId,
-        OLD.ServerId,
+            OLD.DefaultRoleId,
-        TRUE,
+            OLD.ShortRoleNameSetOnlyHighest,
-        OLD.LastModifiedAt,
+            OLD.FeatureFlags,
-        CURRENT_TIMESTAMP(6)
+            OLD.ServerId,
-    );
+            TRUE,
+            OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
 END;

kdb-bot/src/bot_data/migration/db_history_scripts/config/technician.sql

@@ -1,13 +1,14 @@
 CREATE TABLE IF NOT EXISTS `CFG_TechnicianHistory`
 (
-    `Id`    BIGINT(20)  NOT NULL,
+    `Id`                      BIGINT(20)   NOT NULL,
     `HelpCommandReferenceUrl` VARCHAR(255) NOT NULL,
-    `WaitForRestart` BIGINT NOT NULL DEFAULT 8,
+    `WaitForRestart`          BIGINT       NOT NULL DEFAULT 8,
-    `WaitForShutdown` BIGINT NOT NULL DEFAULT 8,
+    `WaitForShutdown`         BIGINT       NOT NULL DEFAULT 8,
-    `CacheMaxMessages` BIGINT NOT NULL DEFAULT 1000000,
+    `CacheMaxMessages`        BIGINT       NOT NULL DEFAULT 1000000,
-    `Deleted` BOOL DEFAULT FALSE,
+    `FeatureFlags`            JSON         NULL     DEFAULT ('{}'),
-    `DateFrom` DATETIME(6) NOT NULL,
+    `Deleted`                 BOOL                  DEFAULT FALSE,
-    `DateTo` DATETIME(6) NOT NULL
+    `DateFrom`                DATETIME(6)  NOT NULL,
+    `DateTo`                  DATETIME(6)  NOT NULL
 );
 
 DROP TRIGGER IF EXISTS `TR_CFG_TechnicianUpdate`;
@@ -17,24 +18,22 @@ CREATE TRIGGER `TR_CFG_TechnicianUpdate`
     ON `CFG_Technician`
     FOR EACH ROW
 BEGIN
-    INSERT INTO `CFG_TechnicianHistory` (
+    INSERT INTO `CFG_TechnicianHistory` (`Id`,
-        `Id`,
+                                         `HelpCommandReferenceUrl`,
-        `HelpCommandReferenceUrl`,
+                                         `WaitForRestart`,
-        `WaitForRestart`,
+                                         `WaitForShutdown`,
-        `WaitForShutdown`,
+                                         `CacheMaxMessages`,
-        `CacheMaxMessages`,
+                                         `FeatureFlags`,
-        `DateFrom`,
+                                         `DateFrom`,
-        `DateTo`
+                                         `DateTo`)
-    )
+    VALUES (OLD.Id,
-    VALUES (
+            OLD.HelpCommandReferenceUrl,
-        OLD.Id,
+            OLD.WaitForRestart,
-        OLD.HelpCommandReferenceUrl,
+            OLD.WaitForShutdown,
-        OLD.WaitForRestart,
+            OLD.CacheMaxMessages,
-        OLD.WaitForShutdown,
+            OLD.FeatureFlags,
-        OLD.CacheMaxMessages,
+            OLD.LastModifiedAt,
-        OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
-        CURRENT_TIMESTAMP(6)
-    );
 END;
 
 DROP TRIGGER IF EXISTS `TR_CFG_TechnicianDelete`;
@@ -44,24 +43,22 @@ CREATE TRIGGER `TR_CFG_TechnicianDelete`
     ON `CFG_Technician`
     FOR EACH ROW
 BEGIN
-    INSERT INTO `CFG_TechnicianHistory` (
+    INSERT INTO `CFG_TechnicianHistory` (`Id`,
-        `Id`,
+                                         `HelpCommandReferenceUrl`,
-        `HelpCommandReferenceUrl`,
+                                         `WaitForRestart`,
-        `WaitForRestart`,
+                                         `WaitForShutdown`,
-        `WaitForShutdown`,
+                                         `CacheMaxMessages`,
-        `CacheMaxMessages`,
+                                         `FeatureFlags`,
-        `Deleted`,
+                                         `Deleted`,
-        `DateFrom`,
+                                         `DateFrom`,
-        `DateTo`
+                                         `DateTo`)
-    )
+    VALUES (OLD.Id,
-    VALUES (
+            OLD.HelpCommandReferenceUrl,
-        OLD.Id,
+            OLD.WaitForRestart,
-        OLD.HelpCommandReferenceUrl,
+            OLD.WaitForShutdown,
-        OLD.WaitForRestart,
+            OLD.CacheMaxMessages,
-        OLD.WaitForShutdown,
+            OLD.FeatureFlags,
-        OLD.CacheMaxMessages,
+            TRUE,
-        TRUE,
+            OLD.LastModifiedAt,
-        OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
-        CURRENT_TIMESTAMP(6)
-    );
 END;

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

@@ -0,0 +1,38 @@
+CREATE TABLE IF NOT EXISTS `ShortRoleNamesHistory`
+(
+    `Id`            BIGINT(20)               NOT NULL,
+    `ShortName`     VARCHAR(64) DEFAULT NULL,
+    `DiscordRoleId` BIGINT(20)               NOT NULL,
+    `Position`      ENUM ('Before', 'After') NOT NULL,
+    `ServerId`      BIGINT(20)  DEFAULT NULL,
+    `Deleted`       BOOL        DEFAULT FALSE,
+    `DateFrom`      DATETIME(6)              NOT NULL,
+    `DateTo`        DATETIME(6)              NOT NULL
+);
+
+DROP TRIGGER IF EXISTS `TR_ShortRoleNamesUpdate`;
+
+CREATE TRIGGER `TR_ShortRoleNamesUpdate`
+    AFTER UPDATE
+    ON `ShortRoleNames`
+    FOR EACH ROW
+BEGIN
+    INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `DateFrom`,
+                                         `DateTo`)
+    VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
+END;
+
+DROP TRIGGER IF EXISTS `TR_ShortRoleNamesDelete`;
+
+CREATE TRIGGER `TR_ShortRoleNamesDelete`
+    AFTER DELETE
+    ON `ShortRoleNames`
+    FOR EACH ROW
+BEGIN
+    INSERT INTO `ShortRoleNamesHistory` (`Id`, `ShortName`, `DiscordRoleId`, `Position`, `ServerId`, `Deleted`,
+                                         `DateFrom`,
+                                         `DateTo`)
+    VALUES (OLD.Id, OLD.ShortName, OLD.DiscordRoleId, OLD.Position, OLD.ServerId, TRUE, OLD.LastModifiedAt,
+            CURRENT_TIMESTAMP(6));
+END;

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

@@ -0,0 +1,51 @@
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.migration_abc import MigrationABC
+from bot_data.db_context import DBContext
+
+
+class FixUpdatesMigration(MigrationABC):
+    name = "1.1.7_FixUpdatesMigration"
+
+    def __init__(self, logger: DatabaseLogger, db: DBContext):
+        MigrationABC.__init__(self)
+        self._logger = logger
+        self._db = db
+        self._cursor = db.cursor
+
+    def upgrade(self):
+        self._logger.debug(__name__, "Running upgrade")
+
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_ServerHistory
+                    ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId;
+                """
+            )
+        )
+
+        self._cursor.execute(
+            str(
+                """ALTER TABLE CFG_TechnicianHistory ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;"""
+            )
+        )
+
+        self._cursor.execute(
+            str(
+                """ALTER TABLE CFG_ServerHistory ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;"""
+            )
+        )
+
+        self._exec(__file__, "config/server.sql")
+        self._exec(__file__, "config/technician.sql")
+
+    def downgrade(self):
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_ServerHistory DROP COLUMN DefaultRoleId;
+                """
+            )
+        )
+        self._cursor.execute("ALTER TABLE CFG_TechnicianHistory DROP COLUMN FeatureFlags;")
+        self._cursor.execute("ALTER TABLE CFG_ServerHistory DROP COLUMN FeatureFlags;")

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

@@ -0,0 +1,40 @@
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.migration_abc import MigrationABC
+from bot_data.db_context import DBContext
+
+
+class ShortRoleNameMigration(MigrationABC):
+    name = "1.1.7_ShortRoleNameMigration"
+
+    def __init__(self, logger: DatabaseLogger, db: DBContext):
+        MigrationABC.__init__(self)
+        self._logger = logger
+        self._db = db
+        self._cursor = db.cursor
+
+    def upgrade(self):
+        self._logger.debug(__name__, "Running upgrade")
+
+        self._cursor.execute(
+            str(
+                f"""
+                    CREATE TABLE IF NOT EXISTS `ShortRoleNames` (
+                        `Id` BIGINT NOT NULL AUTO_INCREMENT,
+                        `ShortName` VARCHAR(255) NOT NULL,
+                        `DiscordRoleId` BIGINT NOT NULL,
+                        `Position` ENUM('before', 'after') NOT NULL,
+                        `ServerId` BIGINT,
+                        `CreatedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6),
+                        `LastModifiedAt` DATETIME(6) NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
+                        PRIMARY KEY(`Id`),
+                        FOREIGN KEY (`ServerId`) REFERENCES `Servers`(`ServerId`)
+                    );
+                """
+            )
+        )
+
+        self._exec(__file__, "short_rule_names.sql")
+
+    def downgrade(self):
+        self._cursor.execute("DROP TABLE `ShortRoleNames`;")
+        self._cursor.execute("DROP TABLE `ShortRoleNamesHistory`;")

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

@@ -0,0 +1,51 @@
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.migration_abc import MigrationABC
+from bot_data.db_context import DBContext
+
+
+class ShortRoleNameOnlyHighestMigration(MigrationABC):
+    name = "1.1.9_ShortRoleNameOnlyHighestMigration"
+
+    def __init__(self, logger: DatabaseLogger, db: DBContext):
+        MigrationABC.__init__(self)
+        self._logger = logger
+        self._db = db
+        self._cursor = db.cursor
+
+    def upgrade(self):
+        self._logger.debug(__name__, "Running upgrade")
+
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_Server
+                    ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId;
+                """
+            )
+        )
+
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_ServerHistory
+                    ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId;
+                """
+            )
+        )
+        self._exec(__file__, "config/server.sql")
+
+    def downgrade(self):
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_Server DROP COLUMN ShortRoleNameSetOnlyHighest;
+                """
+            )
+        )
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_ServerHistory DROP COLUMN ShortRoleNameSetOnlyHighest;
+                """
+            )
+        )

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,9 +1,11 @@
 import json
 from datetime import datetime
+from typing import Optional
 
 from cpl_core.configuration import ConfigurationModelABC
 from cpl_core.database import TableABC
 from cpl_query.extension import List
+from discord import Guild
 
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_data.model.server import Server
@@ -26,7 +28,8 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         help_voice_channel_id: int,
         team_channel_id: int,
         login_message_channel_id: int,
-        default_role_id: int,
+        default_role_id: Optional[int],
+        short_role_name_only_set_highest_role: bool,
         feature_flags: dict[FeatureFlagsEnum],
         server: Server,
         afk_channel_ids: List[int],
@@ -50,6 +53,8 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         self._team_channel_id = team_channel_id
         self._login_message_channel_id = login_message_channel_id
         self._default_role_id = default_role_id
+        self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
+
         self._feature_flags = feature_flags
         self._server = server
         self._afk_channel_ids = afk_channel_ids
@@ -59,6 +64,30 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         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
 
+    @staticmethod
+    def new(guild: Guild, server: Server) -> "ServerConfig":
+        return ServerConfig(
+            6,
+            guild.system_channel.id,
+            6,
+            1,
+            1,
+            20,
+            10,
+            10,
+            10,
+            guild.system_channel.id,
+            guild.system_channel.id,
+            guild.system_channel.id,
+            guild.system_channel.id,
+            None,
+            False,
+            {},
+            server,
+            List(int),
+            List(int),
+        )
+
     @property
     def id(self) -> int:
         return self._id
@@ -175,6 +204,14 @@ class ServerConfig(TableABC, ConfigurationModelABC):
     def default_role_id(self, value: int):
         self._default_role_id = value
 
+    @property
+    def short_role_name_only_set_highest_role(self) -> bool:
+        return self._short_role_name_only_set_highest_role
+
+    @short_role_name_only_set_highest_role.setter
+    def short_role_name_only_set_highest_role(self, value: bool):
+        self._short_role_name_only_set_highest_role = value
+
     @property
     def feature_flags(self) -> dict[FeatureFlagsEnum]:
         return self._feature_flags
@@ -248,6 +285,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
                     `DefaultRoleId`,
+                    `ShortRoleNameSetOnlyHighest`,
                     `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
@@ -264,7 +302,8 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {self._help_voice_channel_id},
                     {self._team_channel_id},
                     {self._login_message_channel_id},
-                    {self._default_role_id},
+                    {"NULL" if self._default_role_id is None else self._default_role_id},
+                    {self._short_role_name_only_set_highest_role},
                     '{json.dumps(self._feature_flags)}',
                     {self._server.id}
                 );
@@ -289,7 +328,8 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `HelpVoiceChannelId` = {self._help_voice_channel_id},
                 `TeamChannelId` = {self._team_channel_id},
                 `LoginMessageChannelId` = {self._login_message_channel_id},
-                `DefaultRoleId` = {self._default_role_id},
+                `DefaultRoleId` = {"NULL" if self._default_role_id is None else self._default_role_id},
+                `ShortRoleNameSetOnlyHighest` = {self._short_role_name_only_set_highest_role},
                 `FeatureFlags` = '{json.dumps(self._feature_flags)}',
                 `ServerId` = {self._server.id}
                 WHERE `Id` = {self._id};

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

@@ -18,6 +18,7 @@ class ServerConfigHistory(HistoryTableABC):
         team_channel_id: int,
         login_message_channel_id: int,
         default_role_id: int,
+        short_role_name_only_set_highest_role: bool,
         feature_flags: dict[str],
         server_id: int,
         deleted: bool,
@@ -42,6 +43,8 @@ class ServerConfigHistory(HistoryTableABC):
         self._team_channel_id = team_channel_id
         self._login_message_channel_id = login_message_channel_id
         self._default_role_id = default_role_id
+        self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
+
         self._feature_flags = feature_flags
         self._server_id = server_id
 
@@ -105,6 +108,10 @@ class ServerConfigHistory(HistoryTableABC):
     def default_role_id(self) -> int:
         return self._default_role_id
 
+    @property
+    def short_role_name_only_set_highest_role(self) -> bool:
+        return self._short_role_name_only_set_highest_role
+
     @property
     def feature_flags(self) -> dict[str]:
         return self._feature_flags

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

@@ -0,0 +1,140 @@
+from datetime import datetime
+
+from cpl_core.database import TableABC
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_discord.service import DiscordBotServiceABC
+
+from bot_data.model.server import Server
+from bot_data.model.short_role_name_position_enum import ShortRoleNamePositionEnum
+
+
+class ShortRoleName(TableABC):
+    def __init__(
+        self,
+        short_name: str,
+        discord_role_id: int,
+        position: ShortRoleNamePositionEnum,
+        server: Server,
+        created_at: datetime = None,
+        modified_at: datetime = None,
+        id=0,
+    ):
+        self._id = id
+        self._short_name = short_name
+        self._discord_role_id = discord_role_id
+        self._position = position
+        self._server = server
+
+        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
+
+    @property
+    def id(self) -> int:
+        return self._id
+
+    @property
+    def short_name(self) -> str:
+        return self._short_name
+
+    @short_name.setter
+    def short_name(self, value: str):
+        self._short_name = value
+
+    @property
+    def role_id(self) -> int:
+        return self._discord_role_id
+
+    @role_id.setter
+    def role_id(self, value: int):
+        self._discord_role_id = value
+
+    @property
+    @ServiceProviderABC.inject
+    def role_name(self, bot: DiscordBotServiceABC) -> str:
+        guild = bot.get_guild(self._server.discord_id)
+        return guild.get_role(self.role_id).name
+
+    @property
+    def position(self) -> ShortRoleNamePositionEnum:
+        return self._position
+
+    @position.setter
+    def position(self, value: ShortRoleNamePositionEnum):
+        self._position = value
+
+    @property
+    def server(self) -> Server:
+        return self._server
+
+    @staticmethod
+    def get_select_all_string() -> str:
+        return str(
+            f"""
+            SELECT * FROM `ShortRoleNames`;
+        """
+        )
+
+    @staticmethod
+    def get_select_by_id_string(id: int) -> str:
+        return str(
+            f"""
+            SELECT * FROM `ShortRoleNames`
+            WHERE `Id` = {id};
+        """
+        )
+
+    @staticmethod
+    def get_select_by_role_id_string(id: int) -> str:
+        return str(
+            f"""
+            SELECT * FROM `ShortRoleNames`
+            WHERE `DiscordRoleId` = {id};
+        """
+        )
+
+    @staticmethod
+    def get_select_by_server_id_string(id: int) -> str:
+        return str(
+            f"""
+            SELECT * FROM `ShortRoleNames`
+            WHERE `ServerId` = {id};
+        """
+        )
+
+    @property
+    def insert_string(self) -> str:
+        return str(
+            f"""
+            INSERT INTO `ShortRoleNames` (
+                `ShortName`, `DiscordRoleId`, `Position`, `ServerId`
+            ) VALUES (
+                '{self._short_name}',
+                {self._discord_role_id},
+                '{self._position}',
+                {self._server.id}
+            );
+        """
+        )
+
+    @property
+    def udpate_string(self) -> str:
+        return str(
+            f"""
+            UPDATE `ShortRoleNames`
+            SET `ShortName` = '{self._short_name}',
+            `DiscordRoleId` = {self._discord_role_id},
+            `Position` = '{self._position}',
+            `ServerId` = {self._server.id}
+            WHERE `Id` = {self._id};
+        """
+        )
+
+    @property
+    def delete_string(self) -> str:
+        return str(
+            f"""
+            DELETE FROM `ShortRoleNames`
+            WHERE `Id` = {self._id};
+        """
+        )

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

@@ -0,0 +1,56 @@
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_discord.service import DiscordBotServiceABC
+
+from bot_data.abc.history_table_abc import HistoryTableABC
+
+
+class ShortRoleNameHistory(HistoryTableABC):
+    def __init__(
+        self,
+        name: str,
+        discord_role_id: int,
+        server: int,
+        deleted: bool,
+        date_from: str,
+        date_to: str,
+        id=0,
+    ):
+        HistoryTableABC.__init__(self)
+        self._id = id
+        self._name = name
+        self._discord_role_id = discord_role_id
+        self._server = server
+
+        self._deleted = deleted
+        self._date_from = date_from
+        self._date_to = date_to
+
+    @property
+    def id(self) -> int:
+        return self._id
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @name.setter
+    def name(self, value: str):
+        self._name = value
+
+    @property
+    def role_id(self) -> int:
+        return self._discord_role_id
+
+    @role_id.setter
+    def role_id(self, value: int):
+        self._discord_role_id = value
+
+    @property
+    @ServiceProviderABC.inject
+    def role_name(self, bot: DiscordBotServiceABC) -> str:
+        guild = bot.get_guild(self._server.discord_id)
+        return guild.get_role(self.role_id).name
+
+    @property
+    def server(self) -> int:
+        return self._server

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

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class ShortRoleNamePositionEnum(Enum):
+    before = "before"
+    after = "after"

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

@@ -49,6 +49,15 @@ class UserGameIdent(TableABC):
         """
         )
 
+    @staticmethod
+    def get_select_by_game_server_id_string(id: int) -> str:
+        return str(
+            f"""
+            SELECT * FROM `UserGameIdents`
+            WHERE `GameServerId` = {id};
+        """
+        )
+
     @staticmethod
     def get_select_by_id_string(id: int) -> str:
         return str(

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -68,13 +68,16 @@ class GameServerRepositoryService(GameServerRepositoryABC):
         result = self._context.select(GameServer.get_select_by_id_string(id))[0]
         return self._from_result(result)
 
-    def get_game_server_by_api_key_id(self, id: int) -> GameServer:
+    def get_game_servers_by_api_key_id(self, id: int) -> List[GameServer]:
         self._logger.trace(
             __name__,
             f"Send SQL command: {GameServer.get_select_by_api_key_id_string(id)}",
         )
-        result = self._context.select(GameServer.get_select_by_api_key_id_string(id))[0]
+        game_servers = List(GameServer)
-        return self._from_result(result)
+        results = self._context.select(GameServer.get_select_by_api_key_id_string(id))
+        for result in results:
+            game_servers.append(self._from_result(result))
+        return game_servers
 
     def add_game_server(self, game_server: GameServer):
         self._logger.trace(__name__, f"Send SQL command: {game_server.insert_string}")

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

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

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

@@ -34,30 +34,12 @@ class ServerConfigSeeder(DataSeederABC):
                 if self._server_config.does_server_config_exists(server.id):
                     continue
 
-                config = ServerConfig(
+                config = ServerConfig.new(guild, server)
-                    6,
-                    guild.system_channel.id,
-                    6,
-                    1,
-                    1,
-                    20,
-                    10,
-                    10,
-                    10,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    guild.system_channel.id,
-                    {},
-                    server,
-                    [],
-                    [],
-                )
 
                 self._server_config.add_server_config(config)
 
                 self._db.save_changes()
-                self._logger.debug(__name__, "Seeded technician config")
+                self._logger.debug(__name__, "Seeded server config")
 
         except Exception as e:
-            self._logger.error(__name__, f"Seeding technician config failed", e)
+            self._logger.error(__name__, f"Seeding server config failed", e)

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

@@ -0,0 +1,95 @@
+from typing import Optional
+
+from cpl_core.database.context import DatabaseContextABC
+from cpl_query.extension import List
+
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC
+from bot_data.model.short_role_name import ShortRoleName
+from bot_data.model.short_role_name_position_enum import ShortRoleNamePositionEnum
+
+
+class ShortRoleNameRepositoryService(ShortRoleNameRepositoryABC):
+    def __init__(
+        self,
+        logger: DatabaseLogger,
+        db_context: DatabaseContextABC,
+        servers: ServerRepositoryABC,
+    ):
+        self._logger = logger
+        self._context = db_context
+
+        self._servers = servers
+
+        ShortRoleNameRepositoryABC.__init__(self)
+
+    @staticmethod
+    def _get_value_from_result(value: any) -> Optional[any]:
+        if isinstance(value, str) and "NULL" in value:
+            return None
+
+        return value
+
+    def _short_role_name_from_result(self, sql_result: tuple) -> ShortRoleName:
+        return ShortRoleName(
+            self._get_value_from_result(sql_result[1]),  # name
+            int(self._get_value_from_result(sql_result[2])),  # role_id
+            ShortRoleNamePositionEnum(self._get_value_from_result(sql_result[3])),  # position
+            self._servers.get_server_by_id(sql_result[4]),  # server
+            self._get_value_from_result(sql_result[5]),  # created_at
+            self._get_value_from_result(sql_result[6]),  # modified_at
+            id=self._get_value_from_result(sql_result[0]),  # id
+        )
+
+    def get_short_role_names(self) -> List[ShortRoleName]:
+        short_role_names = List(ShortRoleName)
+        self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_all_string()}")
+        results = self._context.select(ShortRoleName.get_select_all_string())
+        for result in results:
+            self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
+            short_role_names.append(self._short_role_name_from_result(result))
+
+        return short_role_names
+
+    def get_short_role_name_by_id(self, id: int) -> ShortRoleName:
+        self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_by_id_string(id)}")
+        result = self._context.select(ShortRoleName.get_select_by_id_string(id))[0]
+
+        return self._short_role_name_from_result(result)
+
+    def find_short_role_names_by_role_id(self, role_id: int) -> List[ShortRoleName]:
+        short_role_names = List(ShortRoleName)
+        self._logger.trace(__name__, f"Send SQL command: {ShortRoleName.get_select_by_role_id_string(role_id)}")
+        results = self._context.select(ShortRoleName.get_select_by_role_id_string(role_id))
+        for result in results:
+            self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
+            short_role_names.append(self._short_role_name_from_result(result))
+
+        return short_role_names
+
+    def get_short_role_names_by_server_id(self, server_id: int) -> List[ShortRoleName]:
+        short_role_names = List(ShortRoleName)
+        self._logger.trace(
+            __name__,
+            f"Send SQL command: {ShortRoleName.get_select_by_server_id_string(server_id)}",
+        )
+        results = self._context.select(ShortRoleName.get_select_by_server_id_string(server_id))
+
+        for result in results:
+            self._logger.trace(__name__, f"Get short_role_name with id {result[0]}")
+            short_role_names.append(self._short_role_name_from_result(result))
+
+        return short_role_names
+
+    def add_short_role_name(self, short_role_name: ShortRoleName):
+        self._logger.trace(__name__, f"Send SQL command: {short_role_name.insert_string}")
+        self._context.cursor.execute(short_role_name.insert_string)
+
+    def update_short_role_name(self, short_role_name: ShortRoleName):
+        self._logger.trace(__name__, f"Send SQL command: {short_role_name.udpate_string}")
+        self._context.cursor.execute(short_role_name.udpate_string)
+
+    def delete_short_role_name(self, short_role_name: ShortRoleName):
+        self._logger.trace(__name__, f"Send SQL command: {short_role_name.delete_string}")
+        self._context.cursor.execute(short_role_name.delete_string)

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

@@ -51,6 +51,19 @@ class UserGameIdentRepositoryService(UserGameIdentRepositoryABC):
 
         return joins
 
+    def get_user_game_idents_by_game_server_id(self, game_server_id: int) -> List[UserGameIdent]:
+        joins = List(UserGameIdent)
+        self._logger.trace(
+            __name__,
+            f"Send SQL command: {UserGameIdent.get_select_by_game_server_id_string(game_server_id)}",
+        )
+        results = self._context.select(UserGameIdent.get_select_by_game_server_id_string(game_server_id))
+        for result in results:
+            self._logger.trace(__name__, f"Get UserGameIdent with id {result[0]}")
+            joins.append(self._from_result(result))
+
+        return joins
+
     def get_user_game_ident_by_id(self, id: int) -> UserGameIdent:
         self._logger.trace(
             __name__,

kdb-bot/src/bot_graphql/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -20,6 +20,7 @@ from bot_data.model.known_user import KnownUser
 from bot_data.model.level import Level
 from bot_data.model.server import Server
 from bot_data.model.server_config import ServerConfig
+from bot_data.model.short_role_name import ShortRoleName
 from bot_data.model.user import User
 from bot_data.model.user_joined_game_server import UserJoinedGameServer
 from bot_data.model.user_joined_server import UserJoinedServer
@@ -78,6 +79,14 @@ class QueryABC(ObjectType):
         permissions: PermissionService = services.get_service(PermissionService)
         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
 
+        if user.auth_role == AuthRoleEnum.admin:
+            return True
+
+        for u in user.users:
+            guild = bot.get_guild(u.server.discord_id)
+            if permissions.is_member_technician(guild.get_member(u.discord_id)):
+                return True
+
         access = False
         if type(element) == Achievement:
             element: Achievement = element
@@ -184,6 +193,16 @@ class QueryABC(ObjectType):
                     access = True
                     break
 
+        elif type(element) == ShortRoleName:
+            element: ShortRoleName = element
+            for u in user.users:
+                u: User = u
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if permissions.is_member_moderator(member) and u.server.id == element.server.id:
+                    access = True
+                    break
+
         elif type(element) == dict and "key" in element and element["key"] in [e.value for e in FeatureFlagsEnum]:
             for u in user.users:
                 u: User = u

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

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

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -0,0 +1,70 @@
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_query.extension import List
+
+from bot_data.model.short_role_name import ShortRoleName
+from bot_data.model.short_role_name_position_enum import ShortRoleNamePositionEnum
+from bot_data.model.user import User
+from bot_graphql.abc.filter_abc import FilterABC
+
+
+class ShortRoleNameFilter(FilterABC):
+    def __init__(self, bot: DiscordBotServiceABC):
+        FilterABC.__init__(self)
+        self._bot = bot
+
+        self._id = None
+        self._short_name = None
+        self._role_id = None
+        self._role_name = None
+        self._position = None
+        self._server = None
+
+    def from_dict(self, values: dict):
+        if "id" in values:
+            self._id = int(values["id"])
+
+        if "shortName" in values:
+            self._short_name = values["shortName"]
+
+        if "roleId" in values:
+            self._role_id = int(values["roleId"])
+
+        if "roleName" in values:
+            self._role_name = values["roleName"]
+
+        if "position" in values:
+            self._position = ShortRoleNamePositionEnum(values["position"])
+
+        if "server" in values:
+            from bot_graphql.filter.server_filter import ServerFilter
+
+            self._server: ServerFilter = self._services.get_service(ServerFilter)
+            self._server.from_dict(values["server"])
+
+    def filter(self, query: List[User]) -> List[User]:
+        if self._id is not None:
+            query = query.where(lambda x: x.id == self._id)
+
+        if self._short_name is not None:
+            query = query.where(lambda x: x.short_name == self._short_name or self._short_name in x.short_name)
+
+        if self._role_id is not None:
+            query = query.where(lambda x: x.role_id == self._role_id)
+
+        if self._role_name is not None and self._role_id is not None:
+
+            def get_role_name(x: ShortRoleName):
+                guild = self._bot.get_guild(x.server.discord_id)
+                name = guild.get_role(x.role_id).name
+                return name == self._role_name or self._role_name in name
+
+            query = query.where(get_role_name)
+
+        if self._position is not None:
+            query = query.where(lambda x: x.position.value == self._position.value)
+
+        if self._server is not None:
+            servers = self._server.filter(query.select(lambda x: x.server)).select(lambda x: x.id)
+            query = query.where(lambda x: x.server.id in servers)
+
+        return query

kdb-bot/src/bot_graphql/graphql/mutation.gql

@@ -5,6 +5,7 @@ type Mutation {
     user: UserMutation
     userJoinedGameServer: UserJoinedGameServerMutation
     achievement: AchievementMutation
+    shortRoleName: ShortRoleNameMutation
     technicianConfig: TechnicianConfigMutation
     serverConfig: ServerConfigMutation
 }

kdb-bot/src/bot_graphql/graphql/query.gql

@@ -37,6 +37,10 @@ type Query {
     achievementAttributes: [AchievementAttribute]
     achievementOperators: [String]
 
+    shortRoleNameCount: Int
+    shortRoleNames(filter: ShortRoleNameFilter, page: Page, sort: Sort): [ShortRoleName]
+    shortRoleNamePositions: [String]
+
     technicianConfig: TechnicianConfig
     possibleFeatureFlags: [String]
     discord: Discord

kdb-bot/src/bot_graphql/graphql/server.gql

@@ -31,7 +31,11 @@ type Server implements TableWithHistoryQuery {
     achievementCount: Int
     achievements(filter: AchievementFilter, page: Page, sort: Sort): [Achievement]
 
+    shortRoleNameCount: Int
+    shortRoleNames(filter: ShortRoleNameFilter, page: Page, sort: Sort): [ShortRoleName]
+
     config: ServerConfig
+    hasFeatureFlag(flag: String): FeatureFlag
 
     createdAt: String
     modifiedAt: String

kdb-bot/src/bot_graphql/graphql/serverConfig.gql

@@ -14,6 +14,7 @@ type ServerConfig implements TableWithHistoryQuery {
     teamChannelId: String
     loginMessageChannelId: String
     defaultRoleId: String
+    shortRoleNameOnlySetHighestRole: Boolean
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -45,6 +46,7 @@ type ServerConfigHistory implements HistoryTableQuery {
     teamChannelId: String
     loginMessageChannelId: String
     defaultRoleId: String
+    shortRoleNameOnlySetHighestRole: Boolean
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -94,6 +96,7 @@ input ServerConfigInput {
     teamChannelId: String
     loginMessageChannelId: String
     defaultRoleId: String
+    shortRoleNameOnlySetHighestRole: Boolean
     featureFlags: [FeatureFlagInput]
 
     afkChannelIds: [String]

kdb-bot/src/bot_graphql/graphql/shortRoleName.gql

@@ -0,0 +1,50 @@
+type ShortRoleName implements TableWithHistoryQuery {
+    id: ID
+    shortName: String
+    roleId: String
+    roleName: String
+    position: String
+
+    server: Server
+
+    createdAt: String
+    modifiedAt: String
+
+    history: [ShortRoleNameHistory]
+}
+
+type ShortRoleNameHistory implements HistoryTableQuery {
+    id: ID
+    shortName: String
+    roleId: String
+    position: String
+
+    server: ID
+
+    deleted: Boolean
+    dateFrom: String
+    dateTo: String
+}
+
+input ShortRoleNameFilter {
+    id: ID
+    shortName: String
+    roleId: String
+    roleName: String
+    position: String
+}
+
+type ShortRoleNameMutation {
+    createShortRoleName(input: ShortRoleNameInput!): ShortRoleName
+    updateShortRoleName(input: ShortRoleNameInput!): ShortRoleName
+    deleteShortRoleName(id: ID): ShortRoleName
+}
+
+input ShortRoleNameInput {
+    id: ID
+    shortName: String
+    roleId: String
+    roleName: String
+    position: String
+    serverId: ID
+}

kdb-bot/src/bot_graphql/graphql_module.py

@@ -5,7 +5,6 @@ from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_data.service.seeder_service import SeederService
 from bot_graphql.abc.filter_abc import FilterABC
 from bot_graphql.abc.query_abc import QueryABC
 from bot_graphql.filter.achievement_filter import AchievementFilter
@@ -14,6 +13,7 @@ from bot_graphql.filter.auto_role_rule_filter import AutoRoleRuleFilter
 from bot_graphql.filter.client_filter import ClientFilter
 from bot_graphql.filter.level_filter import LevelFilter
 from bot_graphql.filter.server_filter import ServerFilter
+from bot_graphql.filter.short_role_name_filter import ShortRoleNameFilter
 from bot_graphql.filter.user_filter import UserFilter
 from bot_graphql.filter.user_joined_game_server_filter import UserJoinedGameServerFilter
 from bot_graphql.filter.user_joined_server_filter import UserJoinedServerFilter
@@ -25,6 +25,7 @@ from bot_graphql.mutations.auto_role_mutation import AutoRoleMutation
 from bot_graphql.mutations.auto_role_rule_mutation import AutoRoleRuleMutation
 from bot_graphql.mutations.level_mutation import LevelMutation
 from bot_graphql.mutations.server_config_mutation import ServerConfigMutation
+from bot_graphql.mutations.short_role_name_mutation import ShortRoleNameMutation
 from bot_graphql.mutations.technician_config_mutation import TechnicianConfigMutation
 from bot_graphql.mutations.user_joined_game_server_mutation import UserJoinedGameServerMutation
 from bot_graphql.mutations.user_mutation import UserMutation
@@ -51,6 +52,8 @@ from bot_graphql.queries.level_query import LevelQuery
 from bot_graphql.queries.server_config_query import ServerConfigQuery
 from bot_graphql.queries.server_history_query import ServerHistoryQuery
 from bot_graphql.queries.server_query import ServerQuery
+from bot_graphql.queries.short_role_name_history_query import ShortRoleNameHistoryQuery
+from bot_graphql.queries.short_role_name_query import ShortRoleNameQuery
 from bot_graphql.queries.technician_config_history_query import TechnicianConfigHistoryQuery
 from bot_graphql.queries.technician_config_query import TechnicianConfigQuery
 from bot_graphql.queries.technician_id_config_history_query import TechnicianIdConfigHistoryQuery
@@ -110,6 +113,8 @@ class GraphQLModule(ModuleABC):
         services.add_transient(QueryABC, UserJoinedVoiceChannelQuery)
         services.add_transient(QueryABC, UserJoinedGameServerHistoryQuery)
         services.add_transient(QueryABC, UserJoinedGameServerQuery)
+        services.add_transient(QueryABC, ShortRoleNameHistoryQuery)
+        services.add_transient(QueryABC, ShortRoleNameQuery)
 
         services.add_transient(QueryABC, DiscordQuery)
         services.add_transient(QueryABC, GuildQuery)
@@ -129,6 +134,7 @@ class GraphQLModule(ModuleABC):
         services.add_transient(FilterABC, UserJoinedServerFilter)
         services.add_transient(FilterABC, UserJoinedVoiceChannelFilter)
         services.add_transient(FilterABC, UserJoinedGameServerFilter)
+        services.add_transient(FilterABC, ShortRoleNameFilter)
 
         # mutations
         services.add_transient(QueryABC, AutoRoleMutation)
@@ -136,8 +142,7 @@ class GraphQLModule(ModuleABC):
         services.add_transient(QueryABC, LevelMutation)
         services.add_transient(QueryABC, UserMutation)
         services.add_transient(QueryABC, AchievementMutation)
+        services.add_transient(QueryABC, ShortRoleNameMutation)
         services.add_transient(QueryABC, UserJoinedGameServerMutation)
         services.add_transient(QueryABC, TechnicianConfigMutation)
         services.add_transient(QueryABC, ServerConfigMutation)
-
-        services.add_transient(SeederService)

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

kdb-bot/src/bot_graphql/mutation.py

@@ -5,6 +5,7 @@ from bot_graphql.mutations.auto_role_mutation import AutoRoleMutation
 from bot_graphql.mutations.auto_role_rule_mutation import AutoRoleRuleMutation
 from bot_graphql.mutations.level_mutation import LevelMutation
 from bot_graphql.mutations.server_config_mutation import ServerConfigMutation
+from bot_graphql.mutations.short_role_name_mutation import ShortRoleNameMutation
 from bot_graphql.mutations.technician_config_mutation import TechnicianConfigMutation
 from bot_graphql.mutations.user_joined_game_server_mutation import UserJoinedGameServerMutation
 from bot_graphql.mutations.user_mutation import UserMutation
@@ -21,6 +22,7 @@ class Mutation(MutationType):
         user_joined_game_server: UserJoinedGameServerMutation,
         technician_config: TechnicianConfigMutation,
         server_config: ServerConfigMutation,
+        short_role_name_mutation: ShortRoleNameMutation,
     ):
         MutationType.__init__(self)
 
@@ -30,5 +32,6 @@ class Mutation(MutationType):
         self.set_field("user", lambda *_: user_mutation)
         self.set_field("achievement", lambda *_: achievement_mutation)
         self.set_field("userJoinedGameServer", lambda *_: user_joined_game_server)
+        self.set_field("shortRoleName", lambda *_: short_role_name_mutation)
         self.set_field("technicianConfig", lambda *_: technician_config)
         self.set_field("serverConfig", lambda *_: server_config)

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -13,7 +13,6 @@ 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 modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class ServerConfigMutation(QueryABC):
@@ -25,7 +24,6 @@ class ServerConfigMutation(QueryABC):
         server_configs: ServerConfigRepositoryABC,
         db: DatabaseContextABC,
         config_service: ConfigService,
-        permissions: PermissionServiceABC,
     ):
         QueryABC.__init__(self, "ServerConfigMutation")
 
@@ -35,7 +33,6 @@ 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)
 
@@ -92,6 +89,11 @@ class ServerConfigMutation(QueryABC):
         server_config.default_role_id = (
             input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id
         )
+        server_config.short_role_name_only_set_highest_role = (
+            input["shortRoleNameOnlySetHighestRole"]
+            if "shortRoleNameOnlySetHighestRole" in input
+            else server_config.short_role_name_only_set_highest_role
+        )
         server_config.feature_flags = (
             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
             if "featureFlags" in input
@@ -178,4 +180,3 @@ class ServerConfigMutation(QueryABC):
             self._server_configs.add_server_team_role_id_config(role_id)
 
         self._bot.loop.create_task(self._config_service.reload_server_config(new_config.server))
-        self._permissions.on_ready()

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

@@ -0,0 +1,85 @@
+from cpl_core.database.context import DatabaseContextABC
+from cpl_discord.service import DiscordBotServiceABC
+
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC
+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
+
+
+class ShortRoleNameMutation(QueryABC):
+    def __init__(
+        self,
+        servers: ServerRepositoryABC,
+        short_role_names: ShortRoleNameRepositoryABC,
+        bot: DiscordBotServiceABC,
+        db: DatabaseContextABC,
+        permissions: PermissionService,
+    ):
+        QueryABC.__init__(self, "ShortRoleNameMutation")
+
+        self._servers = servers
+        self._short_role_names = short_role_names
+        self._bot = bot
+        self._db = db
+        self._permissions = permissions
+
+        self.set_field("createShortRoleName", self.resolve_create_short_role_name)
+        self.set_field("updateShortRoleName", self.resolve_update_short_role_name)
+        self.set_field("deleteShortRoleName", self.resolve_delete_short_role_name)
+
+    def resolve_create_short_role_name(self, *_, input: dict):
+        server = self._servers.get_server_by_id(input["serverId"])
+        self._can_user_mutate_data(server, UserRoleEnum.admin)
+
+        short_role_name = ShortRoleName(
+            input["shortName"],
+            int(input["roleId"]),
+            input["position"],
+            server,
+        )
+
+        result = self._short_role_names.find_short_role_names_by_role_id(short_role_name.role_id)
+        if result.count() > 0:
+            raise ValueError("Short name for role already exists")
+
+        self._short_role_names.add_short_role_name(short_role_name)
+        self._db.save_changes()
+
+        def get_new_short_role_name(srn: ShortRoleName):
+            return (
+                srn.short_name == short_role_name.short_name
+                and srn.role_id == short_role_name.role_id
+                and srn.position.value == short_role_name.position
+            )
+
+        return (
+            self._short_role_names.get_short_role_names_by_server_id(short_role_name.server.id)
+            .where(get_new_short_role_name)
+            .last()
+        )
+
+    def resolve_update_short_role_name(self, *_, input: dict):
+        short_role_name = self._short_role_names.get_short_role_name_by_id(input["id"])
+        self._can_user_mutate_data(short_role_name.server, UserRoleEnum.moderator)
+
+        short_role_name.short_name = input["shortName"] if "shortName" in input else short_role_name.short_name
+        short_role_name.role_id = input["roleId"] if "roleId" in input else short_role_name.role_id
+        short_role_name.position = input["position"] if "position" in input else short_role_name.position
+
+        self._short_role_names.update_short_role_name(short_role_name)
+        self._db.save_changes()
+
+        short_role_name = self._short_role_names.get_short_role_name_by_id(input["id"])
+        return short_role_name
+
+    def resolve_delete_short_role_name(self, *_, id: int):
+        short_role_name = self._short_role_names.get_short_role_name_by_id(id)
+        self._can_user_mutate_data(short_role_name.server, UserRoleEnum.admin)
+
+        self._short_role_names.delete_short_role_name(short_role_name)
+        self._db.save_changes()
+
+        return short_role_name

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

@@ -11,8 +11,8 @@ from bot_data.model.technician_config import TechnicianConfig
 from bot_data.model.technician_id_config import TechnicianIdConfig
 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 modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class TechnicianConfigMutation(QueryABC):
@@ -23,8 +23,8 @@ class TechnicianConfigMutation(QueryABC):
         servers: ServerRepositoryABC,
         technician_configs: TechnicianConfigRepositoryABC,
         db: DatabaseContextABC,
-        permissions: PermissionServiceABC,
         config_service: ConfigService,
+        tech_seeder: TechnicianConfigSeeder,
     ):
         QueryABC.__init__(self, "TechnicianConfigMutation")
 
@@ -33,12 +33,15 @@ class TechnicianConfigMutation(QueryABC):
         self._servers = servers
         self._technician_configs = technician_configs
         self._db = db
-        self._permissions = permissions
         self._config_service = config_service
+        self._tech_seeder = tech_seeder
 
         self.set_field("updateTechnicianConfig", self.resolve_update_technician_config)
 
     def resolve_update_technician_config(self, *_, input: dict):
+        if not self._technician_configs.does_technician_config_exists():
+            self._bot.loop.create_task(self._tech_seeder.seed())
+
         technician_config = self._technician_configs.get_technician_config()
         self._can_user_mutate_data(Route.get_user().users[0].server, UserRoleEnum.technician)
 
@@ -56,11 +59,16 @@ class TechnicianConfigMutation(QueryABC):
         technician_config.cache_max_messages = (
             input["cacheMaxMessages"] if "cacheMaxMessages" in input else technician_config.cache_max_messages
         )
+        old_feature_flags = technician_config.feature_flags
         technician_config.feature_flags = (
             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
             if "featureFlags" in input
             else technician_config.feature_flags
         )
+        for old_flag in old_feature_flags:
+            if old_flag not in technician_config.feature_flags:
+                technician_config.feature_flags[old_flag] = False
+
         technician_config.ping_urls = (
             List(str, input["pingURLs"]) if "pingURLs" in input else technician_config.ping_urls
         )
@@ -78,6 +86,7 @@ class TechnicianConfigMutation(QueryABC):
             self._update_technician_ids(technician_config)
 
         self._db.save_changes()
+        self._config_service.reload_technician_config()
         return technician_config
 
     def _update_ping_urls(self, new_config: TechnicianConfig):
@@ -112,6 +121,3 @@ class TechnicianConfigMutation(QueryABC):
                 continue
 
             self._technician_configs.add_technician_id_config(TechnicianIdConfig(technician_id))
-
-        self._bot.loop.create_task(self._config_service.reload_technician_config())
-        self._permissions.on_ready()

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

@@ -9,6 +9,8 @@ from cpl_discord.service import DiscordBotServiceABC
 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_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
@@ -75,14 +77,13 @@ class UserJoinedGameServerMutation(QueryABC):
         )
 
     def resolve_user_joined(self, *_, input: dict):
-        api_key = self._get_api_key()
-        if api_key is None:
-            self._logger.warn(__name__, f"UserJoinedGameServer not saved. Api-Key not available!")
-            return
-
-        game_server = self._game_servers.get_game_server_by_api_key_id(api_key.id)
         game_ident = self._user_game_idents.get_user_game_ident_by_ident(input["ident"])
         user = game_ident.user
+
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{user.server.discord_id}")
+        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.game_server):
+            raise Exception("Feature not activated")
+
         self._can_user_mutate_data(user.server, UserRoleEnum.admin)
 
         active = self._user_joined_game_servers.find_active_user_joined_game_server_by_user_id(user.id)
@@ -93,22 +94,22 @@ class UserJoinedGameServerMutation(QueryABC):
             )
             return
 
-        new = UserJoinedGameServer(user, game_server, datetime.now())
+        new = UserJoinedGameServer(user, game_ident.game_server, datetime.now())
         self._user_joined_game_servers.add_user_joined_game_server(new)
         self._db.save_changes()
 
         return self._user_joined_game_servers.get_active_user_joined_game_server_by_user_id(user.id)
 
     def resolve_user_left(self, *_, input: dict):
-        api_key = self._get_api_key()
-        if api_key is None:
-            self._logger.warn(__name__, f"UserJoinedGameServer not saved. Api-Key not available!")
-            return
-
         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}")
+        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.game_server):
+            raise Exception("Feature not activated")
+
         self._can_user_mutate_data(user.server, UserRoleEnum.admin)
 
         active = self._user_joined_game_servers.find_active_user_joined_game_server_by_user_id(user.id)

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.4"
+__version__ = "1.1.10"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="4")
+version_info = VersionInfo(major="1", minor="1", micro="10")

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

@@ -1,3 +1,4 @@
+import discord
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from discord import Guild
@@ -17,22 +18,24 @@ class GuildQuery(QueryABC):
         self.set_field("id", lambda g, *_: g.id)
         self.set_field("name", lambda g, *_: g.name)
         self.set_field("channels", self._resolve_channels)
-        self.set_field("roles", lambda g, *_: g.roles)
+        self.set_field("roles", lambda g, *_: g.roles.order_by(lambda x: x.position))
-        self.set_field("emojis", lambda g, *_: g.emojis)
+        self.set_field(
+            "emojis", lambda g, *_: List(discord.Emoji, g.emojis).order_by_descending(lambda x: x.created_at)
+        )
 
     def _resolve_channels(self, g: Guild, *_, filter=None):
-        users = List(any).extend(g.channels)
+        channels = List(any).extend(g.channels)
 
         if filter is None:
-            return users
+            return channels
 
         if "id" in filter:
-            users = users.where(lambda c: c.id == int(filter["id"]))
+            channels = channels.where(lambda c: c.id == int(filter["id"]))
 
         if "name" in filter:
-            users = users.where(lambda c: c.id == filter["name"])
+            channels = channels.where(lambda c: c.id == filter["name"])
 
         if "type" in filter:
-            users = users.where(lambda c: type(c).__name__ == filter["type"])
+            channels = channels.where(lambda c: type(c).__name__ == filter["type"])
 
-        return users
+        return channels.order_by(lambda x: x.position)

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

@@ -25,6 +25,9 @@ class ServerConfigQuery(DataQueryWithHistoryABC):
         self.set_field("teamChannelId", lambda config, *_: config.team_channel_id)
         self.set_field("loginMessageChannelId", lambda config, *_: config.login_message_channel_id)
         self.set_field("defaultRoleId", lambda config, *_: config.default_role_id)
+        self.set_field(
+            "shortRoleNameOnlySetHighestRole", lambda config, *_: config.short_role_name_only_set_highest_role
+        )
         self.add_collection(
             "featureFlag",
             lambda config, *_: List(any, [{"key": x, "value": config.feature_flags[x]} for x in config.feature_flags]),

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

@@ -1,28 +1,35 @@
+from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.game_server_repository_abc import GameServerRepositoryABC
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
+from bot_data.abc.short_role_name_repository_abc import ShortRoleNameRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.server import Server
+from bot_data.model.server_config import ServerConfig
 from bot_data.model.server_history import ServerHistory
 from bot_graphql.abc.data_query_with_history_abc import DataQueryWithHistoryABC
 from bot_graphql.filter.achievement_filter import AchievementFilter
 from bot_graphql.filter.auto_role_filter import AutoRoleFilter
 from bot_graphql.filter.client_filter import ClientFilter
 from bot_graphql.filter.level_filter import LevelFilter
+from bot_graphql.filter.short_role_name_filter import ShortRoleNameFilter
 from bot_graphql.filter.user_filter import UserFilter
 
 
 class ServerQuery(DataQueryWithHistoryABC):
     def __init__(
         self,
+        config: ConfigurationABC,
         bot: DiscordBotServiceABC,
         db: DatabaseContextABC,
         auto_roles: AutoRoleRepositoryABC,
@@ -33,10 +40,12 @@ class ServerQuery(DataQueryWithHistoryABC):
         ujs: UserJoinedServerRepositoryABC,
         ujvs: UserJoinedVoiceChannelRepositoryABC,
         achievements: AchievementRepositoryABC,
+        short_role_names: ShortRoleNameRepositoryABC,
         server_configs: ServerConfigRepositoryABC,
     ):
         DataQueryWithHistoryABC.__init__(self, "Server", "ServersHistory", ServerHistory, db)
 
+        self._config = config
         self._bot = bot
         self._auto_roles = auto_roles
         self._clients = clients
@@ -64,7 +73,15 @@ class ServerQuery(DataQueryWithHistoryABC):
         self.add_collection(
             "achievement", lambda server, *_: achievements.get_achievements_by_server_id(server.id), AchievementFilter
         )
+        self.add_collection(
+            "shortRoleName",
+            lambda server, *_: short_role_names.get_short_role_names_by_server_id(server.id),
+            ShortRoleNameFilter,
+        )
         self.set_field("config", lambda server, *_: server_configs.get_server_config_by_server(server.id))
+        self.set_field(
+            "hasFeatureFlag", lambda server, *_, **kwargs: self._resolve_has_feature_flag(server, *_, **kwargs)
+        )
 
     @staticmethod
     def resolve_id(server: Server, *_):
@@ -81,3 +98,12 @@ class ServerQuery(DataQueryWithHistoryABC):
     @staticmethod
     def resolve_icon_url(server: Server, *_):
         return server.icon_url
+
+    def _resolve_has_feature_flag(self, server: Server, *_, **kwargs):
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.discord_id}")
+        if "flag" not in kwargs:
+            return False
+        return {
+            "key": kwargs["flag"],
+            "value": FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum(kwargs["flag"])),
+        }

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

@@ -0,0 +1,11 @@
+from bot_graphql.abc.history_query_abc import HistoryQueryABC
+
+
+class ShortRoleNameHistoryQuery(HistoryQueryABC):
+    def __init__(self):
+        HistoryQueryABC.__init__(self, "ShortRoleName")
+
+        self.set_field("id", lambda x, *_: x.id)
+        self.set_field("shortName", lambda x, *_: x.shortName)
+        self.set_field("roleId", lambda x, *_: x.roleId)
+        self.set_field("position", lambda x, *_: x.position.value)

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

@@ -0,0 +1,18 @@
+from cpl_core.database.context import DatabaseContextABC
+
+from bot_data.model.short_role_name_history import ShortRoleNameHistory
+from bot_graphql.abc.data_query_with_history_abc import DataQueryWithHistoryABC
+
+
+class ShortRoleNameQuery(DataQueryWithHistoryABC):
+    def __init__(
+        self,
+        db: DatabaseContextABC,
+    ):
+        DataQueryWithHistoryABC.__init__(self, "ShortRoleName", "ShortRoleNamesHistory", ShortRoleNameHistory, db)
+
+        self.set_field("id", lambda x, *_: x.id)
+        self.set_field("shortName", lambda x, *_: x.short_name)
+        self.set_field("roleId", lambda x, *_: x.role_id)
+        self.set_field("roleName", lambda x, *_: x.role_name)
+        self.set_field("position", lambda x, *_: x.position.value)