Cleaned and fixed permission service #393

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

docker-compose.staging.yml

@@ -5,8 +5,8 @@ volumes:
 
 services:
   kdb_bot_staging_1:
-    image: sh-edraft.de/kdb-bot:1.1.8
+    image: sh-edraft.de/kdb-bot:1.1.9
-    container_name: kdb_bot_staging_1
+    restart: unless-stopped
     depends_on:
       - kdb_db_staging_1
     networks:
@@ -25,15 +25,14 @@ services:
       mode: replicated
       replicas: 1
       placement:
-        constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         reservations:
           cpus: "0.5"
           memory: 1024M
 
   kdb_web_staging_1:
-    image: sh-edraft.de/kdb-web:1.1.8
+    image: sh-edraft.de/kdb-web:1.1.9
-    container_name: kdb_web_staging_1
     depends_on:
       - kdb_bot_staging_1
     networks:
@@ -47,7 +46,7 @@ services:
       mode: replicated
       replicas: 1
       placement:
-        constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         limits:
           cpus: "0.4"
@@ -58,7 +57,6 @@ services:
 
   kdb_db_staging_1:
     image: mysql:latest
-    container_name: kdb_db_staging_1
     command: mysqld --default-authentication-plugin=mysql_native_password --log_bin_trust_function_creators=1
     networks:
       - kdb_test
@@ -75,7 +73,7 @@ services:
       mode: replicated
       replicas: 1
       placement:
-        constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         reservations:
           cpus: "0.1"

docker-compose.yml

@@ -5,7 +5,8 @@ volumes:
 
 services:
   kdb_bot_prod_1:
-        image: sh-edraft.de/kdb-bot:1.1.8
+    image: sh-edraft.de/kdb-bot:1.1.9
+    restart: unless-stopped
     depends_on:
       - kdb_db_prod_1
     networks:
@@ -23,14 +24,14 @@ services:
       mode: replicated
       replicas: 1
       placement:
-            constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         reservations:
           cpus: "0.5"
           memory: 1024M
 
   kdb_web_prod_1:
-        image: sh-edraft.de/kdb-web:1.1.8
+    image: sh-edraft.de/kdb-web:1.1.9
     depends_on:
       - kdb_bot_prod_1
     networks:
@@ -44,7 +45,7 @@ services:
       mode: replicated
       replicas: 1
       placement:
-            constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         limits:
           cpus: "0.4"
@@ -72,7 +73,7 @@ services:
       mode: replicated
       replicas: 1
       placement:
-            constraints: [ node.role == manager ]
+        constraints: [node.role == manager]
       resources:
         reservations:
           cpus: "0.1"

kdb-bot/src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/bot/bot.json

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

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

@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/bot/startup_migration_extension.py

@@ -18,6 +18,7 @@ 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 (
@@ -54,3 +55,4 @@ class StartupMigrationExtension(StartupExtensionABC):
         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_api/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/bot_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -8,7 +8,6 @@ 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:
@@ -45,6 +44,3 @@ class ConfigService:
         self._config.add_configuration(
             f"{type(server_config).__name__}_{server_config.server.discord_id}", server_config
         )
-
-        permissions: PermissionServiceABC = self._services.get_service(PermissionServiceABC)
-        permissions.on_ready()

kdb-bot/src/bot_data/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `CFG_ServerHistory`
     `TeamChannelId`               BIGINT      NOT NULL,
     `LoginMessageChannelId`       BIGINT      NOT NULL,
     `DefaultRoleId`               BIGINT      NULL,
+    `ShortRoleNameSetOnlyHighest` BOOLEAN     NOT NULL DEFAULT FALSE,
     `FeatureFlags`                JSON        NULL     DEFAULT ('{}'),
     `ServerId`                    BIGINT      NOT NULL,
     `Deleted`                     BOOL                 DEFAULT FALSE,
@@ -44,6 +45,7 @@ BEGIN
                                      `TeamChannelId`,
                                      `LoginMessageChannelId`,
                                      `DefaultRoleId`,
+                                     `ShortRoleNameSetOnlyHighest`,
                                      `FeatureFlags`,
                                      `ServerId`,
                                      `DateFrom`,
@@ -63,6 +65,7 @@ BEGIN
             OLD.TeamChannelId,
             OLD.LoginMessageChannelId,
             OLD.DefaultRoleId,
+            OLD.ShortRoleNameSetOnlyHighest,
             OLD.FeatureFlags,
             OLD.ServerId,
             OLD.LastModifiedAt,
@@ -91,6 +94,7 @@ BEGIN
                                      `TeamChannelId`,
                                      `LoginMessageChannelId`,
                                      `DefaultRoleId`,
+                                     `ShortRoleNameSetOnlyHighest`,
                                      `ServerId`,
                                      `FeatureFlags`,
                                      `Deleted`,
@@ -111,6 +115,7 @@ BEGIN
             OLD.TeamChannelId,
             OLD.LoginMessageChannelId,
             OLD.DefaultRoleId,
+            OLD.ShortRoleNameSetOnlyHighest,
             OLD.FeatureFlags,
             OLD.ServerId,
             TRUE,

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -29,6 +29,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         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],
@@ -52,6 +53,8 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         self._team_channel_id = team_channel_id
         self._login_message_channel_id = login_message_channel_id
         self._default_role_id = default_role_id
