Merge pull request '#127_config_in_wi' (#327) from #127_config_in_wi into 1.1.0

Reviewed-on: sh-edraft.de/kd_discord_bot#327
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>

.gitea/issue_template.md

@@ -1,17 +0,0 @@
-#### 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

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

.gitea/workflows/deploy_dev.yaml

@@ -1,65 +0,0 @@
-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

@@ -1,65 +0,0 @@
-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

@@ -1,87 +0,0 @@
-version: "3.9"
-
-volumes:
-  kdb_db_staging_1:
-
-services:
-  kdb_bot_staging_1:
-    image: sh-edraft.de/kdb-bot:1.1.9
-    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.9
-    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

@@ -1,87 +0,0 @@
-version: "3.9"
-
-volumes:
-  kdb_db_prod_1:
-
-services:
-  kdb_bot_prod_1:
-    image: sh-edraft.de/kdb-bot:1.1.9
-    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.9
-    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

@@ -11,12 +11,11 @@
       "auto-role": "src/modules/auto_role/auto-role.json",
       "base": "src/modules/base/base.json",
       "boot-log": "src/modules/boot_log/boot-log.json",
-      "config": "src/modules/config/config.json",
+      "config": "src/modules/config/modules/config.json",
       "database": "src/modules/database/database.json",
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",
       "technician": "src/modules/technician/technician.json",
-      "short-role-name": "src/modules/short_role_name/short-role-name.json",
       "checks": "tools/checks/checks.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
@@ -36,7 +35,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 sh-edraft.de/kdb-bot:$(cpl gv) .;",
+      "docker-build": "cpl build $ARGS; docker build -t kdb-bot/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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/application.py

@@ -71,7 +71,7 @@ class Application(DiscordBotApplicationABC):
                 self._api.stop()
 
             await self._bot.close()
-            await self._data_integrity.check_data_integrity(is_for_shutdown=True)
+            self._data_integrity.check_data_integrity(is_for_shutdown=True)
             self._logger.info(__name__, f"Stopped {DiscordBotService.__name__}")
         except Exception as e:
             self._logger.error(__name__, "stop failed", e)

kdb-bot/src/bot/bot.json

@@ -3,13 +3,13 @@
     "Name": "bot",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "0",
-      "Micro": "9"
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
-    "Description": "sh-edraft.de Discord bot",
+    "Description": "Keksdose bot",
-    "LongDescription": "Discord bot for customers of sh-edraft.de",
+    "LongDescription": "Discord bot  for the Keksdose discord Server",
     "URL": "https://www.sh-edraft.de",
     "CopyrightDate": "2022 - 2023",
     "CopyrightName": "sh-edraft.de",
@@ -30,8 +30,7 @@
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3",
       "ariadne==0.20.1",
-      "cryptography==41.0.2",
+      "cryptography==41.0.2"
-      "discord>=2.3.2"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",
@@ -60,15 +59,12 @@
       "../bot_core/bot-core.json",
       "../bot_data/bot-data.json",
       "../bot_graphql/bot-graphql.json",
-      "../modules/achievements/achievements.json",
       "../modules/auto_role/auto-role.json",
       "../modules/base/base.json",
       "../modules/boot_log/boot-log.json",
-      "../modules/config/config.json",
       "../modules/database/database.json",
       "../modules/level/level.json",
       "../modules/permission/permission.json",
-      "../modules/short_role_name/short-role-name.json",
       "../modules/technician/technician.json"
     ]
   }

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot/main.py

@@ -31,10 +31,10 @@ class Program:
             .use_extension(StartupDiscordExtension)
             .use_extension(StartupModuleExtension)
             .use_extension(StartupMigrationExtension)
-            .use_extension(DatabaseExtension)
             .use_extension(ConfigExtension)
             .use_extension(InitBotExtension)
             .use_extension(BootLogExtension)
+            .use_extension(DatabaseExtension)
             .use_extension(AppApiExtension)
             .use_extension(CoreExtension)
             .use_startup(Startup)

kdb-bot/src/bot/module_list.py

