Merge pull request 'Removed native password & disable ssl' (#454) from staging into master

Reviewed-on: #454

.gitea/workflows/deploy_dev.yaml

@@ -6,17 +6,9 @@ on:
       - dev
 
 jobs:
-  pre-build:
+  on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Shutdown stack
-        run: docker stack rm sdb_dev
-
-  build-bot:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    container: sh-edraft.de/act-runner:latest
     steps:
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
@@ -30,44 +22,10 @@ jobs:
 
       - name: Prepare bot build
         run: |
+          cd bot
           python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
-          cd bot
           cpl i
 
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd bot
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev
-
-  build-web:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Setup docker
-        uses: https://github.com/papodaca/install-docker-action@main
-      - run: docker -v
-
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
       - name: Setup node
         uses: https://github.com/actions/setup-node@v3
 
@@ -77,45 +35,29 @@ jobs:
           npm install -g ts-node
           npm ci
 
+      - name: Shutdown stack
+        run: docker stack rm sdb_dev
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-dev .
+
       - name: Build docker web
         run: |
           cd web
           docker image prune -f
           cp src/favicon.dev.ico src/favicon.ico
           npm run build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd web
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev
-
-  deploy:
-    needs: [ build-bot, build-web ]
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
-      - name: Install cpl
-        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
 
       - name: Set version
         run: |
           cd bot/docker
           chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
 
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1

.gitea/workflows/deploy_prod.yaml

@@ -6,17 +6,9 @@ on:
       - master
 
 jobs:
-  pre-build:
+  on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Shutdown stack
-        run: docker stack rm sdb_prod
-
-  build-bot:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    container: sh-edraft.de/act-runner:latest
     steps:
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
@@ -30,44 +22,10 @@ jobs:
 
       - name: Prepare bot build
         run: |
+          cd bot
           python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
-          cd bot
           cpl i
 
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv) .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd bot
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)
-
-  build-web:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Setup docker
-        uses: https://github.com/papodaca/install-docker-action@main
-      - run: docker -v
-
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
       - name: Setup node
         uses: https://github.com/actions/setup-node@v3
 
@@ -77,45 +35,28 @@ jobs:
           npm install -g ts-node
           npm ci
 
+      - name: Shutdown stack
+        run: docker stack rm sdb_prod
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .
+
       - name: Build docker web
         run: |
           cd web
           docker image prune -f
-          cp src/favicon.ico src/favicon.ico
           npm run build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv) .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd web
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)
-
-  deploy:
-    needs: [ build-bot, build-web ]
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
-      - name: Install cpl
-        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
 
       - name: Set version
         run: |
           cd bot/docker
           chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv) sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)
 
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1

.gitea/workflows/deploy_staging.yaml

@@ -6,17 +6,9 @@ on:
       - staging
 
 jobs:
-  pre-build:
+  on-push-deploy_sh-edraft:
     runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Shutdown stack
-        run: docker stack rm sdb_staging
-
-  build-bot:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    container: sh-edraft.de/act-runner:latest
     steps:
       - name: Setup docker
         uses: https://github.com/papodaca/install-docker-action@main
@@ -30,44 +22,10 @@ jobs:
 
       - name: Prepare bot build
         run: |
+          cd bot
           python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
-          cd bot
           cpl i
 
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd bot
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging
-
-  build-web:
-    needs: pre-build
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Setup docker
-        uses: https://github.com/papodaca/install-docker-action@main
-      - run: docker -v
-
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
       - name: Setup node
         uses: https://github.com/actions/setup-node@v3
 
@@ -77,45 +35,29 @@ jobs:
           npm install -g ts-node
           npm ci
 
+      - name: Shutdown stack
+        run: docker stack rm sdb_staging
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-staging .
+
       - name: Build docker web
         run: |
           cd web
           docker image prune -f
           cp src/favicon.staging.ico src/favicon.ico
           npm run build
-          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
-
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          cd web
-          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging
-
-  deploy:
-    needs: [ build-bot, build-web ]
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
-      - name: Install cpl
-        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
 
       - name: Set version
         run: |
           cd bot/docker
           chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
 
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1

bot/src/bot/bot.json

@@ -33,8 +33,7 @@
       "cryptography==41.0.4",
       "discord==2.3.2",
       "bs4==0.0.1",
-      "lxml==4.9.3",
-      "python-valve==0.2.1"
+      "lxml==4.9.3"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",

bot/src/bot/startup.py

@@ -15,7 +15,6 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.logging.database_logger import DatabaseLogger
-from bot_core.logging.event_logger import EventLogger
 from bot_core.logging.message_logger import MessageLogger
 from bot_core.logging.task_logger import TaskLogger
 from bot_data.db_context import DBContext
@@ -46,7 +45,6 @@ class Startup(StartupABC):
             services.add_singleton(CustomFileLoggerABC, DatabaseLogger)
             services.add_singleton(CustomFileLoggerABC, MessageLogger)
             services.add_singleton(CustomFileLoggerABC, TaskLogger)
-            services.add_singleton(CustomFileLoggerABC, EventLogger)
 
         if self._feature_flags.get_flag(FeatureFlagsEnum.api_module):
             services.add_singleton(CustomFileLoggerABC, ApiLogger)