+        self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role
+
         self._feature_flags = feature_flags
         self._server = server
         self._afk_channel_ids = afk_channel_ids
@@ -78,6 +81,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
             guild.system_channel.id,
             guild.system_channel.id,
             None,
+            False,
             {},
             server,
             List(int),
@@ -200,6 +204,14 @@ class ServerConfig(TableABC, ConfigurationModelABC):
     def default_role_id(self, value: int):
         self._default_role_id = value
 
+    @property
+    def short_role_name_only_set_highest_role(self) -> bool:
+        return self._short_role_name_only_set_highest_role
+
+    @short_role_name_only_set_highest_role.setter
+    def short_role_name_only_set_highest_role(self, value: bool):
+        self._short_role_name_only_set_highest_role = value
+
     @property
     def feature_flags(self) -> dict[FeatureFlagsEnum]:
         return self._feature_flags
@@ -273,6 +285,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
                     `DefaultRoleId`,
+                    `ShortRoleNameSetOnlyHighest`,
                     `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
@@ -290,6 +303,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {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}
                 );
@@ -315,6 +329,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

kdb-bot/src/bot_graphql/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -92,6 +92,11 @@ class ServerConfigMutation(QueryABC):
         server_config.default_role_id = (
             input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id
         )
+        server_config.short_role_name_only_set_highest_role = (
+            input["shortRoleNameOnlySetHighestRole"]
+            if "shortRoleNameOnlySetHighestRole" in input
+            else server_config.short_role_name_only_set_highest_role
+        )
         server_config.feature_flags = (
             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
             if "featureFlags" in input
@@ -178,4 +183,3 @@ class ServerConfigMutation(QueryABC):
             self._server_configs.add_server_team_role_id_config(role_id)
 
         self._bot.loop.create_task(self._config_service.reload_server_config(new_config.server))
-        self._permissions.on_ready()

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

@@ -12,7 +12,6 @@ from bot_data.model.technician_id_config import TechnicianIdConfig
 from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class TechnicianConfigMutation(QueryABC):
@@ -23,7 +22,6 @@ class TechnicianConfigMutation(QueryABC):
         servers: ServerRepositoryABC,
         technician_configs: TechnicianConfigRepositoryABC,
         db: DatabaseContextABC,
-        permissions: PermissionServiceABC,
         config_service: ConfigService,
     ):
         QueryABC.__init__(self, "TechnicianConfigMutation")
@@ -33,7 +31,6 @@ class TechnicianConfigMutation(QueryABC):
         self._servers = servers
         self._technician_configs = technician_configs
         self._db = db
-        self._permissions = permissions
         self._config_service = config_service
 
         self.set_field("updateTechnicianConfig", self.resolve_update_technician_config)
@@ -114,4 +111,3 @@ class TechnicianConfigMutation(QueryABC):
             self._technician_configs.add_technician_id_config(TechnicianIdConfig(technician_id))
 
         self._bot.loop.create_task(self._config_service.reload_technician_config())
-        self._permissions.on_ready()

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

kdb-bot/src/modules/achievements/__init__.py

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

kdb-bot/src/modules/achievements/achievements.json

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

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

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

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

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

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

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

kdb-bot/src/modules/auto_role/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

kdb-bot/src/modules/auto_role/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/auto_role/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/auto_role/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/base/__init__.py

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

kdb-bot/src/modules/base/base.json

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

kdb-bot/src/modules/base/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/base/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

kdb-bot/src/modules/base/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/base/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/base/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.base.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "modules.base.thread"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/boot_log/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.boot_log"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

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

kdb-bot/src/modules/config/__init__.py

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

kdb-bot/src/modules/config/config.json

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

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

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

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

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

kdb-bot/src/modules/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.database"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/database/database.json

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

kdb-bot/src/modules/level/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/level/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/level/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/level/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.level.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/level/level.json

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

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

@@ -15,7 +15,7 @@ __title__ = "modules.level.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/permission/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.permission"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

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

@@ -15,7 +15,7 @@ __title__ = "modules.permission.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/permission/abc/permission_service_abc.py

@@ -8,42 +8,14 @@ class PermissionServiceABC(ABC):
     def __init__(self):
         pass
 
-    @abstractmethod
-    def on_ready(self):
-        pass
-
-    @abstractmethod
-    def on_member_update(self, before: discord.Member, after: discord.Member):
-        pass
-
-    @abstractmethod
-    def get_admin_role_ids(self, g_id: int) -> list[int]:
-        pass
-
-    @abstractmethod
-    def get_admin_roles(self, g_id: int) -> list[discord.Role]:
-        pass
-
     @abstractmethod
     def get_admins(self, g_id: int) -> list[discord.Member]:
         pass
 
-    @abstractmethod
-    def get_moderator_role_ids(self, g_id: int) -> list[int]:
-        pass
-
-    @abstractmethod
-    def get_moderator_roles(self, g_id: int) -> list[discord.Role]:
-        pass
-
     @abstractmethod
     def get_moderators(self, g_id: int) -> list[discord.Member]:
         pass
 
-    @abstractmethod
-    def get_technicians(self) -> list[discord.Member]:
-        pass
-
     @abstractmethod
     def is_member_admin(self, member: discord.Member) -> bool:
         pass

kdb-bot/src/modules/permission/events/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-bot sh-edraft.de Discord bot
-~~~~~~~~~~~~~~~~~~~
-
-Discord bot for customers of sh-edraft.de
-
-:copyright: (c) 2022 - 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "modules.permission.events"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="8")

kdb-bot/src/modules/permission/events/permission_on_member_update_event.py

@@ -1,30 +0,0 @@
-import discord
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.logging import LoggerABC
-from cpl_discord.events import OnMemberUpdateABC
-
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-
-
-class PermissionOnMemberUpdateEvent(OnMemberUpdateABC):
-    def __init__(self, config: ConfigurationABC, logger: LoggerABC, permission_service: PermissionServiceABC):
-        OnMemberUpdateABC.__init__(self)
-        self._config = config
-        self._logger = logger
-        self._permission_service = permission_service
-
-    async def on_member_update(self, before: discord.Member, after: discord.Member):
-        if before.guild is not None:
-            server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{before.guild.id}")
-            if not FeatureFlagsSettings.get_flag_from_dict(
-                server_config.feature_flags, FeatureFlagsEnum.permission_module
-            ):
-                return
-
-        self._logger.debug(__name__, f"Module {type(self)} started")
-
-        if before.roles != after.roles:
-            self._permission_service.on_member_update(before, after)

kdb-bot/src/modules/permission/events/permission_on_ready_event.py

@@ -1,22 +0,0 @@
-from cpl_core.logging import LoggerABC
-from cpl_discord.events import OnReadyABC
-
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_data.model.technician_config import TechnicianConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-
-
-class PermissionOnReadyEvent(OnReadyABC):
-    def __init__(self, logger: LoggerABC, permission_service: PermissionServiceABC, tech_config: TechnicianConfig):
-        OnReadyABC.__init__(self)
-        self._logger = logger
-        self._permission_service = permission_service
-        self._tech_config = tech_config
-
-    async def on_ready(self):
-        if not FeatureFlagsSettings.get_flag_from_dict(
-            self._tech_config.feature_flags, FeatureFlagsEnum.permission_module
-        ):
-            return
-        self._permission_service.on_ready()

kdb-bot/src/modules/permission/permission.json

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

kdb-bot/src/modules/permission/permission_module.py

@@ -1,16 +1,11 @@
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceCollectionABC
 from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
 from bot_core.abc.module_abc import ModuleABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
-from modules.permission.events.permission_on_member_update_event import (
-    PermissionOnMemberUpdateEvent,
-)
-from modules.permission.events.permission_on_ready_event import PermissionOnReadyEvent
 from modules.permission.service.permission_service import PermissionService
 
 
@@ -25,5 +20,3 @@ class PermissionModule(ModuleABC):
         services.add_singleton(PermissionServiceABC, PermissionService)
         # commands
         # events
-        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, PermissionOnReadyEvent)
-        self._dc.add_event(DiscordEventTypesEnum.on_member_update.value, PermissionOnMemberUpdateEvent)

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

@@ -15,7 +15,7 @@ __title__ = "modules.permission.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")

kdb-bot/src/modules/permission/service/permission_service.py

@@ -3,146 +3,55 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.service import DiscordBotServiceABC
 
-from bot_data.model.server_config import ServerConfig
+from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
+from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
 from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
-from bot_data.model.technician_config import TechnicianConfig
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class PermissionService(PermissionServiceABC):
     def __init__(
         self,
-        technician_settings: TechnicianConfig,
         logger: LoggerABC,
         bot: DiscordBotServiceABC,
         config: ConfigurationABC,
+        servers: ServerRepositoryABC,
+        server_configs: ServerConfigRepositoryABC,
+        technician_configs: TechnicianConfigRepositoryABC,
     ):
         PermissionServiceABC.__init__(self)
         self._logger = logger
         self._bot = bot
         self._config = config
-        self._technician_settings = technician_settings
+        self._servers = servers
+        self._server_configs = server_configs
+        self._technician_configs = technician_configs
 
-        self._admin_role_ids: dict[int, list[int]] = {}
+    def _team_role_members(self, guild_id: int, team_role_type: TeamMemberTypeEnum):
-        self._admin_roles: dict[int, list[discord.Role]] = {}
+        guild = self._bot.get_guild(guild_id)
-        self._admins: dict[int, list[discord.Member]] = {}
+        server = self._servers.get_server_by_discord_id(guild_id)
-
+        config = self._server_configs.get_server_config_by_server(server.id)
-        self._moderator_role_ids: dict[int, list[int]] = {}
-        self._moderator_roles: dict[int, list[discord.Role]] = {}
-        self._moderators: dict[int, list[discord.Member]] = {}
-
-        self._technician_ids: list[int] = technician_settings.technician_ids.to_list()
-        self._technicians: list[discord.Member] = []
-
-    def on_ready(self):
-        for guild in self._bot.guilds:
-            guild: discord.Guild = guild
-            self._logger.debug(__name__, f"Validate permission settings")
-
-            for technician_id in self._technician_ids:
-                technician = guild.get_member(technician_id)
-                if technician is None:
-                    continue
-                self._technicians.append(technician)
-
-            settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
-            if settings is None:
-                self._logger.error(__name__, "Server settings not found")
-                return
-
-            self._admin_role_ids[guild.id] = (
-                settings.team_role_ids.where(lambda x: x.team_member_type == TeamMemberTypeEnum.admin)
-                .select(lambda x: x.role_id)
-                .to_list()
-            )
-            self._moderator_role_ids[guild.id] = (
-                settings.team_role_ids.where(lambda x: x.team_member_type == TeamMemberTypeEnum.moderator)
-                .select(lambda x: x.role_id)
-                .to_list()
-            )
-
-            admin_roles = []
         admins = []
+        for role_id in config.team_role_ids.where(lambda x: x.team_member_type == team_role_type):
+            role_id: ServerTeamRoleIdsConfig = role_id
+            admins = guild.get_role(role_id.role_id).members
 
-            mod_roles = []
+        return admins
-            mods = []
-
-            for role in guild.roles:
-                role: discord.Role = role
-
-                if role.id in self._admin_role_ids[guild.id]:
-                    admin_roles.append(role)
-                    self._logger.trace(__name__, f"Added admin role {role}")
-
-                    for member in role.members:
-                        admins.append(member)
-                        self._logger.trace(__name__, f"Added admin {member}")
-
-                if role.id in self._moderator_role_ids[guild.id]:
-                    mod_roles.append(role)
-                    self._logger.trace(__name__, f"Added moderator role {role}")
-
-                    for member in role.members:
-                        mods.append(member)
-                        self._logger.trace(__name__, f"Added moderator {member}")
-
-            self._admin_roles[guild.id] = admin_roles
-            self._admins[guild.id] = admins
-            self._moderator_roles[guild.id] = mod_roles
-            self._moderators[guild.id] = mods
-
-    def on_member_update(self, before: discord.Member, after: discord.Member):
-        g_id = after.guild.id
-
-        for admin_role in self._admin_roles[g_id]:
-            if admin_role in before.roles and admin_role not in after.roles:
-                self._admins[g_id].remove(after)
-                self._logger.trace(__name__, f"Removed {after.id} from admins")
-
-            elif admin_role in after.roles and admin_role not in before.roles:
-                self._admins[g_id].append(after)
-                self._logger.trace(__name__, f"Added {after.id} to admins")
-
-        for moderator_role in self._moderator_roles[g_id]:
-            if moderator_role in before.roles and moderator_role not in after.roles:
-                self._moderators[g_id].remove(after)
-                self._logger.trace(__name__, f"Removed {after.id} from moderators")
-
-            elif moderator_role in after.roles and moderator_role not in before.roles:
-                self._moderators[g_id].append(after)
-                self._logger.trace(__name__, f"Added {after.id} to moderators")
-
-    def get_admin_role_ids(self, g_id: int) -> list[int]:
-        return self._admin_role_ids[g_id]
-
-    def get_admin_roles(self, g_id: int) -> list[discord.Role]:
-        return self._admin_roles[g_id]
 
     def get_admins(self, g_id: int) -> list[discord.Member]:
-        return self._admins[g_id]
+        return self._team_role_members(g_id, TeamMemberTypeEnum.admin)
-
-    def get_moderator_role_ids(self, g_id: int) -> list[int]:
-        return self._moderator_role_ids[g_id]
-
-    def get_moderator_roles(self, g_id: int) -> list[discord.Role]:
-        return self._moderator_roles[g_id]
 
     def get_moderators(self, g_id: int) -> list[discord.Member]:
-        return self._moderators[g_id]
+        return self._team_role_members(g_id, TeamMemberTypeEnum.moderator)
-
-    def get_technicians(self) -> list[discord.Member]:
-        return self._technicians
 
     def is_member_admin(self, member: discord.Member) -> bool:
-        return member is not None and member.guild.id in self._admins and member in self._admins[member.guild.id]
+        return member in self.get_admins(member.guild.id)
 
     def is_member_moderator(self, member: discord.Member) -> bool:
-        return (
+        return member in self.get_admins(member.guild.id) or member in self.get_moderators(member.guild.id)
-            member is not None
-            and member.guild.id in self._moderators
-            and member in self._moderators[member.guild.id]
-            or self.is_member_admin(member)
-        )
 
     def is_member_technician(self, member: discord.Member) -> bool:
-        return member is not None and member in self._technicians
+        config = self._technician_configs.get_technician_config()
+        return str(member.id) in config.technician_ids.select(lambda x: str(x))

kdb-bot/src/modules/short_role_name/__init__.py

@@ -15,7 +15,7 @@ __title__ = "modules.short_role_name"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.8"
+__version__ = "1.1.9"
 
 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="8")
+version_info = VersionInfo(major="1", minor="1", micro="9")