@@ -13,7 +13,6 @@ 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
 
 
@@ -26,8 +25,8 @@ class ModuleList:
             [
                 CoreModule,  # has to be first!
                 DataModule,
-                ConfigModule,  # has to be before db check
                 DatabaseModule,
+                ConfigModule,  # has be to after db check
                 GraphQLModule,
                 PermissionModule,
                 AutoRoleModule,
@@ -36,7 +35,6 @@ class ModuleList:
                 ApiModule,
                 TechnicianModule,
                 AchievementsModule,
-                ShortRoleNameModule,
                 # has to be last!
                 BootLogModule,
                 CoreExtensionModule,

kdb-bot/src/bot/startup_migration_extension.py

@@ -9,16 +9,11 @@ from bot_data.migration.api_key_migration import ApiKeyMigration
 from bot_data.migration.api_migration import ApiMigration
 from bot_data.migration.auto_role_fix1_migration import AutoRoleFix1Migration
 from bot_data.migration.auto_role_migration import AutoRoleMigration
-from bot_data.migration.config_feature_flags_migration import ConfigFeatureFlagsMigration
 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 (
@@ -51,8 +46,3 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, DBHistoryMigration)  # 06.03.2023 #246 - 1.0.0
         services.add_transient(MigrationABC, AchievementsMigration)  # 14.06.2023 #268 - 1.1.0
         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,7 +82,6 @@
       "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...",
@@ -95,10 +94,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": {
@@ -123,9 +122,6 @@
         },
         "success": "auto-role {} wurde entfernt :D"
       },
-      "react": {
-        "success": "Alle Reaktionen wurden hinzugefügt"
-      },
       "rule": {
         "add": {
           "error": {
@@ -155,37 +151,32 @@
       }
     },
     "base": {
-      "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": {
+        "title": "Beschwerde einreichen",
         "label": "Beschwerde",
         "message": "{} hat eine Beschwerde eingereicht:\n{}",
-        "response": "Danke für deine Beschwerde",
+        "response": "Danke für deine Beschwerde"
-        "title": "Beschwerde einreichen"
       },
+      "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... (◔_◔)",
       "game_server": {
-        "add": {
-          "success": "Gameserver {} wurde hinzugefügt :)"
-        },
         "error": {
           "nothing_found": "Keine Gameserver gefunden."
         },
         "list": {
-          "api_key": "API Key",
+          "title": "Gameserver",
           "description": "Konfigurierte Gameserver:",
           "name": "Name",
-          "title": "Gameserver"
+          "api_key": "API Key"
         },
-        "list_members": {
+        "add": {
-          "description": "Konfigurierte Mitglieder:",
+          "success": "Gameserver {} wurde hinzugefügt :)"
-          "title": "Mitglieder",
-          "users": "Mitglieder"
         },
         "remove": {
           "success": "Gameserver wurde entfernt :D"
@@ -212,7 +203,6 @@
         "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.",
@@ -349,9 +339,6 @@
     "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": {
@@ -365,8 +352,7 @@
       },
       "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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -3,8 +3,8 @@
     "Name": "bot-api",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "0",
-      "Micro": "9"
+      "Micro": "7"
     },
     "Author": "",
     "AuthorEmail": "",

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -494,13 +494,8 @@ class AuthService(AuthServiceABC):
             added_user = True
 
         db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
-        user_ids = db_user.users.select(lambda x: x.id)
+        if db_user.users.count() == 0:
-
+            members.for_each(lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x)))
-        for user in self._users.get_users_by_discord_id(dc_id):
-            if user.id in user_ids:
-                continue
-
-            self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, user))
 
         if db_user.confirmation_id is not None and not added_user:
             raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
-from typing import Callable, Union
+from typing import Callable
 
 import discord
 from cpl_query.extension import List
@@ -67,7 +67,3 @@ class ClientUtilsABC(ABC):
         self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
     ):
         pass
-
-    @abstractmethod
-    async def check_default_role(self, member: Union[discord.User, discord.Member]):
-        pass

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

@@ -3,8 +3,8 @@
     "Name": "bot-core",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "0",
-      "Micro": "9"
+      "Micro": "7"
     },
     "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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -5,22 +5,19 @@ class FeatureFlagsEnum(Enum):
     # modules
     achievements_module = "AchievementsModule"
     api_module = "ApiModule"
+    admin_module = "AdminModule"
     auto_role_module = "AutoRoleModule"
     base_module = "BaseModule"
     boot_log_module = "BootLogModule"
     core_module = "CoreModule"
     core_extension_module = "CoreExtensionModule"
-    config_module = "ConfigModule"
     data_module = "DataModule"
     database_module = "DatabaseModule"
     level_module = "LevelModule"
     moderator_module = "ModeratorModule"
     permission_module = "PermissionModule"
-    short_role_name_module = "ShortRoleNameModule"
+    config_module = "ConfigModule"
     # features
     api_only = "ApiOnly"
     presence = "Presence"
     version_in_presence = "VersionInPresence"
-    game_server = "GameServer"
-    sync_xp = "SyncXp"
-    short_role_name = "ShortRoleName"

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

