Improved permission loading #446

bot/src/modules/auto_role/command/auto_role_group.py

@@ -22,7 +22,7 @@ from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.auto_role import AutoRole
 from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class AutoRoleGroup(DiscordCommandABC):

bot/src/modules/base/command/game_server_group.py

@@ -23,7 +23,7 @@ from bot_data.abc.user_game_ident_repository_abc import UserGameIdentRepositoryA
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.game_server import GameServer
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class GameServerGroup(DiscordCommandABC):

bot/src/modules/base/command/ping_command.py

@@ -11,7 +11,7 @@ from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.technician_config import TechnicianConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class PingCommand(DiscordCommandABC):

bot/src/modules/base/command/purge_command.py

@@ -11,7 +11,7 @@ from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class PurgeCommand(DiscordCommandABC):

bot/src/modules/base/command/user_group.py

@@ -27,7 +27,7 @@ from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC
 from bot_data.model.server_config import ServerConfig
 from modules.base.service.user_warnings_service import UserWarningsService
 from modules.level.service.level_service import LevelService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class UserGroup(DiscordCommandABC):

bot/src/modules/base/events/base_on_member_join_event.py

@@ -20,7 +20,7 @@ from bot_data.model.known_user import KnownUser
 from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_joined_server import UserJoinedServer
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class BaseOnMemberJoinEvent(OnMemberJoinABC):

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

@@ -8,7 +8,7 @@ from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class BaseOnVoiceStateUpdateEventHelpChannel(OnVoiceStateUpdateABC):

bot/src/modules/base/service/user_warnings_service.py

@@ -14,7 +14,7 @@ from bot_data.model.server_config import ServerConfig
 from bot_data.model.user import User
 from bot_data.model.user_warnings import UserWarnings
 from modules.level.service.level_service import LevelService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class UserWarningsService:

bot/src/modules/level/command/level_group.py

@@ -24,7 +24,7 @@ from bot_data.model.level import Level
 from bot_data.model.server_config import ServerConfig
 from modules.level.level_seeder import LevelSeeder
 from modules.level.service.level_service import LevelService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class LevelGroup(DiscordCommandABC):

bot/src/modules/level/service/level_service.py

@@ -6,6 +6,8 @@ from cpl_discord.container import Guild, Role, Member
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.service.message_service import MessageService
 from bot_data.model.level import Level
 from bot_data.model.server_config import ServerConfig
@@ -38,7 +40,14 @@ class LevelService:
         self._message_service = message_service
         self._t = t
 
+    def _check_for_feature(self, user: User):
+        server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{user.server.discord_id}")
+        if not FeatureFlagsSettings.get_flag_from_dict(server_config.feature_flags, FeatureFlagsEnum.level_module):
+            raise Exception(f"Feature {FeatureFlagsEnum.level_module.value} disabled")
+
     def get_level(self, user: User) -> Level:
+        self._check_for_feature(user)
+
         levels_by_server = self._levels.get_levels_by_server_id(user.server.id)
         if user.xp < 0:
             return levels_by_server.order_by(lambda l: l.min_xp).first()
@@ -51,6 +60,7 @@ class LevelService:
         return levels.last()
 
     async def set_level(self, user: User):
+        self._check_for_feature(user)
         level_names = self._levels.get_levels_by_server_id(user.server.id).select(lambda l: l.name)
         guild: Guild = self._bot.guilds.where(lambda g: g.id == user.server.discord_id).single()
         member: Member = guild.members.where(lambda m: m.id == user.discord_id).single()

bot/src/modules/permission/__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"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.2"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="2")

bot/src/modules/permission/abc/__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.abc"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.2"
-
-from collections import namedtuple
-
-
-# imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="2")

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

@@ -1,21 +0,0 @@
-from abc import ABC, abstractmethod
-
-import discord
-
-
-class PermissionServiceABC(ABC):
-    @abstractmethod
-    def __init__(self):
-        pass
-
-    @abstractmethod
-    def is_member_admin(self, member: discord.Member) -> bool:
-        pass
-
-    @abstractmethod
-    def is_member_moderator(self, member: discord.Member) -> bool:
-        pass
-
-    @abstractmethod
-    def is_member_technician(self, member: discord.Member) -> bool:
-        pass

bot/src/modules/permission/permission.json

@@ -1,44 +0,0 @@
-{
-  "ProjectSettings": {
-    "Name": "permission",
-    "Version": {
-      "Major": "1",
-      "Minor": "2",
-      "Micro": "2"
-    },
-    "Author": "",
-    "AuthorEmail": "",
-    "Description": "",
-    "LongDescription": "",
-    "URL": "",
-    "CopyrightDate": "",
-    "CopyrightName": "",
-    "LicenseName": "",
-    "LicenseDescription": "",
-    "Dependencies": [
-      "cpl-core==2022.12.0"
-    ],
-    "DevDependencies": [
-      "cpl-cli==2022.12.0"
-    ],
-    "PythonVersion": ">=3.10.4",
-    "PythonPath": {},
-    "Classifiers": []
-  },
-  "BuildSettings": {
-    "ProjectType": "library",
-    "SourcePath": "",
-    "OutputPath": "../../dist",
-    "Main": "permission.main",
-    "EntryPoint": "permission",
-    "IncludePackageData": false,
-    "Included": [],
-    "Excluded": [
-      "*/__pycache__",
-      "*/logs",
-      "*/tests"
-    ],
-    "PackageData": {},
-    "ProjectReferences": []
-  }
-}

