Fixed feature flag handling #393

kdb-bot/src/bot/bot.json

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

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

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

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

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

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

@@ -24,3 +24,4 @@ class FeatureFlagsEnum(Enum):
     game_server = "GameServer"
     sync_xp = "SyncXp"
     short_role_name = "ShortRoleName"
+    technician_full_access = "TechnicianFullAccess"

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

@@ -26,6 +26,7 @@ class FeatureFlagsSettings(ConfigurationModelABC):
         FeatureFlagsEnum.game_server.value: False,  # 25.09.2023 #366
         FeatureFlagsEnum.sync_xp.value: False,  # 25.09.2023 #366
         FeatureFlagsEnum.short_role_name.value: False,  # 28.09.2023 #378
+        FeatureFlagsEnum.technician_full_access.value: False,  # 03.10.2023 #393
     }
 
     def __init__(self, **kwargs: dict):

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

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

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

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

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

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

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

@@ -13,7 +13,6 @@ from bot_data.model.server_team_role_ids_config import ServerTeamRoleIdsConfig
 from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class ServerConfigMutation(QueryABC):
@@ -25,7 +24,6 @@ class ServerConfigMutation(QueryABC):
         server_configs: ServerConfigRepositoryABC,
         db: DatabaseContextABC,
         config_service: ConfigService,
-        permissions: PermissionServiceABC,
     ):
         QueryABC.__init__(self, "ServerConfigMutation")
 
@@ -35,7 +33,6 @@ class ServerConfigMutation(QueryABC):
         self._server_configs = server_configs
         self._db = db
         self._config_service = config_service
-        self._permissions = permissions
 
         self.set_field("updateServerConfig", self.resolve_update_server_config)
 
@@ -183,4 +180,3 @@ class ServerConfigMutation(QueryABC):
             self._server_configs.add_server_team_role_id_config(role_id)
 
         self._bot.loop.create_task(self._config_service.reload_server_config(new_config.server))
-        self._permissions.on_ready()

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

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

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

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

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

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

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

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

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

@@ -31,6 +31,17 @@ class BaseOnVoiceStateUpdateEventHelpChannel(OnVoiceStateUpdateABC):
 
         self._logger.info(__name__, f"Module {type(self)} loaded")
 
+    async def _notify_team(self, member: discord.Member):
+        self._logger.debug(__name__, f"Notify team that a member needs help")
+        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{member.guild.id}")
+        channel = member.guild.get_channel(settings.team_channel_id)
+        await self._message_service.send_channel_message(
+            channel,
+            self._t.transform("modules.base.member_joined_help_voice_channel").format(member.mention),
+            is_persistent=True,
+        )
+        self._logger.trace(__name__, f"Notified team that a member need help")
+
     @EventChecks.check_is_ready()
     async def on_voice_state_update(
         self,
@@ -44,14 +55,6 @@ class BaseOnVoiceStateUpdateEventHelpChannel(OnVoiceStateUpdateABC):
         if after.channel is None or after.channel.id != settings.help_voice_channel_id:
             return
 
-        mods = [
+        await self._notify_team(member)
-            *self._permissions.get_admins(member.guild.id),
-            *self._permissions.get_moderators(member.guild.id),
-        ]
-        for a in mods:
-            await self._message_service.send_dm_message(
-                self._t.transform("modules.base.member_joined_help_voice_channel").format(member.mention),
-                a,
-            )
 
         self._logger.debug(__name__, f"Module {type(self)} stopped")

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

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

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

@@ -67,7 +67,7 @@ class BootLogOnReadyEvent(OnReadyABC):
 
             server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{g.id}")
             if server_config is None:
-                self._logger.error(__name__, f"Config {type(self).__name__}_{g.id} not found!")
+                self._logger.error(__name__, f"Config ServerConfig_{g.id} not found!")
                 return
 
             if not FeatureFlagsSettings.get_flag_from_dict(

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

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

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

@@ -19,4 +19,4 @@ class ConfigExtension(ApplicationExtensionABC):
         logger: LoggerABC = services.get_service(LoggerABC)
         logger.debug(__name__, "Config extension started")
         config: ConfigService = services.get_service(ConfigService)
-        await config.reload_technician_config()
+        config.reload_technician_config()

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

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

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

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

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

@@ -8,42 +8,6 @@ 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.9"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="9")

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": "9"
+      "Micro": "10"
     },
     "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
 
 
@@ -22,8 +17,6 @@ class PermissionModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_singleton(PermissionServiceABC, PermissionService)
+        services.add_transient(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/permission_service.py

@@ -3,146 +3,72 @@ 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.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 _has_member_role(self, member: discord.Member, team_member_type: TeamMemberTypeEnum) -> bool:
-        self._admin_roles: dict[int, list[discord.Role]] = {}
+        if member is None or member.guild is None:
-        self._admins: dict[int, list[discord.Member]] = {}
+            return False
 
-        self._moderator_role_ids: dict[int, list[int]] = {}
+        self._logger.debug(__name__, f"Checking is member {member.name} {team_member_type.value}")
-        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()
+        try:
-        self._technicians: list[discord.Member] = []
+            server = self._servers.get_server_by_discord_id(member.guild.id)
-
+            config = self._server_configs.get_server_config_by_server(server.id)
-    def on_ready(self):
+            roles = config.team_role_ids.where(lambda x: x.team_member_type == team_member_type).select(
-        for guild in self._bot.guilds:
+                lambda x: member.guild.get_role(x.role_id)
-            guild: discord.Guild = guild
+            )
-            self._logger.debug(__name__, f"Validate permission settings")
+            for role in roles:
-
+                if role not in member.roles:
-            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}")
+                return True
-            if settings is None:
+        except Exception as e:
-                self._logger.error(__name__, "Server settings not found")
+            self._logger.error(__name__, "Permission check failed", e)
-                return
 
-            self._admin_role_ids[guild.id] = (
+        return False
-                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 = []
-
-            mod_roles = []
-            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]
-
-    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]
-
-    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 self._has_member_role(member, TeamMemberTypeEnum.admin)
 
     def is_member_moderator(self, member: discord.Member) -> bool:
-        return (
+        return self._has_member_role(member, TeamMemberTypeEnum.moderator) or self._has_member_role(
-            member is not None
+            member, TeamMemberTypeEnum.admin
-            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
+        if member is None or member.guild is None:
+            return False
+
+        self._logger.debug(__name__, f"Checking is member {member.name} technician")
+
+        try:
+            tech_config = self._technician_configs.get_technician_config()
+            if member.id in tech_config.technician_ids:
+                return True
+        except Exception as e:
+            self._logger.error(__name__, "Permission check failed", e)
+
+        return False

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

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

kdb-bot/tools/checks/checks.json

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

kdb-bot/tools/get_version/get-version.json

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

kdb-bot/tools/post_build/post-build.json

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

kdb-bot/tools/set_version/set-version.json

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

kdb-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "1.1.9",
+    "version": "1.1.10",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node update-version.ts",

kdb-web/src/app/modules/shared/guards/auth/auth.guard.ts

@@ -34,11 +34,11 @@ export class AuthGuard implements CanActivate {
 
     const role = route.data["role"];
     const memberRole = route.data["memberRole"];
+    const authUser = await this.authService.getLoggedInUser();
+    const isTechnician = (authUser?.users?.map(u => u.isTechnician).filter(u => u) ?? []).length > 0;
+
     if (role !== undefined) {
       this.authService.hasUserPermission(role).then(async hasPermission => {
-        let authUser = await this.authService.getLoggedInUser();
-        let isTechnician = authUser?.users?.map(u => u.isTechnician).filter(u => u) ?? [];
-
         if (!hasPermission && !isTechnician) {
           this.router.navigate(["/dashboard"]);
           return false;
@@ -49,12 +49,15 @@ export class AuthGuard implements CanActivate {
 
     if (memberRole !== undefined) {
       let userHasAccess = false;
-      let authUser = await this.authService.getLoggedInUser();
       let server = route.params["serverId"];
 
-      if (!authUser || !authUser.users) {
+      if (this.sidebarService.hasFeature("TechnicianFullAccess") && isTechnician) {
         return true;
       }
+
+      if (!authUser || !authUser.users) {
+        return false;
+      }
       authUser?.users?.forEach(u => {
         if (u.server === +(server ?? 0)) {
           if (

kdb-web/src/app/services/sidebar/sidebar.service.ts

@@ -192,21 +192,23 @@ export class SidebarService {
     this.authService.hasUserPermission(AuthRoles.Admin).then(async hasPermission => {
       let authUser = await this.authService.getLoggedInUser();
       let user: UserDTO | null = authUser?.users?.find(u => u.server == this.server?.id) ?? null;
-            let isTechnician = authUser?.users?.map(u => u.isTechnician).filter(u => u) ?? [];
+      let isTechnician = (authUser?.users?.map(u => u.isTechnician).filter(u => u) ?? []).length > 0;
+      let isTechnicianAndFullAccessActive = this.hasFeature("TechnicianFullAccess") && isTechnician;
+      console.log(this.hasFeature("TechnicianFullAccess"))
 
       if (build || this.menuItems$.value.length == 0) {
-                await this.buildMenu(user, hasPermission, isTechnician.length > 0);
+        await this.buildMenu(user, hasPermission, isTechnician);
       }
 
       if (this.server) {
         this.serverMenu.visible = true;
-                this.serverMembers.visible = !!user?.isModerator;
+        this.serverMembers.visible = isTechnicianAndFullAccessActive || user?.isModerator;
-                this.serverAutoRoles.visible = this.hasFeature("AutoRoleModule") ? !!user?.isModerator : false;
+        this.serverAutoRoles.visible = isTechnicianAndFullAccessActive || this.hasFeature("AutoRoleModule") && user?.isModerator;
-                this.serverLevels.visible = this.hasFeature("LevelModule") ? !!user?.isModerator : false;
+        this.serverLevels.visible = isTechnicianAndFullAccessActive || this.hasFeature("LevelModule") && user?.isModerator;
-                this.serverAchievements.visible = this.hasFeature("AchievementsModule") ? !!user?.isModerator : false;
+        this.serverAchievements.visible = isTechnicianAndFullAccessActive || this.hasFeature("AchievementsModule") && user?.isModerator;
-                this.serverShortRoleNames.visible = this.hasFeature("ShortRoleName") ? !!user?.isAdmin : false;
+        this.serverShortRoleNames.visible = isTechnicianAndFullAccessActive || this.hasFeature("ShortRoleName") && user?.isAdmin;
 
-                this.serverConfig.visible = !!user?.isAdmin || isTechnician.length > 0;
+        this.serverConfig.visible = isTechnicianAndFullAccessActive || user?.isAdmin;
       } else {
         this.serverMenu.visible = false;
       }
@@ -220,7 +222,7 @@ export class SidebarService {
     });
   }
 
-    private hasFeature(key: string): boolean {
+  public hasFeature(key: string): boolean {
     const flag = this.featureFlags.filter(flag => flag.key == key);
     if (flag.length == 0) {
       return false;

kdb-web/src/assets/version.json

@@ -2,6 +2,6 @@
   "WebVersion": {
     "Major": "1",
     "Minor": "1",
-    "Micro": "9"
+    "Micro": "10"
   }
 }