@@ -8,7 +8,8 @@ class FeatureFlagsSettings(ConfigurationModelABC):
         # modules
         FeatureFlagsEnum.achievements_module.value: False,  # 14.06.2023 #268
         FeatureFlagsEnum.api_module.value: False,  # 13.10.2022 #70
-        FeatureFlagsEnum.auto_role_module.value: False,  # 03.10.2022 #54
+        FeatureFlagsEnum.admin_module.value: False,  # 02.10.2022 #48
+        FeatureFlagsEnum.auto_role_module.value: True,  # 03.10.2022 #54
         FeatureFlagsEnum.base_module.value: True,  # 02.10.2022 #48
         FeatureFlagsEnum.boot_log_module.value: True,  # 02.10.2022 #48
         FeatureFlagsEnum.core_module.value: True,  # 03.10.2022 #56
@@ -18,14 +19,10 @@ 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
     }
 
     def __init__(self, **kwargs: dict):
@@ -37,17 +34,6 @@ class FeatureFlagsSettings(ConfigurationModelABC):
         for flag in [f.value for f in FeatureFlagsEnum]:
             self._load_flag(kwargs, FeatureFlagsEnum(flag))
 
-    @classmethod
-    def get_flag_from_dict(cls, flags: dict, key: FeatureFlagsEnum) -> bool:
-        def get_flag():
-            if key.value not in cls._flags:
-                return False
-            return cls._flags[key.value]
-
-        if key.value not in flags:
-            return get_flag()
-        return flags[key.value]
-
     def get_flag(self, key: FeatureFlagsEnum) -> bool:
         if key.value not in self._flags:
             return False

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

kdb-bot/src/bot_core/core_module.py

@@ -11,7 +11,6 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.events.core_on_ready_event import CoreOnReadyEvent
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_core.service.client_utils_service import ClientUtilsService
-from bot_core.service.config_service import ConfigService
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_core.service.message_service import MessageService
 
@@ -24,7 +23,6 @@ class CoreModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(ConfigService)
         services.add_transient(MessageServiceABC, MessageService)
         services.add_transient(ClientUtilsABC, ClientUtilsService)
         services.add_transient(DataIntegrityService)

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Callable, Union
+from typing import Callable
 
 import discord
 from cpl_core.configuration import ConfigurationABC
@@ -218,20 +218,3 @@ class ClientUtilsService(ClientUtilsABC):
                 f"Cannot add reaction {rule.emoji_name} to message: {discord_message_id}",
                 e,
             )
-
-    async def check_default_role(self, member: Union[discord.User, discord.Member]):
-        try:
-            server = self._servers.get_server_by_discord_id(member.guild.id)
-            settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.discord_id}")
-
-            if settings.default_role_id is None:
-                return
-
-            default_role = member.guild.get_role(settings.default_role_id)
-            if default_role is None or default_role in member.roles:
-                return
-
-            await member.add_roles(default_role)
-
-        except Exception as e:
-            self._logger.error(__name__, f"Cannot check for default role for member {member.id}", e)

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

@@ -1,50 +0,0 @@
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
-
-from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
-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:
-    def __init__(
-        self,
-        config: ConfigurationABC,
-        services: ServiceProviderABC,
-        technician_config_repo: TechnicianConfigRepositoryABC,
-        server_config_repo: ServerConfigRepositoryABC,
-        tech_seeder: TechnicianConfigSeeder,
-        server_seeder: ServerConfigSeeder,
-    ):
-        self._config = config
-        self._services = services
-        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):
-        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))
-
-    async def reload_server_config(self, server: Server):
-        if not self._server_config_repo.does_server_config_exists(server.id):
-            await self._server_seeder.seed()
-
-        server_config = self._server_config_repo.get_server_config_by_server(server.id)
-        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

@@ -6,7 +6,6 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
@@ -24,6 +23,7 @@ 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
 
@@ -33,6 +33,7 @@ class DataIntegrityService:
         self,
         config: ConfigurationABC,
         logger: DatabaseLogger,
+        seeder: SeederService,
         bot: DiscordBotServiceABC,
         db_context: DatabaseContextABC,
         server_repo: ServerRepositoryABC,
@@ -43,12 +44,12 @@ class DataIntegrityService:
         user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
         user_joined_gs: UserJoinedGameServerRepositoryABC,
         achievement_service: AchievementService,
-        client_utils: ClientUtilsABC,
         dtp: DateTimeOffsetPipe,
     ):
         self._config = config
 
         self._logger = logger
+        self._seeder = seeder
         self._bot = bot
         self._db_context = db_context
         self._servers = server_repo
@@ -59,7 +60,6 @@ class DataIntegrityService:
         self._user_joins_vc = user_joins_vc
         self._user_joined_gs = user_joined_gs
         self._achievements = achievement_service