bot/src/bot_core/core_extension/core_extension_on_ready_event.py

@@ -1,18 +1,20 @@
+import asyncio
+
 from cpl_core.configuration import ConfigurationABC
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.environment_variables import MAINTENANCE
-from bot_core.logging.event_logger import EventLogger
 
 
 class CoreExtensionOnReadyEvent(OnReadyABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         client_utils: ClientUtilsABC,
         t: TranslatePipe,

bot/src/bot_core/events/core_on_ready_event.py

@@ -1,15 +1,15 @@
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
-from bot_core.logging.event_logger import EventLogger
 
 
 class CoreOnReadyEvent(OnReadyABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         client_utils: ClientUtilsABC,
         t: TranslatePipe,

bot/src/bot_core/logging/event_logger.py

@@ -1,15 +0,0 @@
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.environment import ApplicationEnvironmentABC
-from cpl_core.time import TimeFormatSettings
-
-from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
-
-
-class EventLogger(CustomFileLoggerABC):
-    def __init__(
-        self,
-        config: ConfigurationABC,
-        time_format: TimeFormatSettings,
-        env: ApplicationEnvironmentABC,
-    ):
-        CustomFileLoggerABC.__init__(self, "Event", config, time_format, env)

bot/src/bot_data/model/user.py

@@ -168,13 +168,6 @@ class User(TableABC):
         game_idents_repo: UserGameIdentRepositoryABC = services.get_service(UserGameIdentRepositoryABC)
         return game_idents_repo.get_user_game_idents_by_user_id(self.id)
 
-    @property
-    @ServiceProviderABC.inject
-    def profile_picture_url(self, bot: DiscordBotServiceABC) -> str:
-        guild = bot.get_guild(self.server.discord_id)
-        user = guild.get_member(self._discord_id)
-        return None if user is None else user.avatar.url
-
     @staticmethod
     def get_select_all_string() -> str:
         return str(

bot/src/bot_graphql/graphql/user.gql

@@ -11,8 +11,6 @@ type User implements TableWithHistoryQuery {
     level: Level
     activityScore: Int
 
-    profilePictureURL: String
-
     joinedServers(filter: UserJoinedServerFilter, page: Page, sort: Sort): [UserJoinedServer]
     joinedServerCount: Int
 

bot/src/bot_graphql/mutations/user_joined_game_server_mutation.py

@@ -11,7 +11,6 @@ from flask import request
 from bot_api.configuration.authentication_settings import AuthenticationSettings
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_core.service.permission_service import PermissionService
 from bot_data.abc.api_key_repository_abc import ApiKeyRepositoryABC
 from bot_data.abc.game_server_repository_abc import GameServerRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -25,6 +24,7 @@ from bot_data.model.server_config import ServerConfig
 from bot_data.model.user_joined_game_server import UserJoinedGameServer
 from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
+from bot_core.service.permission_service import PermissionService
 
 
 class UserJoinedGameServerMutation(QueryABC):
@@ -79,10 +79,7 @@ class UserJoinedGameServerMutation(QueryABC):
         )
 
     def resolve_user_joined(self, *_, input: dict):
-        game_ident = self._user_game_idents.find_user_game_ident_by_ident(input["ident"])
-        if game_ident is None:
-            return
-
+        game_ident = self._user_game_idents.get_user_game_ident_by_ident(input["ident"])
         user = game_ident.user
 
         settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{user.server.discord_id}")

bot/src/bot_graphql/mutations/user_mutation.py

@@ -4,7 +4,6 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
 
 from bot_api.route.route import Route
-from bot_core.service.permission_service import PermissionService
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -14,6 +13,7 @@ from bot_data.model.user_role_enum import UserRoleEnum
 from bot_graphql.abc.query_abc import QueryABC
 from modules.base.service.user_warnings_service import UserWarningsService
 from modules.level.service.level_service import LevelService
+from bot_core.service.permission_service import PermissionService
 
 
 class UserMutation(QueryABC):
@@ -50,7 +50,7 @@ class UserMutation(QueryABC):
         member = self._bot.get_guild(user.server.discord_id).get_member(
             auth_user.users.where(lambda x: x.server.id == user.server.id).single().discord_id
         )
-        if self._permissions.is_member_moderator(member) or member.id != user.discord_id:
+        if member.id != user.discord_id:
             self._can_user_mutate_data(user.server, UserRoleEnum.moderator)
 
             new_xp = None

bot/src/bot_graphql/queries/user_query.py

@@ -88,4 +88,3 @@ class UserQuery(DataQueryWithHistoryABC):
 
         self.set_field("server", lambda user, *_: user.server)
         self.set_field("leftServer", lambda user, *_: user.left_server)
-        self.set_field("profilePictureURL", lambda user, *_: user.profile_picture_url)

bot/src/modules/base/base_module.py

@@ -62,8 +62,8 @@ class BaseModule(ModuleABC):
         services.add_transient(BaseReactionHandler)
         services.add_singleton(EventService)
         services.add_transient(UserWarningsService)
-        services.add_transient(TaskABC, BirthdayWatcher)
-        services.add_transient(TaskABC, ScheduledEventsWatcher)
+        services.add_singleton(TaskABC, BirthdayWatcher)
+        services.add_singleton(TaskABC, ScheduledEventsWatcher)
 
         # forms
         services.add_transient(BugReportForm)

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

@@ -9,7 +9,6 @@ from cpl_translation import TranslatePipe
 from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
-from valve.steam.id import SteamID
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.abc.message_service_abc import MessageServiceABC
@@ -51,17 +50,6 @@ class RegisterGroup(DiscordCommandABC):
 
         self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
 
-    async def _game_server_autocomplete(
-        self, interaction: discord.Interaction, current: str
-    ) -> TList[app_commands.Choice[str]]:
-        server = self._servers.get_server_by_discord_id(interaction.guild.id)
-        game_servers = self._game_server.get_game_servers_by_server_id(server.id)
-
-        return [
-            app_commands.Choice(name=gs.name, value=gs.id)
-            for gs in self._client_utils.get_auto_complete_list(game_servers, current, lambda x: x.name)
-        ]
-
     @commands.hybrid_group()
     @commands.guild_only()
     async def register(self, ctx: Context):
@@ -113,44 +101,10 @@ class RegisterGroup(DiscordCommandABC):
     async def game_server_autocomplete(
         self, interaction: discord.Interaction, current: str
     ) -> TList[app_commands.Choice[str]]:
-        return await self._game_server_autocomplete(interaction, current)
+        server = self._servers.get_server_by_discord_id(interaction.guild.id)
+        game_servers = self._game_server.get_game_servers_by_server_id(server.id)
 
-    @register.command()
-    @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
-    async def gmod(self, ctx: Context, member: discord.Member, game_server: int, steam_url: str):
-        self._logger.debug(__name__, f"Received command register gmod {ctx}")
-
-        steam_id = None
-        try:
-            self._logger.debug(__name__, f"Try to get steam id for {id}")
-            steam_id = SteamID.from_community_url(steam_url)
-        except Exception as e:
-            self._logger.error(__name__, f"Get steam id for {steam_id} failed", e)
-            await self._message_service.send_interaction_msg(
-                ctx.interaction, self._t.transform("modules.base.register.not_found")
-            )
-
-        if steam_id is None:
-            return
-
-        server = self._servers.get_server_by_discord_id(ctx.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
-        gs = self._game_server.get_game_server_by_id(game_server)
-
-        game_ident = UserGameIdent(user, gs, steam_id)
-        self._user_game_ident.add_user_game_ident(game_ident)
-        self._db.save_changes()
-
-        await self._message_service.send_interaction_msg(
-            ctx.interaction, self._t.transform("modules.base.register.success")
-        )
-
-        self._logger.trace(__name__, f"Finished register gmod command")
-
-    @gmod.autocomplete("game_server")
-    async def game_server_autocomplete(
-        self, interaction: discord.Interaction, current: str
-    ) -> TList[app_commands.Choice[str]]:
-        return await self._game_server_autocomplete(interaction, current)
+        return [
+            app_commands.Choice(name=gs.name, value=gs.id)
+            for gs in self._client_utils.get_auto_complete_list(game_servers, current, lambda x: x.name)
+        ]

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

@@ -1,34 +1,22 @@
-from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
-from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-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_core.service.message_service import MessageService
-from bot_data.model.server_config import ServerConfig
 from modules.base.service.event_service import EventService
 
 
 class ScheduledEventsCommand(DiscordCommandABC):
     def __init__(
         self,
-        config: ConfigurationABC,
         logger: CommandLogger,
         events: EventService,
-        message_service: MessageService,
-        t: TranslatePipe,
     ):
         DiscordCommandABC.__init__(self)
 
-        self._config = config
         self._logger = logger
         self._events = events
-        self._message_service = message_service
-        self._t = t
 
         self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
 
@@ -42,12 +30,6 @@ class ScheduledEventsCommand(DiscordCommandABC):
     @CommandChecks.check_is_ready()
     @CommandChecks.check_is_member_moderator()
     async def reload(self, ctx: Context):
-        settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{ctx.guild.id}")
-        if not FeatureFlagsSettings.get_flag_from_dict(settings.feature_flags, FeatureFlagsEnum.scheduled_events):
-            self._logger.debug(__name__, f"Skipping scheduled event check for {ctx.guild.id}. Feature is disabled.")
-            await self._message_service.send_ctx_msg(ctx, self._t.transform("common.feature_not_activated"))
-            return
-
         self._logger.debug(__name__, "Running scheduled-events reload")
         try:
             await self._events.check_and_create_scheduled_events(ctx.guild)

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

@@ -1,6 +1,7 @@
 import datetime
 import uuid
 
+from cpl_core.logging import LoggerABC
 from cpl_core.time import TimeFormatSettings
 from cpl_discord.events.on_command_error_abc import OnCommandErrorABC
 from cpl_discord.service import DiscordBotServiceABC
@@ -11,14 +12,13 @@ from discord.ext.commands import Context, CommandError
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.exception.check_error import CheckError
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.model.technician_config import TechnicianConfig
 
 
 class BaseOnCommandErrorEvent(OnCommandErrorABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         messenger: MessageServiceABC,
         tech_settings: TechnicianConfig,

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

@@ -1,10 +1,10 @@
 from cpl_core.database.context import DatabaseContextABC
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnGuildJoinABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import Guild
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.server_config_repository_abc import ServerConfigRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.server import Server
@@ -14,7 +14,7 @@ from bot_data.service.seeder_service import SeederService
 class BaseOnGuildJoinEvent(OnGuildJoinABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         server_config: ServerConfigRepositoryABC,

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

@@ -4,15 +4,14 @@ from typing import Union
 import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnMemberJoinABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.abc.message_service_abc import MessageServiceABC
-from bot_core.abc.permission_service_abc import PermissionServiceABC
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
@@ -21,13 +20,14 @@ 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 bot_core.abc.permission_service_abc import PermissionServiceABC
 
 
 class BaseOnMemberJoinEvent(OnMemberJoinABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         messenger: MessageServiceABC,
         permissions: PermissionServiceABC,
         db: DatabaseContextABC,

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

@@ -4,12 +4,12 @@ from typing import Union
 import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnMemberRemoveABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -20,7 +20,7 @@ class BaseOnMemberRemoveEvent(OnMemberRemoveABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         db: DatabaseContextABC,
         message_service: MessageServiceABC,
         users: UserRepositoryABC,

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

@@ -4,7 +4,6 @@ from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from modules.base.helper.base_reaction_handler import BaseReactionHandler
@@ -13,7 +12,7 @@ from modules.base.helper.base_reaction_handler import BaseReactionHandler
 class BaseOnRawReactionAddEvent(OnRawReactionAddABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         auto_roles: AutoRoleRepositoryABC,

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

@@ -4,7 +4,6 @@ from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from modules.base.helper.base_reaction_handler import BaseReactionHandler
@@ -13,7 +12,7 @@ from modules.base.helper.base_reaction_handler import BaseReactionHandler
 class BaseOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         auto_roles: AutoRoleRepositoryABC,

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

@@ -5,7 +5,6 @@ from cpl_discord.service import DiscordBotServiceABC
 from discord import EventStatus
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from modules.base.model.active_event import ActiveEvent
 from modules.base.service.event_service import EventService
 
@@ -13,7 +12,7 @@ from modules.base.service.event_service import EventService
 class BaseOnScheduledEventUpdateEvent(OnScheduledEventUpdateABC):
     def __init__(
         self,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         events: EventService,
     ):

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

@@ -8,7 +8,6 @@ from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
@@ -26,7 +25,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         servers: ServerRepositoryABC,
         known_users: KnownUserRepositoryABC,
         users: UserRepositoryABC,

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

@@ -6,7 +6,6 @@ from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.server_config import ServerConfig
 from bot_core.abc.permission_service_abc import PermissionServiceABC
@@ -16,7 +15,7 @@ class BaseOnVoiceStateUpdateEventHelpChannel(OnVoiceStateUpdateABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         servers: ServerRepositoryABC,
         permissions: PermissionServiceABC,
         message_service: MessageServiceABC,

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

@@ -5,7 +5,6 @@ from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from modules.base.service.event_service import EventService
@@ -15,7 +14,7 @@ class BaseOnVoiceStateUpdateEventScheduledEventBonus(OnVoiceStateUpdateABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         servers: ServerRepositoryABC,
         users: UserRepositoryABC,
         events: EventService,

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

@@ -9,7 +9,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.container import Guild
 from cpl_query.extension import List
-from discord import PrivacyLevel, EventStatus
+from discord import PrivacyLevel
 from discord.scheduled_event import ScheduledEvent as DiscordEvent
 
 from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC
@@ -99,17 +99,14 @@ class EventService:
     async def check_and_create_scheduled_events(self, guild: Guild):
         server = self._servers.get_server_by_discord_id(guild.id)
         scheduled_events_from_db = self._events.get_scheduled_events_by_server_id(server.id)
-        self._logger.debug(__name__, f"Checking {scheduled_events_from_db.count()} events for server {guild.id}")
         for scheduled_event in scheduled_events_from_db:
             scheduled_event: ScheduledEvent = scheduled_event
             from_guild = List(DiscordEvent, guild.scheduled_events).where(
                 lambda x: x.name == scheduled_event.name
                 and x.description == scheduled_event.description
                 and x.entity_type == scheduled_event.entity_type
-                and x.status == EventStatus.scheduled
             )
             if from_guild.count() != 0:
-                self._logger.debug(__name__, f"Event {scheduled_event.name} already exists on discord server")
                 continue
 
             kwargs = {"name": scheduled_event.name, "description": scheduled_event.description}
@@ -122,14 +119,14 @@ class EventService:
                     scheduled_event.interval, scheduled_event.start_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
                 )
                 kwargs["start_time"] = start_time
-                scheduled_event.start_time = start_time.replace(tzinfo=None)
+                scheduled_event.start_time = scheduled_event.start_time.replace(tzinfo=None)
 
             if scheduled_event.end_time is not None:
                 end_time = self._append_interval(
                     scheduled_event.interval, scheduled_event.end_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
                 )
                 kwargs["end_time"] = end_time
-                scheduled_event.end_time = end_time.replace(tzinfo=None)
+                scheduled_event.end_time = scheduled_event.end_time.replace(tzinfo=None)
 
             kwargs["entity_type"] = scheduled_event.entity_type
             if scheduled_event.location is not None:
@@ -138,10 +135,9 @@ class EventService:
             kwargs["privacy_level"] = PrivacyLevel.guild_only
 
             try:
-                self._logger.trace(__name__, f"Try to create scheduled event for guild {guild.name}")
+                self._logger.debug(__name__, f"Try to create scheduled event for guild {guild.name}")
                 await guild.create_scheduled_event(**kwargs)
                 self._events.update_scheduled_event(scheduled_event)
                 self._db.save_changes()
-                self._logger.debug(__name__, f"Created scheduled event for guild {guild.name}")
             except Exception as e:
                 self._logger.error(__name__, f"Watching scheduled events failed", e)

bot/src/modules/base/tasks/birthday_watcher.py

@@ -37,7 +37,7 @@ class BirthdayWatcher(TaskABC):
         if not self._is_maintenance():
             self.watch.start()
 
-    @tasks.loop(time=datetime.time(hour=8, minute=0), reconnect=True)
+    @tasks.loop(time=datetime.time(hour=8, minute=0))
     async def watch(self):
         self._logger.info(__name__, "Watching birthdays")
         try:

bot/src/modules/base/tasks/scheduled_events_watcher.py

@@ -5,12 +5,9 @@ from cpl_translation import TranslatePipe
 from discord.ext import tasks
 
 from bot_core.abc.task_abc import TaskABC
-from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.logging.task_logger import TaskLogger
 from bot_core.service.message_service import MessageService
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.model.server_config import ServerConfig
 from modules.base.service.event_service import EventService
 
 
@@ -40,18 +37,11 @@ class ScheduledEventsWatcher(TaskABC):
         if not self._is_maintenance():
             self.watch.start()
 
-    @tasks.loop(hours=3, reconnect=True)
+    @tasks.loop(hours=12)
     async def watch(self):
         self._logger.info(__name__, "Watching scheduled events")
         try:
             for guild in self._bot.guilds:
-                settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{guild.id}")
-                if not FeatureFlagsSettings.get_flag_from_dict(
-                    settings.feature_flags, FeatureFlagsEnum.scheduled_events
-                ):
-                    self._logger.debug(__name__, f"Skipping scheduled event check for {guild.id}. Feature is disabled.")
-                    continue
-
                 await self._events.check_and_create_scheduled_events(guild)
         except Exception as e:
             self._logger.error(__name__, f"Watching scheduled events failed", e)

bot/src/modules/boot_log/boot_log_on_ready_event.py

@@ -10,7 +10,6 @@ from discord import guild
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
-from bot_core.logging.event_logger import EventLogger
 from bot_data.model.server_config import ServerConfig
 from bot_data.model.technician_config import TechnicianConfig
 
@@ -19,7 +18,7 @@ class BootLogOnReadyEvent(OnReadyABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         message_service: MessageServiceABC,
         translate: TranslatePipe,

bot/src/modules/config/events/config_on_ready_event.py

@@ -1,8 +1,8 @@
 from cpl_core.configuration import ConfigurationABC
+from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 
-from bot_core.logging.event_logger import EventLogger
 from bot_core.service.config_service import ConfigService
 from bot_core.service.data_integrity_service import DataIntegrityService
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -12,7 +12,7 @@ class ConfigOnReadyEvent(OnReadyABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         config_service: ConfigService,

bot/src/modules/level/events/level_on_member_join_event.py

@@ -5,14 +5,13 @@ from cpl_discord.events import OnMemberJoinABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_core.logging.message_logger import MessageLogger
 from bot_data.model.server_config import ServerConfig
 from modules.level.service.level_service import LevelService
 
 
 class LevelOnMemberJoinEvent(OnMemberJoinABC):
-    def __init__(self, config: ConfigurationABC, logger: EventLogger, level: LevelService):
+    def __init__(self, config: ConfigurationABC, logger: MessageLogger, level: LevelService):
         OnMemberJoinABC.__init__(self)
         self._config = config
         self._logger = logger

bot/src/modules/level/events/level_on_raw_reaction_add_event.py

@@ -7,7 +7,6 @@ from discord import RawReactionActionEvent
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.model.server_config import ServerConfig
 from modules.level.service.level_service import LevelService
 
@@ -16,7 +15,7 @@ class LevelOnRawReactionAddEvent(OnRawReactionAddABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         level: LevelService,
     ):

bot/src/modules/level/events/level_on_raw_reaction_remove_event.py

@@ -7,7 +7,6 @@ from discord import RawReactionActionEvent
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.model.server_config import ServerConfig
 from modules.level.service.level_service import LevelService
 
@@ -16,7 +15,7 @@ class LevelOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
     def __init__(
         self,
         config: ConfigurationABC,
-        logger: EventLogger,
+        logger: LoggerABC,
         bot: DiscordBotServiceABC,
         level: LevelService,
     ):

bot/src/modules/level/events/level_on_voice_state_update_event.py

@@ -6,13 +6,12 @@ from cpl_discord.events import OnVoiceStateUpdateABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.helper.event_checks import EventChecks
-from bot_core.logging.event_logger import EventLogger
 from bot_data.model.server_config import ServerConfig
 from modules.level.service.level_service import LevelService
 
 
 class LevelOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
-    def __init__(self, config: ConfigurationABC, logger: EventLogger, level: LevelService):
+    def __init__(self, config: ConfigurationABC, logger: LoggerABC, level: LevelService):
         OnVoiceStateUpdateABC.__init__(self)
         self._config = config
         self._logger = logger

bot/src/modules/special_offers/special_offers_module.py

@@ -17,6 +17,6 @@ class SteamSpecialOffersModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(TaskABC, SteamOfferWatcher)
+        services.add_singleton(TaskABC, SteamOfferWatcher)
         # commands
         # events

bot/src/modules/special_offers/steam_offer_watcher.py

@@ -187,7 +187,7 @@ class SteamOfferWatcher(TaskABC):
         self._logger.trace(__name__, "Finished watching")
         return offers_for_notifications
 
-    @tasks.loop(hours=4, reconnect=True)
+    @tasks.loop(hours=4)
     async def watch(self):
         self._logger.info(__name__, "Watching steam special offers")
         try:

web/src/app/models/data/user.model.ts

@@ -36,8 +36,6 @@ export interface User extends DataWithHistory {
 
   userWarningCount?: number;
   userWarnings?: UserWarning[];
-
-  profilePictureURL?: string;
 }
 
 export interface UserFilter {

web/src/app/models/graphql/queries.model.ts

@@ -406,7 +406,6 @@ export class Queries {
           joinedOn
           leavedOn
         }
-        profilePictureURL
 
         createdAt
         modifiedAt

web/src/app/modules/shared/shared.module.ts

@@ -40,7 +40,6 @@ import { TabViewModule } from "primeng/tabview";
 import { RadioButtonModule } from "primeng/radiobutton";
 import { InputTextareaModule } from "primeng/inputtextarea";
 import { InputMaskModule } from "primeng/inputmask";
-import { KnobModule } from "primeng/knob";
 
 
 const PrimeNGModules = [
@@ -74,8 +73,7 @@ const PrimeNGModules = [
   TabViewModule,
   RadioButtonModule,
   InputTextareaModule,
-  InputMaskModule,
-  KnobModule
+  InputMaskModule
 ];
 
 @NgModule({

web/src/app/modules/view/server/profile/profile.component.html

@@ -2,95 +2,119 @@
   {{'view.server.profile.header' | translate}}
 </h1>
 <div class="content-wrapper">
+  <div class="content-header">
+    <h2>
+      {{user.name}}
+    </h2>
+  </div>
+
   <div class="content">
     <div class="content-row">
       <div class="content-column">
-        <div class="logo">
-          <img *ngIf="user ? user.profilePictureURL : ''" [src]="user ? user.profilePictureURL : ''">
-        </div>
+        <div class="content-data-name">{{'common.id' | translate}}:</div>
+        <div class="content-data-value">{{user.id}}</div>
       </div>
-      <div class="content">
-        <div class="content-column">
-          <h1>{{user.name}}</h1>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.id' | translate}}:</div>
-          <div class="content-data-value">{{user.id}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.discord_id' | translate}}:</div>
-          <div class="content-data-value">{{user.discordId}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'view.server.profile.message_count' | translate}}:</div>
-          <div class="content-data-value">{{user.messageCount}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'view.server.profile.reaction_count' | translate}}:</div>
-          <div class="content-data-value">{{user.reactionCount}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'view.server.profile.birthday' | translate}}:</div>
-          <div *ngIf="!isEditing" class="content-data-value">{{user.birthday}}</div>
-          <div *ngIf="isEditing" class="content-data-value">
-            <p-calendar [(ngModel)]="user.birthday" dateFormat="dd.mm.yy"
-                        [showIcon]="true"></p-calendar>
-          </div>
-        </div>
-        <div class="content-divider"></div>
-        <div class="content-column">
-          <div class="content-data-name">{{'view.server.profile.left_server' | translate}}:</div>
-          <div class="content-data-value">{{user.leftServer | bool}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.created_at' | translate}}:</div>
-          <div class="content-data-value">{{user.createdAt | date:'dd.MM.yyyy HH:mm:ss'}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.modified_at' | translate}}:</div>
-          <div class="content-data-value">{{user.modifiedAt | date:'dd.MM.yyyy HH:mm:ss'}}</div>
-        </div>
+      <div class="content-column">
+        <div class="content-data-name">{{'common.discord_id' | translate}}:</div>
+        <div class="content-data-value">{{user.discordId}}</div>
       </div>
-      <div class="content">
-        <div class="content-column">
-          <div class="content-data-name" style="flex-direction: column; justify-content: start;">
-            <p-knob valueTemplate="{value} {{'view.server.profile.xp' | translate}}" [(ngModel)]="user.xp" [size]="150"
-                    [strokeWidth]="10"
-                    [max]="maxXp" valueColor="SlateGray" rangeColor="MediumTurquoise"
-                    [readonly]="isModerator && !isEditing"></p-knob>
-          </div>
-          <div class="content-data-value" style="flex-direction: column; justify-content: start;">
-            <p-knob valueTemplate="Lvl {value}" [(ngModel)]="activeLevelIndex"
-                    [size]="150"
-                    [strokeWidth]="10"
-                    [min]="1"
-                    [max]="levels ? levels.length : 0" valueColor="SlateGray" rangeColor="MediumTurquoise"
-                    [readonly]="isModerator && !isEditing"></p-knob>
+    </div>
 
-            <div *ngIf="user.level">
-              {{user.level.name}}
-            </div>
-          </div>
-        </div>
-        <div class="content-divider"></div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.ontime' | translate}}:</div>
-          <div class="content-data-value">{{user.ontime}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.game_ontime' | translate}}:</div>
-          <div class="content-data-value">{{user.gameOntime}}</div>
-        </div>
-        <div class="content-column">
-          <div class="content-data-name">{{'common.activity' | translate}}:</div>
-          <div class="content-data-value">{{user.activityScore}}</div>
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.name' | translate}}:</div>
+        <div class="content-data-value">{{user.name}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.xp' | translate}}:</div>
+        <div *ngIf="!isEditing" class="content-data-value">{{user.xp}}</div>
+        <div *ngIf="isModerator && isEditing" class="content-data-value"><input class="table-edit-input" pInputText
+                                                                                min="0" type="number"
+                                                                                [(ngModel)]="user.xp"></div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.message_count' | translate}}:</div>
+        <div class="content-data-value">{{user.messageCount}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.reaction_count' | translate}}:</div>
+        <div class="content-data-value">{{user.reactionCount}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.birthday' | translate}}:</div>
+        <div *ngIf="!isEditing" class="content-data-value">{{user.birthday}}</div>
+        <div *ngIf="isEditing" class="content-data-value">
+          <p-calendar [(ngModel)]="user.birthday" dateFormat="dd.mm.yy" [showIcon]="true"></p-calendar>
         </div>
       </div>
     </div>
-  </div>
 
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'common.ontime' | translate}}:</div>
+        <div class="content-data-value">{{user.ontime}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'common.game_ontime' | translate}}:</div>
+        <div class="content-data-value">{{user.gameOntime}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'common.activity' | translate}}:</div>
+        <div class="content-data-value">{{user.activityScore}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.level' | translate}}:</div>
+        <div *ngIf="!isEditing" class="content-data-value">{{user.level?.name}}</div>
+        <div *ngIf="isModerator && isEditing" class="content-data-value">
+          <p-dropdown [options]="levels" [(ngModel)]="user.level" dataKey="id"
+                      placeholder="{{'common.level' | translate}}">
+          </p-dropdown>
+        </div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'view.server.profile.left_server' | translate}}:</div>
+        <div class="content-data-value">{{user.leftServer | bool}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'common.created_at' | translate}}:</div>
+        <div class="content-data-value">{{user.createdAt | date:'dd.MM.yyyy HH:mm:ss'}}</div>
+      </div>
+    </div>
+
+    <div class="content-row">
+      <div class="content-column">
+        <div class="content-data-name">{{'common.modified_at' | translate}}:</div>
+        <div class="content-data-value">{{user.modifiedAt | date:'dd.MM.yyyy HH:mm:ss'}}</div>
+      </div>
+    </div>
 
-  <div class="content">
     <div>
       <div class="content-divider"></div>
       <p-table #dt [value]="(user.userWarnings ?? [])" [responsive]="true" responsiveLayout="stack"
@@ -175,8 +199,7 @@
                 <button *ngIf="!editing" pButton type="button" class="btn danger-icon-btn" icon="pi pi-trash"
                         (click)="deleteUserWarning(ri)"></button>
 
-                <button *ngIf="editing" pButton type="button" pSaveEditableRow class="btn icon-btn"
-                        icon="pi pi-check"
+                <button *ngIf="editing" pButton type="button" pSaveEditableRow class="btn icon-btn" icon="pi pi-check"
                         (click)="editSaveUserWarning(value, ri)"></button>
                 <button *ngIf="editing" pButton type="button" pCancelEditableRow class="btn danger-icon-btn"
                         icon="pi pi-times"

web/src/app/modules/view/server/profile/profile.component.scss

@@ -1,6 +0,0 @@
-.logo {
-  img {
-    width: 12.5vw;
-    border-radius: 50%;
-  }
-}

web/src/app/modules/view/server/profile/profile.component.ts

@@ -15,10 +15,10 @@ import { catchError, takeUntil } from "rxjs/operators";
 import { Table } from "primeng/table";
 import { UpdateUserMutationResult } from "../../../../models/graphql/result.model";
 import { Mutations } from "../../../../models/graphql/mutations.model";
+import { MenuItem } from "primeng/api";
 import { UserWarning } from "../../../../models/data/user_warning.model";
 import moment from "moment";
 import { SidebarService } from "../../../../services/sidebar/sidebar.service";
-import { Level } from "../../../../models/data/level.model";
 
 @Component({
   selector: "app-profile",
@@ -28,7 +28,7 @@ import { Level } from "../../../../models/data/level.model";
 export class ProfileComponent implements OnInit, OnDestroy {
 
   user: User = { createdAt: "", modifiedAt: "" };
-  levels!: { label: string, value: Level }[];
+  levels!: MenuItem[];
   private server: Server = {};
   private author?: UserDTO;
   private clonedUserWarnings: UserWarning[] = [];
@@ -36,21 +36,6 @@ export class ProfileComponent implements OnInit, OnDestroy {
   public isEditing: boolean = false;
   public isModerator: boolean = false;
   public hasTechnicianAccess: boolean = false;
-  public maxXp: number = 0;
-  private _activeLevelIndex: number = 0;
-
-  public get activeLevelIndex(): number {
-    return this._activeLevelIndex;
-  }
-
-  public set activeLevelIndex(value: number) {
-    if (value < 1) {
-      value = 1;
-    }
-
-    this._activeLevelIndex = value;
-    this.user.level = this.levels.map(x => x.value)[value - 1];
-  }
 
   private unsubscriber = new Subject<void>();
 
@@ -63,7 +48,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
     private toast: ToastService,
     private translate: TranslateService,
     private toastService: ToastService,
-    private sidebarService: SidebarService
+    private sidebarService: SidebarService,
   ) {
   }
 
@@ -89,7 +74,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
           }
         ).subscribe(data => {
           this.levels = data.levels.map(level => {
-            return { label: level.name ?? "", value: level };
+            return { label: level.name, value: level };
           });
         });
 
@@ -115,11 +100,6 @@ export class ProfileComponent implements OnInit, OnDestroy {
             this.router.navigate([`/server/${server.id}`]);
           }
           this.user = users.users[0];
-          const minXps = this.levels.reverse().map(x => x.value.minXp ?? 0);
-          this.maxXp = minXps.filter(x => this.user.xp && x > this.user.xp)[0] ?? this.user.xp;
-          if (this.user.level) {
-            this.activeLevelIndex = this.levels.map(l => l.value.id).indexOf(this.user.level.id) + 1;
-          }
 
           this.data.query<UserWarningQuery>(Queries.userProfileWarnings, {
               serverId: this.server.id,
@@ -148,7 +128,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
     this.data.mutation<UpdateUserMutationResult>(Mutations.updateUser, {
         id: this.user.id,
         xp: this.user.xp,
-        birthday: moment(this.user.birthday, "DD.MM.YYYY").format("DD.MM.YYYY"),
+        birthday: moment(this.user.birthday).format("DD.MM.YYYY"),
         levelId: this.user.level?.id,
         userWarnings: this.user.userWarnings?.map(userWarning => {
           return {

web/src/assets/i18n/de.json

@@ -541,7 +541,6 @@
         },
         "left_server": "Hat Server verlassen",
         "level": "Level",
-        "lvl": "Lvl",
         "message_count": "Anzahl Nachrichten",
         "minecraft_id": "Minecraft Id",
         "name": "Name",

web/src/assets/i18n/en.json

@@ -541,7 +541,6 @@
         },
         "left_server": "Leaved server",
         "level": "Level",
-        "lvl": "Lvl",
         "message_count": "Message count",
         "minecraft_id": "Minecraft Id",
         "name": "Name",

web/src/styles.scss

@@ -177,40 +177,40 @@ header {
             flex: 1;
             margin: 5px 0;
             gap: 5px;
-          }
 
-          .content-column {
-            display: flex;
-            flex: 1;
-            gap: 5px;
-          }
-
-          .content-data-name {
-            display: flex;
-            align-items: center;
-
-            font-size: 18px;
-            flex: 1;
-          }
-
-          .content-data-value {
-            display: flex;
-            align-items: center;
-
-            font-size: 18px;
-            flex: 1;
-
-            input {
-              width: 100% !important;
+            .content-column {
+              display: flex;
+              flex: 1;
+              gap: 5px;
             }
-          }
 
-          .content-data-value-row {
-            display: flex;
-            flex: 1;
-            flex-direction: column;
+            .content-data-name {
+              display: flex;
+              align-items: center;
 
-            font-size: 18px;
+              font-size: 18px;
+              flex: 1;
+            }
+
+            .content-data-value {
+              display: flex;
+              align-items: center;
+
+              font-size: 18px;
+              flex: 1;
+
+              input {
+                width: 100% !important;
+              }
+            }
+
+            .content-data-value-row {
+              display: flex;
+              flex: 1;
+              flex-direction: column;
+
+              font-size: 18px;
+            }
           }
 
           .content-divider {

web/src/styles/themes/sh-edraft-dark-theme.scss

@@ -814,22 +814,4 @@
       box-shadow: none !important;
     }
   }
-
-  p-knob {
-    .p-knob {
-      svg {
-        .p-knob-value {
-          stroke: $primaryHeaderColor !important;
-        }
-
-        .p-knob-range {
-          stroke: $secondaryBackgroundColor !important;
-        }
-
-        .p-knob-text {
-          font-size: 1rem !important;
-        }
-      }
-    }
-  }
 }