bot/src/modules/permission/permission_module.py

@@ -1,22 +0,0 @@
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceCollectionABC
-from cpl_core.environment import ApplicationEnvironmentABC
-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.service.permission_service import PermissionService
-
-
-class PermissionModule(ModuleABC):
-    def __init__(self, dc: DiscordCollectionABC):
-        ModuleABC.__init__(self, dc, FeatureFlagsEnum.permission_module)
-
-    def configure_configuration(self, config: ConfigurationABC, env: ApplicationEnvironmentABC):
-        pass
-
-    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(PermissionServiceABC, PermissionService)
-        # commands
-        # events

bot/src/modules/permission/service/__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.service"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.2"
-
-from collections import namedtuple
-
-
-# imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="2")

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

@@ -1,74 +0,0 @@
-import discord
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.logging import LoggerABC
-from cpl_discord.service import DiscordBotServiceABC
-
-from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
-from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.technician_config_repository_abc import TechnicianConfigRepositoryABC
-from bot_data.model.team_member_type_enum import TeamMemberTypeEnum
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-
-
-class PermissionService(PermissionServiceABC):
-    def __init__(
-        self,
-        logger: LoggerABC,
-        bot: DiscordBotServiceABC,
-        config: ConfigurationABC,
-        servers: ServerRepositoryABC,
-        server_configs: ServerConfigRepositoryABC,
-        technician_configs: TechnicianConfigRepositoryABC,
-    ):
-        PermissionServiceABC.__init__(self)
-        self._logger = logger
-        self._bot = bot
-        self._config = config
-        self._servers = servers
-        self._server_configs = server_configs
-        self._technician_configs = technician_configs
-
-    def _has_member_role(self, member: discord.Member, team_member_type: TeamMemberTypeEnum) -> bool:
-        if member is None or member.guild is None:
-            return False
-
-        self._logger.debug(__name__, f"Checking is member {member.name} {team_member_type.value}")
-
-        try:
-            server = self._servers.get_server_by_discord_id(member.guild.id)
-            config = self._server_configs.get_server_config_by_server(server.id)
-            roles = config.team_role_ids.where(lambda x: x.team_member_type == team_member_type).select(
-                lambda x: member.guild.get_role(x.role_id)
-            )
-            for role in roles:
-                if role not in member.roles:
-                    continue
-
-                return True
-        except Exception as e:
-            self._logger.error(__name__, "Permission check failed", e)
-
-        return False
-
-    def is_member_admin(self, member: discord.Member) -> bool:
-        return self._has_member_role(member, TeamMemberTypeEnum.admin)
-
-    def is_member_moderator(self, member: discord.Member) -> bool:
-        return self._has_member_role(member, TeamMemberTypeEnum.moderator) or self._has_member_role(
-            member, TeamMemberTypeEnum.admin
-        )
-
-    def is_member_technician(self, member: discord.Member) -> bool:
-        if member is None or member.guild is None:
-            return False
-
-        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

bot/src/modules/short_role_name/short_role_name_check_command.py

@@ -11,7 +11,7 @@ from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.model.server_config import ServerConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 from modules.short_role_name.service.short_role_name_service import ShortRoleNameService
 
 

bot/src/modules/technician/command/api_key_group.py

@@ -20,7 +20,7 @@ from bot_data.abc.api_key_repository_abc import ApiKeyRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.api_key import ApiKey
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class ApiKeyGroup(DiscordCommandABC):

bot/src/modules/technician/command/log_command.py

@@ -1,5 +1,4 @@
 import os
-from string import Template
 from zipfile import ZipFile
 
 import discord
@@ -18,7 +17,7 @@ from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class LogCommand(DiscordCommandABC):

bot/src/modules/technician/command/restart_command.py

@@ -13,7 +13,7 @@ from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_data.model.technician_config import TechnicianConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class RestartCommand(DiscordCommandABC):

bot/src/modules/technician/command/shutdown_command.py

@@ -13,7 +13,7 @@ from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_data.model.technician_config import TechnicianConfig
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class ShutdownCommand(DiscordCommandABC):

bot/src/modules/technician/command/sync_xp_command.py

@@ -20,7 +20,7 @@ from bot_data.model.server_config import ServerConfig
 from bot_data.model.technician_config import TechnicianConfig
 from bot_data.model.user import User
 from modules.level.service.level_service import LevelService
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
+from bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class SyncXpGroup(DiscordCommandABC):