-        self._client_utils = client_utils
         self._dtp = dtp
 
         self._is_for_shutdown = False
@@ -291,7 +291,7 @@ class DataIntegrityService:
                         self._user_joins_vc.update_user_joined_voice_channel(join)
 
                         if self._is_for_shutdown:
-                            user.xp += round(join.time * settings.xp_per_ontime_hour)
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
@@ -356,14 +356,14 @@ class DataIntegrityService:
 
                         self._user_joined_gs.update_user_joined_game_server(join)
                         if self._is_for_shutdown:
-                            user.xp += round(join.time * settings.xp_per_ontime_hour)
+                            user.xp = round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
             except Exception as e:
                 self._logger.error(__name__, f"Cannot get UserJoinedGameServer", e)
 
-    async def _check_for_user_achievements(self):
+    def _check_for_user_achievements(self):
         self._logger.debug(__name__, f"Start checking UserGotAchievement table")
 
         for guild in self._bot.guilds:
@@ -380,18 +380,12 @@ class DataIntegrityService:
                 if user is None:
                     self._logger.fatal(__name__, f"User not found in database: {member.id}")
 
-                await self._achievements.validate_achievements_for_user(user)
+                self._bot.loop.create_task(self._achievements.validate_achievements_for_user(user))
 
-    async def _check_default_role(self):
+    def check_data_integrity(self, is_for_shutdown=False):
-        for guild in self._bot.guilds:
-            for member in guild.members:
-                await self._client_utils.check_default_role(member)
-
-    async def check_data_integrity(self, is_for_shutdown=False):
         if is_for_shutdown != self._is_for_shutdown:
             self._is_for_shutdown = is_for_shutdown
 
-        await self._check_default_role()
         self._check_known_users()
         self._check_servers()
         self._check_clients()
@@ -399,4 +393,4 @@ class DataIntegrityService:
         self._check_user_joins()
         self._check_user_joins_vc()
         self._check_user_joined_gs()
-        await self._check_for_user_achievements()
+        self._check_for_user_achievements()

kdb-bot/src/bot_data/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -14,10 +14,6 @@ class AuthUserRepositoryABC(ABC):
     def __init__(self):
         pass
 
-    @abstractmethod
-    def get_auth_user_relation_ids(self, auth_user: AuthUser) -> List[int]:
-        pass
-
     @abstractmethod
     def get_all_auth_users(self) -> List[AuthUser]:
         pass

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

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

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

@@ -1,20 +1,13 @@
-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
-    @ServiceProviderABC.inject
+    def __init__(self):
-    def __init__(self, db: DBContext):
+        pass
-        self._cursor: MySQLCursorBuffered = db.cursor
 
     @abstractmethod
     def upgrade(self):
@@ -23,10 +16,3 @@ 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

@@ -1,39 +0,0 @@
-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,10 +14,6 @@ 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

@@ -3,8 +3,8 @@
     "Name": "bot-data",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "0",
-      "Micro": "9"
+      "Micro": "7"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

kdb-bot/src/bot_data/data_module.py

@@ -16,7 +16,6 @@ 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
@@ -42,7 +41,6 @@ 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
@@ -91,7 +89,6 @@ 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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,29 +0,0 @@
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class ConfigFeatureFlagsMigration(MigrationABC):
-    name = "1.1.0_ConfigFeatureFlagsMigration"
-
-    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("""ALTER TABLE CFG_Technician ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER CacheMaxMessages;""")
-        )
-
-        self._cursor.execute(
-            str("""ALTER TABLE CFG_Server ADD FeatureFlags JSON NULL DEFAULT ('{}') AFTER LoginMessageChannelId;""")
-        )
-
-    def downgrade(self):
-        self._logger.debug(__name__, "Running downgrade")
-        self._cursor.execute("ALTER TABLE CFG_Technician DROP COLUMN FeatureFlags;")
-        self._cursor.execute("ALTER TABLE CFG_Server DROP COLUMN FeatureFlags;")

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

@@ -1,3 +1,5 @@
+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
@@ -10,18 +12,26 @@ 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(__file__, "config/server.sql")
+        self._exec("config/server.sql")
-        self._exec(__file__, "config/server_afk_channels.sql")
+        self._exec("config/server_afk_channels.sql")
-        self._exec(__file__, "config/server_team_roles.sql")
+        self._exec("config/server_team_roles.sql")
-        self._exec(__file__, "config/technician.sql")
+        self._exec("config/technician.sql")
-        self._exec(__file__, "config/technician_ids.sql")
+        self._exec("config/technician_ids.sql")
-        self._exec(__file__, "config/technician_ping_urls.sql")
+        self._exec("config/technician_ping_urls.sql")
 
     def _server_upgrade(self):
         self._cursor.execute(
@@ -133,8 +143,6 @@ class ConfigMigration(MigrationABC):
 
     def downgrade(self):
         self._logger.debug(__name__, "Running downgrade")
-        self._server_downgrade()
-        self._technician_downgrade()
 
     def _server_downgrade(self):
         self._cursor.execute("DROP TABLE `CFG_Server`;")

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

@@ -1,3 +1,5 @@
+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
@@ -13,26 +15,33 @@ 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(__file__, "api_keys.sql")
+        self._exec("api_keys.sql")
-        self._exec(__file__, "auth_users.sql")
+        self._exec("auth_users.sql")
-        self._exec(__file__, "auth_user_users_relation.sql")
+        self._exec("auth_user_users_relation.sql")
-        self._exec(__file__, "auto_role_rules.sql")
+        self._exec("auto_role_rules.sql")
-        self._exec(__file__, "auto_roles.sql")
+        self._exec("auto_roles.sql")
-        self._exec(__file__, "clients.sql")
+        self._exec("clients.sql")
-        self._exec(__file__, "game_servers.sql")
+        self._exec("game_servers.sql")
-        self._exec(__file__, "known_users.sql")
+        self._exec("known_users.sql")
-        self._exec(__file__, "levels.sql")
+        self._exec("levels.sql")
-        self._exec(__file__, "servers.sql")
+        self._exec("servers.sql")
-        self._exec(__file__, "user_game_idents.sql")
+        self._exec("user_game_idents.sql")
-        self._exec(__file__, "user_joined_game_servers.sql")
+        self._exec("user_joined_game_servers.sql")
-        self._exec(__file__, "user_joined_servers.sql")
+        self._exec("user_joined_servers.sql")
-        self._exec(__file__, "user_joined_voice_channel.sql")
+        self._exec("user_joined_voice_channel.sql")
-        self._exec(__file__, "user_message_count_per_hour.sql")
+        self._exec("user_message_count_per_hour.sql")
-        self._exec(__file__, "users.sql")
+        self._exec("users.sql")
-        self._exec(__file__, "user_warnings.sql")
+        self._exec("user_warnings.sql")
 
         self._logger.debug(__name__, "Finished history upgrade")
 

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

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

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

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

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

@@ -1,38 +0,0 @@
-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/default_role_migration.py

@@ -1,34 +0,0 @@
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class DefaultRoleMigration(MigrationABC):
-    name = "1.1.3_DefaultRoleMigration"
-
-    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 DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId;
-                """
-            )
-        )
-
-    def downgrade(self):
-        self._cursor.execute(
-            str(
-                f"""
-                    ALTER TABLE CFG_Server DROP COLUMN DefaultRoleId;
-                """
-            )
-        )

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

@@ -1,51 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -108,15 +108,6 @@ class Achievement(TableABC):
         """
         )
 
-    @staticmethod
-    def get_select_by_server_id_string(id: int) -> str:
-        return str(
-            f"""
-            SELECT * FROM `Achievements`
-            WHERE `ServerId` = {id};
-        """
-        )
-
     @property
     def insert_string(self) -> str:
         return str(

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

@@ -1,13 +1,9 @@
-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
 from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
 
@@ -28,9 +24,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         help_voice_channel_id: int,
         team_channel_id: int,
         login_message_channel_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],
         team_role_ids: List[ServerTeamRoleIdsConfig],
@@ -52,10 +45,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         self._help_voice_channel_id = help_voice_channel_id
         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
         self._team_role_ids = team_role_ids
@@ -64,30 +53,6 @@ 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
@@ -196,30 +161,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
     def login_message_channel_id(self, value: int):
         self._login_message_channel_id = value
 
-    @property
-    def default_role_id(self) -> int:
-        return self._default_role_id
-
-    @default_role_id.setter
-    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
-
-    @feature_flags.setter
-    def feature_flags(self, value: dict[FeatureFlagsEnum]):
-        self._feature_flags = value
-
     @property
     def afk_channel_ids(self) -> List[int]:
         return self._afk_channel_ids
@@ -284,9 +225,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `HelpVoiceChannelId`,
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
-                    `DefaultRoleId`,
-                    `ShortRoleNameSetOnlyHighest`,
-                    `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
                     {self._message_delete_timer},
@@ -302,9 +240,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {self._help_voice_channel_id},
                     {self._team_channel_id},
                     {self._login_message_channel_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}
                 );
             """
@@ -328,9 +263,6 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `HelpVoiceChannelId` = {self._help_voice_channel_id},
                 `TeamChannelId` = {self._team_channel_id},
                 `LoginMessageChannelId` = {self._login_message_channel_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

@@ -17,9 +17,6 @@ class ServerConfigHistory(HistoryTableABC):
         help_voice_channel_id: int,
         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,
         date_from: str,
@@ -42,10 +39,6 @@ class ServerConfigHistory(HistoryTableABC):
         self._help_voice_channel_id = help_voice_channel_id
         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
 
         self._deleted = deleted
@@ -104,18 +97,6 @@ class ServerConfigHistory(HistoryTableABC):
     def login_message_channel_id(self) -> int:
         return self._login_message_channel_id
 
-    @property
-    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
-
     @property
     def server_id(self) -> int:
         return self._server_id

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

@@ -1,140 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

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

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

@@ -1,12 +1,9 @@
-import json
 from datetime import datetime
 
 from cpl_core.configuration import ConfigurationModelABC
 from cpl_core.database import TableABC
 from cpl_query.extension import List
 
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-
 
 class TechnicianConfig(TableABC, ConfigurationModelABC):
     def __init__(
@@ -15,7 +12,6 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
         wait_for_restart: int,
         wait_for_shutdown: int,
         cache_max_messages: int,
-        feature_flags: dict[FeatureFlagsEnum],
         technician_ids: List[int],
         ping_urls: List[str],
         created_at: datetime = None,
@@ -27,7 +23,6 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
         self._wait_for_restart = wait_for_restart
         self._wait_for_shutdown = wait_for_shutdown
         self._cache_max_messages = cache_max_messages
-        self._feature_flags = feature_flags
         self._technician_ids = technician_ids
         self._ping_urls = ping_urls
 
@@ -71,14 +66,6 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
     def cache_max_messages(self, value: int):
         self._cache_max_messages = value
 
-    @property
-    def feature_flags(self) -> dict[FeatureFlagsEnum]:
-        return self._feature_flags
-
-    @feature_flags.setter
-    def feature_flags(self, value: dict[FeatureFlagsEnum]):
-        self._feature_flags = value
-
     @property
     def technician_ids(self) -> List[int]:
         return self._technician_ids
@@ -117,13 +104,12 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
         return str(
             f"""
                 INSERT INTO `CFG_Technician` (
-                    `HelpCommandReferenceUrl`, `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`, `FeatureFlags`
+                    `HelpCommandReferenceUrl`, `WaitForRestart`, `WaitForShutdown`, `CacheMaxMessages`
                 ) VALUES (
                     '{self._help_command_reference_url}',
                     {self._wait_for_restart},
                     {self._wait_for_shutdown},
-                    {self._cache_max_messages},
+                    {self._cache_max_messages}
-                    '{json.dumps(self._feature_flags)}'
                 );
             """
         )
@@ -136,8 +122,7 @@ class TechnicianConfig(TableABC, ConfigurationModelABC):
                 SET `HelpCommandReferenceUrl` = '{self._help_command_reference_url}',
                 `WaitForRestart` = {self._wait_for_restart},
                 `WaitForShutdown` = {self._wait_for_shutdown},
-                `CacheMaxMessages` = {self._cache_max_messages},
+                `CacheMaxMessages` = {self._cache_max_messages}
-                `FeatureFlags` = '{json.dumps(self._feature_flags)}'
                 WHERE `Id` = {self._id};
             """
         )

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

@@ -15,8 +15,8 @@ class User(TableABC):
         self,
         dc_id: int,
         xp: int,
-        reaction_count: int,
         message_count: int,
+        reaction_count: int,
         server: Optional[Server],
         created_at: datetime = None,
         modified_at: datetime = None,
@@ -25,8 +25,8 @@ class User(TableABC):
         self._user_id = id
         self._discord_id = dc_id
         self._xp = xp
-        self._reaction_count = reaction_count
         self._message_count = message_count
+        self._reaction_count = reaction_count
         self._server = server
 
         TableABC.__init__(self)

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

@@ -49,15 +49,6 @@ 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/model/user_joined_voice_channel.py

@@ -39,10 +39,7 @@ class UserJoinedVoiceChannel(TableABC):
     @property
     @ServiceProviderABC.inject
     def channel_name(self, bot: DiscordBotServiceABC) -> str:
-        channel = bot.get_channel(self.channel_id)
+        return bot.get_channel(self.channel_id).name
-        if channel is None:
-            return ""
-        return channel.name
 
     @property
     def user(self) -> User:

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

@@ -41,10 +41,7 @@ class UserJoinedVoiceChannelHistory(HistoryTableABC):
     @property
     @ServiceProviderABC.inject
     def channel_name(self, bot: DiscordBotServiceABC) -> str:
-        channel = bot.get_channel(self.channel_id)
+        return bot.get_channel(self.channel_id).name
-        if channel is None:
-            return ""
-        return channel.name
 
     @property
     def user(self) -> int:

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -65,8 +65,8 @@ class AchievementRepositoryService(AchievementRepositoryABC):
 
     def get_achievements_by_server_id(self, server_id: int) -> List[Achievement]:
         achievements = List(Achievement)
-        self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_server_id_string(server_id)}")
+        self._logger.trace(__name__, f"Send SQL command: {Achievement.get_select_by_id_string(server_id)}")
-        results = self._context.select(Achievement.get_select_by_server_id_string(server_id))
+        results = self._context.select(Achievement.get_select_all_string())
         for result in results:
             self._logger.trace(__name__, f"Get user with id {result[0]}")
             achievements.append(self._from_result(result))

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

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Optional
 
 from cpl_core.database.context import DatabaseContextABC
@@ -50,7 +49,13 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
             auth_user_id=self._get_value_from_result(au_result[0]),
         )
 
-        for user_id in self.get_auth_user_relation_ids(auth_user):
+        self._logger.trace(
+            __name__,
+            f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
+        )
+        results = self._context.select(auth_user.get_select_user_id_from_relations())
+        for result in results:
+            user_id = self._get_value_from_result(result[0])
             if user_id is None:
                 continue
 
@@ -59,19 +64,6 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
 
         return auth_user
 
-    def get_auth_user_relation_ids(self, auth_user: AuthUser) -> List[int]:
-        self._logger.trace(
-            __name__,
-            f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
-        )
-        relation_ids = List(int)
-        results = self._context.select(auth_user.get_select_user_id_from_relations())
-        for result in results:
-            self._logger.trace(__name__, f"Got auth user relation with id {result[0]}")
-            relation_ids.append(result[0])
-
-        return relation_ids
-
     def get_all_auth_users(self) -> List[AuthUser]:
         users = List(AuthUser)
         self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")
@@ -108,17 +100,9 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
         ):
             crit_sort_direction = criteria.sort_direction.lower()
             if crit_sort_direction == "desc" or crit_sort_direction == "descending":
-                query = query.order_by_descending(
+                query = query.order_by_descending(lambda x: getattr(x, criteria.sort_column))
-                    lambda x: getattr(x, criteria.sort_column)
-                    if not isinstance(getattr(x, criteria.sort_column), Enum)
-                    else getattr(x, criteria.sort_column).value
-                )
             else:
-                query = query.order_by(
+                query = query.order_by(lambda x: getattr(x, criteria.sort_column))
-                    lambda x: getattr(x, criteria.sort_column)
-                    if not isinstance(getattr(x, criteria.sort_column), Enum)
-                    else getattr(x, criteria.sort_column).value
-                )
 
         result = FilteredResult()
         result.total_count = query.count()

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

@@ -68,16 +68,13 @@ class GameServerRepositoryService(GameServerRepositoryABC):
         result = self._context.select(GameServer.get_select_by_id_string(id))[0]
         return self._from_result(result)
 
-    def get_game_servers_by_api_key_id(self, id: int) -> List[GameServer]:
+    def get_game_server_by_api_key_id(self, id: int) -> GameServer:
         self._logger.trace(
             __name__,
             f"Send SQL command: {GameServer.get_select_by_api_key_id_string(id)}",
         )
-        game_servers = List(GameServer)
+        result = self._context.select(GameServer.get_select_by_api_key_id_string(id))[0]
-        results = self._context.select(GameServer.get_select_by_api_key_id_string(id))
+        return self._from_result(result)
-        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

@@ -1,5 +1,3 @@
-import json
-
 from cpl_core.database.context import DatabaseContextABC
 from cpl_query.extension import List
 
@@ -64,26 +62,23 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC):
             result[11],
             result[12],
             result[13],
-            result[14],
+            self._servers.get_server_by_id(result[14]),
+            self._get_afk_channel_ids(result[14]),
+            self._get_team_role_ids(result[14]),
             result[15],
-            json.loads(result[16]),
+            result[16],
-            self._servers.get_server_by_id(result[17]),
-            self._get_afk_channel_ids(result[17]),
-            self._get_team_role_ids(result[17]),
-            result[18],
-            result[19],
             id=result[0],
         )
 
     def does_server_config_exists(self, server_id: int) -> bool:
-        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}")
+        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_id_string(server_id)}")
-        result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))
+        result = self._context.select(ServerConfig.get_select_by_id_string(server_id))
 
         return len(result) > 0
 
     def get_server_config_by_server(self, server_id: int) -> ServerConfig:
-        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_server_id_string(server_id)}")
+        self._logger.trace(__name__, f"Send SQL command: {ServerConfig.get_select_by_id_string(server_id)}")
-        result = self._context.select(ServerConfig.get_select_by_server_id_string(server_id))[0]
+        result = self._context.select(ServerConfig.get_select_by_id_string(server_id))[0]
 
         return self._from_result(result)
 

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

@@ -34,12 +34,29 @@ class ServerConfigSeeder(DataSeederABC):
                 if self._server_config.does_server_config_exists(server.id):
                     continue
 
-                config = ServerConfig.new(guild, server)
+                config = 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,
+                    server,
+                    [],
+                    [],
+                )
 
                 self._server_config.add_server_config(config)
 
                 self._db.save_changes()
-                self._logger.debug(__name__, "Seeded server config")
+                self._logger.debug(__name__, "Seeded technician config")
 
         except Exception as e:
-            self._logger.error(__name__, f"Seeding server config failed", e)
+            self._logger.error(__name__, f"Seeding technician config failed", e)

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

@@ -1,95 +0,0 @@
-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/technician_config_repository_service.py

@@ -1,5 +1,3 @@
-import json
-
 from cpl_core.database.context import DatabaseContextABC
 from cpl_query.extension import List
 
@@ -43,11 +41,10 @@ class TechnicianConfigRepositoryService(TechnicianConfigRepositoryABC):
             result[2],
             result[3],
             result[4],
-            json.loads(result[5]),
             self._get_technician_ids(),
             self._get_technician_ping_urls(),
+            result[5],
             result[6],
-            result[7],
             id=result[0],
         )
 

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

@@ -32,7 +32,6 @@ class TechnicianConfigSeeder(DataSeederABC):
                 8,
                 8,
                 1000000,
-                {},
                 List(int, [240160344557879316]),
                 List(str, ["www.google.com", "www.sh-edraft.de", "www.keksdose-gaming.de"]),
             )

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

@@ -51,19 +51,6 @@ 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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -2,15 +2,12 @@ from typing import Callable
 
 from ariadne import ObjectType
 from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_core.type import T
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 
 from bot_api.exception.service_error_code_enum import ServiceErrorCode
 from bot_api.exception.service_exception import ServiceException
 from bot_api.route.route import Route
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_data.model.achievement import Achievement
 from bot_data.model.auth_role_enum import AuthRoleEnum
 from bot_data.model.auth_user import AuthUser
 from bot_data.model.auto_role import AutoRole
@@ -19,8 +16,6 @@ from bot_data.model.client import Client
 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
@@ -70,35 +65,13 @@ class QueryABC(ObjectType):
         self.set_field(f"{name}s", wrapper)
         self.set_field(f"{name}Count", lambda *args: wrapper(*args).count())
 
-    def _can_user_see_element(self, user: AuthUser, element: T) -> bool:
+    @ServiceProviderABC.inject
-        @ServiceProviderABC.inject
+    def _can_user_see_element(self, user: AuthUser, element, services: ServiceProviderABC) -> bool:
-        def get_services(services: ServiceProviderABC) -> ServiceProviderABC:
-            return services
-
-        services = get_services()
         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:
+        if type(element) == AutoRole:
-            element: Achievement = 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) == AutoRole:
             element: AutoRole = element
             for u in user.users:
                 u: User = u
@@ -109,12 +82,12 @@ class QueryABC(ObjectType):
                     break
 
         elif type(element) == AutoRoleRule:
-            element: AutoRoleRule = element
+            element: AutoRole = 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.auto_role.server.id:
+                if permissions.is_member_moderator(member) and u.server.id == element.server.id:
                     access = True
                     break
 
@@ -184,34 +157,6 @@ class QueryABC(ObjectType):
                     access = True
                     break
 
-        elif type(element) == ServerConfig:
-            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_technician(member):
-                    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
-                guild = bot.get_guild(u.server.discord_id)
-                member = guild.get_member(u.discord_id)
-                if permissions.is_member_technician(member):
-                    access = True
-                    break
-
         return access
 
     @ServiceProviderABC.inject

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

@@ -3,8 +3,8 @@
     "Name": "bot-data",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "0",
-      "Micro": "9"
+      "Micro": "7"
     },
     "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 sh-edraft.de Discord bot
+bot Keksdose bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot for customers of sh-edraft.de
+Discord bot  for the Keksdose discord Server
 
 :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.9"
+__version__ = "1.0.7"
 
 from 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="9")
+version_info = VersionInfo(major="1", minor="0", micro="7")

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

@@ -1,70 +0,0 @@
-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