Fixed translation #360

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

kdb-bot/src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

kdb-bot/src/bot/bot.json

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

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

@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

kdb-bot/src/bot/startup_migration_extension.py

@@ -12,6 +12,7 @@ from bot_data.migration.auto_role_migration import AutoRoleMigration
 from bot_data.migration.config_feature_flags_migration import ConfigFeatureFlagsMigration
 from bot_data.migration.config_migration import ConfigMigration
 from bot_data.migration.db_history_migration import DBHistoryMigration
+from bot_data.migration.default_role_migration import DefaultRoleMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
 from bot_data.migration.remove_stats_migration import RemoveStatsMigration
@@ -48,3 +49,4 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, AchievementsMigration)  # 14.06.2023 #268 - 1.1.0
         services.add_transient(MigrationABC, ConfigMigration)  # 19.07.2023 #127 - 1.1.0
         services.add_transient(MigrationABC, ConfigFeatureFlagsMigration)  # 15.08.2023 #334 - 1.1.0
+        services.add_transient(MigrationABC, DefaultRoleMigration)  # 24.09.2023 #360 - 1.1.3

kdb-bot/src/bot_api/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "1",
-      "Micro": "0.rc3"
+      "Micro": "3"
     },
     "Author": "",
     "AuthorEmail": "",

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

kdb-bot/src/bot_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

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

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

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

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

@@ -6,6 +6,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.logging.database_logger import DatabaseLogger
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
@@ -44,6 +45,7 @@ class DataIntegrityService:
         user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
         user_joined_gs: UserJoinedGameServerRepositoryABC,
         achievement_service: AchievementService,
+        client_utils: ClientUtilsABC,
         dtp: DateTimeOffsetPipe,
     ):
         self._config = config
@@ -60,6 +62,7 @@ class DataIntegrityService:
         self._user_joins_vc = user_joins_vc
         self._user_joined_gs = user_joined_gs
         self._achievements = achievement_service
+        self._client_utils = client_utils
         self._dtp = dtp
 
         self._is_for_shutdown = False
@@ -291,7 +294,7 @@ class DataIntegrityService:
                         self._user_joins_vc.update_user_joined_voice_channel(join)
 
                         if self._is_for_shutdown:
-                            user.xp = round(join.time * settings.xp_per_ontime_hour)
+                            user.xp += round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
@@ -356,7 +359,7 @@ class DataIntegrityService:
 
                         self._user_joined_gs.update_user_joined_game_server(join)
                         if self._is_for_shutdown:
-                            user.xp = round(join.time * settings.xp_per_ontime_hour)
+                            user.xp += round(join.time * settings.xp_per_ontime_hour)
                             self._users.update_user(user)
 
                         self._db_context.save_changes()
@@ -382,10 +385,16 @@ class DataIntegrityService:
 
                 await self._achievements.validate_achievements_for_user(user)
 
+    async def _check_default_role(self):
+        for guild in self._bot.guilds:
+            for member in guild.members:
+                await self._client_utils.check_default_role(member)
+
     async def check_data_integrity(self, is_for_shutdown=False):
         if is_for_shutdown != self._is_for_shutdown:
             self._is_for_shutdown = is_for_shutdown
 
+        await self._check_default_role()
         self._check_known_users()
         self._check_servers()
         self._check_clients()

kdb-bot/src/bot_data/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_data"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

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

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -0,0 +1,34 @@
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.migration_abc import MigrationABC
+from bot_data.db_context import DBContext
+
+
+class DefaultRoleMigration(MigrationABC):
+    name = "1.1.3_DefaultRoleMigration"
+
+    def __init__(self, logger: DatabaseLogger, db: DBContext):
+        MigrationABC.__init__(self)
+        self._logger = logger
+        self._db = db
+        self._cursor = db.cursor
+
+    def upgrade(self):
+        self._logger.debug(__name__, "Running upgrade")
+
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_Server
+                    ADD DefaultRoleId BIGINT NULL AFTER LoginMessageChannelId;
+                """
+            )
+        )
+
+    def downgrade(self):
+        self._cursor.execute(
+            str(
+                f"""
+                    ALTER TABLE CFG_Server DROP COLUMN DefaultRoleId;
+                """
+            )
+        )

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -26,6 +26,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         help_voice_channel_id: int,
         team_channel_id: int,
         login_message_channel_id: int,
+        default_role_id: int,
         feature_flags: dict[FeatureFlagsEnum],
         server: Server,
         afk_channel_ids: List[int],
@@ -48,6 +49,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
         self._help_voice_channel_id = help_voice_channel_id
         self._team_channel_id = team_channel_id
         self._login_message_channel_id = login_message_channel_id
+        self._default_role_id = default_role_id
         self._feature_flags = feature_flags
         self._server = server
         self._afk_channel_ids = afk_channel_ids
@@ -165,6 +167,14 @@ class ServerConfig(TableABC, ConfigurationModelABC):
     def login_message_channel_id(self, value: int):
         self._login_message_channel_id = value
 
+    @property
+    def default_role_id(self) -> int:
+        return self._default_role_id
+
+    @default_role_id.setter
+    def default_role_id(self, value: int):
+        self._default_role_id = value
+
     @property
     def feature_flags(self) -> dict[FeatureFlagsEnum]:
         return self._feature_flags
@@ -237,6 +247,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     `HelpVoiceChannelId`,
                     `TeamChannelId`,
                     `LoginMessageChannelId`,
+                    `DefaultRoleId`,
                     `FeatureFlags`,
                     `ServerId`
                 ) VALUES (
@@ -253,6 +264,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                     {self._help_voice_channel_id},
                     {self._team_channel_id},
                     {self._login_message_channel_id},
+                    {self._default_role_id},
                     '{json.dumps(self._feature_flags)}',
                     {self._server.id}
                 );
@@ -277,6 +289,7 @@ class ServerConfig(TableABC, ConfigurationModelABC):
                 `HelpVoiceChannelId` = {self._help_voice_channel_id},
                 `TeamChannelId` = {self._team_channel_id},
                 `LoginMessageChannelId` = {self._login_message_channel_id},
+                `DefaultRoleId` = {self._default_role_id},
                 `FeatureFlags` = '{json.dumps(self._feature_flags)}',
                 `ServerId` = {self._server.id}
                 WHERE `Id` = {self._id};

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

@@ -17,6 +17,7 @@ class ServerConfigHistory(HistoryTableABC):
         help_voice_channel_id: int,
         team_channel_id: int,
         login_message_channel_id: int,
+        default_role_id: int,
         feature_flags: dict[str],
         server_id: int,
         deleted: bool,
@@ -40,6 +41,7 @@ class ServerConfigHistory(HistoryTableABC):
         self._help_voice_channel_id = help_voice_channel_id
         self._team_channel_id = team_channel_id
         self._login_message_channel_id = login_message_channel_id
+        self._default_role_id = default_role_id
         self._feature_flags = feature_flags
         self._server_id = server_id
 
@@ -99,6 +101,10 @@ class ServerConfigHistory(HistoryTableABC):
     def login_message_channel_id(self) -> int:
         return self._login_message_channel_id
 
+    @property
+    def default_role_id(self) -> int:
+        return self._default_role_id
+
     @property
     def feature_flags(self) -> dict[str]:
         return self._feature_flags

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -50,13 +50,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
             auth_user_id=self._get_value_from_result(au_result[0]),
         )
 
-        self._logger.trace(
-            __name__,
-            f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
-        )
-        results = self._context.select(auth_user.get_select_user_id_from_relations())
-        for result in results:
-            user_id = self._get_value_from_result(result[0])
+        for user_id in self.get_auth_user_relation_ids(auth_user):
             if user_id is None:
                 continue
 
@@ -65,6 +59,19 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
 
         return auth_user
 
+    def get_auth_user_relation_ids(self, auth_user: AuthUser) -> List[int]:
+        self._logger.trace(
+            __name__,
+            f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
+        )
+        relation_ids = List(int)
+        results = self._context.select(auth_user.get_select_user_id_from_relations())
+        for result in results:
+            self._logger.trace(__name__, f"Got auth user relation with id {result[0]}")
+            relation_ids.append(result[0])
+
+        return relation_ids
+
     def get_all_auth_users(self) -> List[AuthUser]:
         users = List(AuthUser)
         self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")

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

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

kdb-bot/src/bot_graphql/__init__.py

@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -10,6 +10,7 @@ from bot_api.exception.service_error_code_enum import ServiceErrorCode
 from bot_api.exception.service_exception import ServiceException
 from bot_api.route.route import Route
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_data.model.achievement import Achievement
 from bot_data.model.auth_role_enum import AuthRoleEnum
 from bot_data.model.auth_user import AuthUser
 from bot_data.model.auto_role import AutoRole
@@ -78,7 +79,17 @@ class QueryABC(ObjectType):
         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
 
         access = False
-        if type(element) == AutoRole:
+        if type(element) == Achievement:
+            element: Achievement = element
+            for u in user.users:
+                u: User = u
+                guild = bot.get_guild(u.server.discord_id)
+                member = guild.get_member(u.discord_id)
+                if permissions.is_member_moderator(member) and u.server.id == element.server.id:
+                    access = True
+                    break
+
+        elif type(element) == AutoRole:
             element: AutoRole = element
             for u in user.users:
                 u: User = u

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

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

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -0,0 +1,53 @@
+type Discord {
+    guilds(filter: GuildFilter): [Guild]
+    users(filter: DiscordUserFilter): [DiscordUser]
+}
+
+type Guild {
+    id: ID
+    name: String
+
+    channels(filter: ChannelFilter): [Channel]
+    roles: [Role]
+    emojis: [Emoji]
+}
+
+input GuildFilter {
+    id: ID
+    name: String
+}
+
+type Channel {
+    id: String
+    name: String
+    type: String
+}
+
+input ChannelFilter {
+    id: String
+    name: String
+    type: String
+}
+
+type Role {
+    id: String
+    name: String
+}
+
+type DiscordUser {
+    id: String
+    name: String
+    bot: Boolean
+}
+
+input DiscordUserFilter {
+    id: ID
+    name: String
+    bot: Boolean
+}
+
+type Emoji {
+    id: String
+    name: String
+    url: String
+}

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

@@ -38,7 +38,6 @@ type Query {
     achievementOperators: [String]
 
     technicianConfig: TechnicianConfig
-
-    guilds(filter: GuildFilter): [Guild]
     possibleFeatureFlags: [String]
+    discord: Discord
 }

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

@@ -13,6 +13,7 @@ type ServerConfig implements TableWithHistoryQuery {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    defaultRoleId: String
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -43,6 +44,7 @@ type ServerConfigHistory implements HistoryTableQuery {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    defaultRoleId: String
     featureFlagCount: Int
     featureFlags: [FeatureFlag]
 
@@ -91,6 +93,7 @@ input ServerConfigInput {
     helpVoiceChannelId: String
     teamChannelId: String
     loginMessageChannelId: String
+    defaultRoleId: String
     featureFlags: [FeatureFlagInput]
 
     afkChannelIds: [String]

kdb-bot/src/bot_graphql/graphql_module.py

@@ -37,6 +37,12 @@ from bot_graphql.queries.auto_role_rule_history_query import AutoRoleRuleHistory
 from bot_graphql.queries.auto_role_rule_query import AutoRoleRuleQuery
 from bot_graphql.queries.client_history_query import ClientHistoryQuery
 from bot_graphql.queries.client_query import ClientQuery
+from bot_graphql.queries.discord.channel_query import ChannelQuery
+from bot_graphql.queries.discord.discord_query import DiscordQuery
+from bot_graphql.queries.discord.discord_user_query import DiscordUserQuery
+from bot_graphql.queries.discord.emoji_query import EmojiQuery
+from bot_graphql.queries.discord.guild_query import GuildQuery
+from bot_graphql.queries.discord.role_query import RoleQuery
 from bot_graphql.queries.game_server_query import GameServerQuery
 from bot_graphql.queries.known_user_history_query import KnownUserHistoryQuery
 from bot_graphql.queries.known_user_query import KnownUserQuery
@@ -105,6 +111,13 @@ class GraphQLModule(ModuleABC):
         services.add_transient(QueryABC, UserJoinedGameServerHistoryQuery)
         services.add_transient(QueryABC, UserJoinedGameServerQuery)
 
+        services.add_transient(QueryABC, DiscordQuery)
+        services.add_transient(QueryABC, GuildQuery)
+        services.add_transient(QueryABC, ChannelQuery)
+        services.add_transient(QueryABC, RoleQuery)
+        services.add_transient(QueryABC, EmojiQuery)
+        services.add_transient(QueryABC, DiscordUserQuery)
+
         # filters
         services.add_transient(FilterABC, AutoRoleFilter)
         services.add_transient(FilterABC, AutoRoleRuleFilter)

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

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+"""
+bot Keksdose bot
+~~~~~~~~~~~~~~~~~~~
+
+Discord bot  for the Keksdose discord Server
+
+:copyright: (c) 2022 - 2023 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = "bot_graphql.model"
+__author__ = "Sven Heidemann"
+__license__ = "MIT"
+__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
+__version__ = "1.1.3"
+
+from collections import namedtuple
+
+
+# imports
+
+VersionInfo = namedtuple("VersionInfo", "major minor micro")
+version_info = VersionInfo(major="1", minor="1", micro="3")

kdb-bot/src/bot_graphql/model/discord.gql

@@ -1,29 +0,0 @@
-type Guild {
-    id: ID
-    name: String
-
-    channels: [Channel]
-    roles: [Role]
-    emojis: [Emoji]
-}
-
-input GuildFilter {
-    id: ID
-}
-
-type Channel {
-    id: String
-    name: String
-    type: String
-}
-
-type Role {
-    id: String
-    name: String
-}
-
-type Emoji {
-    id: String
-    name: String
-    url: String
-}

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

@@ -0,0 +1,16 @@
+from cpl_query.extension import List
+from discord import Guild, User
+
+
+class Discord:
+    def __init__(self, guilds: List[Guild], users: List[User]):
+        self._guilds = guilds
+        self._users = users
+
+    @property
+    def guilds(self) -> List[Guild]:
+        return self._guilds
+
+    @property
+    def users(self) -> List[User]:
+        return self._users

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -89,6 +89,9 @@ class ServerConfigMutation(QueryABC):
             if "loginMessageChannelId" in input
             else server_config.login_message_channel_id
         )
+        server_config.default_role_id = (
+            input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id
+        )
         server_config.feature_flags = (
             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]]))
             if "featureFlags" in input

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -1,10 +1,10 @@
-from bot_graphql.abc.data_query_abc import DataQueryABC
+from bot_graphql.abc.query_abc import QueryABC
 
 
-class ChannelQuery(DataQueryABC):
+class ChannelQuery(QueryABC):
     def __init__(self):
-        DataQueryABC.__init__(self, "Channel")
+        QueryABC.__init__(self, "Channel")
 
         self.set_field("id", lambda c, *_: c.id)
         self.set_field("name", lambda c, *_: c.name)
-        self.set_field("type", lambda c, *_: type(c))
+        self.set_field("type", lambda c, *_: type(c).__name__)

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

@@ -0,0 +1,48 @@
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_query.extension import List
+
+from bot_graphql.abc.query_abc import QueryABC
+
+
+class DiscordQuery(QueryABC):
+    def __init__(
+        self,
+        bot: DiscordBotServiceABC,
+    ):
+        QueryABC.__init__(self, "Discord")
+
+        self._bot = bot
+
+        self.set_field("guilds", self._resolve_guilds)
+        self.set_field("users", self._resolve_users)
+
+    def _resolve_guilds(self, *_, filter=None):
+        guilds = self._bot.guilds
+
+        if filter is None:
+            return guilds
+
+        if "id" in filter:
+            guilds = self._bot.guilds.where(lambda g: g.id == int(filter["id"]))
+
+        if "name" in filter:
+            guilds = self._bot.guilds.where(lambda g: g.name == filter["name"])
+
+        return guilds
+
+    def _resolve_users(self, *_, filter=None):
+        users = List(any).extend(self._bot.users)
+
+        if filter is None:
+            return users
+
+        if "id" in filter:
+            users = users.where(lambda g: g.id == int(filter["id"]))
+
+        if "name" in filter:
+            users = users.where(lambda g: g.name == filter["name"])
+
+        if "bot" in filter:
+            users = users.where(lambda g: g.bot == bool(filter["bot"]))
+
+        return users

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

@@ -0,0 +1,10 @@
+from bot_graphql.abc.query_abc import QueryABC
+
+
+class DiscordUserQuery(QueryABC):
+    def __init__(self):
+        QueryABC.__init__(self, "DiscordUser")
+
+        self.set_field("id", lambda r, *_: r.id)
+        self.set_field("name", lambda r, *_: r.name)
+        self.set_field("bot", lambda r, *_: r.bot)

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

@@ -1,9 +1,9 @@
-from bot_graphql.abc.data_query_abc import DataQueryABC
+from bot_graphql.abc.query_abc import QueryABC
 
 
-class RoleQuery(DataQueryABC):
+class EmojiQuery(QueryABC):
     def __init__(self):
-        DataQueryABC.__init__(self, "Emoji")
+        QueryABC.__init__(self, "Emoji")
 
         self.set_field("id", lambda e, *_: e.id)
         self.set_field("name", lambda e, *_: e.name)

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

@@ -1,12 +1,38 @@
-from bot_graphql.abc.data_query_abc import DataQueryABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_query.extension import List
+from discord import Guild
+
+from bot_graphql.abc.query_abc import QueryABC
 
 
-class GuildQuery(DataQueryABC):
-    def __init__(self):
-        DataQueryABC.__init__(self, "Guild")
+class GuildQuery(QueryABC):
+    def __init__(
+        self,
+        bot: DiscordBotServiceABC,
+    ):
+        QueryABC.__init__(self, "Guild")
+
+        self._bot = bot
 
         self.set_field("id", lambda g, *_: g.id)
         self.set_field("name", lambda g, *_: g.name)
-        self.set_field("channels", lambda g, *_: g.channels)
+        self.set_field("channels", self._resolve_channels)
         self.set_field("roles", lambda g, *_: g.roles)
         self.set_field("emojis", lambda g, *_: g.emojis)
+
+    def _resolve_channels(self, g: Guild, *_, filter=None):
+        users = List(any).extend(g.channels)
+
+        if filter is None:
+            return users
+
+        if "id" in filter:
+            users = users.where(lambda c: c.id == int(filter["id"]))
+
+        if "name" in filter:
+            users = users.where(lambda c: c.id == filter["name"])
+
+        if "type" in filter:
+            users = users.where(lambda c: type(c).__name__ == filter["type"])
+
+        return users

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

@@ -1,9 +1,9 @@
-from bot_graphql.abc.data_query_abc import DataQueryABC
+from bot_graphql.abc.query_abc import QueryABC
 
 
-class RoleQuery(DataQueryABC):
+class RoleQuery(QueryABC):
     def __init__(self):
-        DataQueryABC.__init__(self, "Role")
+        QueryABC.__init__(self, "Role")
 
         self.set_field("id", lambda r, *_: r.id)
         self.set_field("name", lambda r, *_: r.name)

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

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

kdb-bot/src/bot_graphql/query.py

@@ -1,4 +1,5 @@
 from cpl_discord.service import DiscordBotServiceABC
+from cpl_query.extension import List
 
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC
@@ -24,6 +25,7 @@ from bot_graphql.filter.user_filter import UserFilter
 from bot_graphql.filter.user_joined_game_server_filter import UserJoinedGameServerFilter
 from bot_graphql.filter.user_joined_server_filter import UserJoinedServerFilter
 from bot_graphql.filter.user_joined_voice_channel_filter import UserJoinedVoiceChannelFilter
+from bot_graphql.model.discord import Discord
 from modules.achievements.achievement_service import AchievementService
 
 
@@ -47,8 +49,6 @@ class Query(QueryABC):
     ):
         QueryABC.__init__(self, "Query")
 
-        self._bot = bot
-
         self.add_collection("autoRole", lambda *_: auto_roles.get_auto_roles(), AutoRoleFilter)
         self.add_collection("autoRoleRule", lambda *_: auto_roles.get_auto_role_rules(), AutoRoleRuleFilter)
         self.add_collection("client", lambda *_: clients.get_clients(), ClientFilter)
@@ -73,13 +73,7 @@ class Query(QueryABC):
         self.add_collection("achievement", lambda *_: achievements.get_achievements(), AchievementFilter)
         self.set_field("technicianConfig", lambda *_: technician_config.get_technician_config())
 
-        self.set_field("guilds", self._resolve_guilds)
-        self.set_field("achievementAttributes", lambda x, *_: achievement_service.get_attributes())
-        self.set_field("achievementOperators", lambda x, *_: achievement_service.get_operators())
-        self.set_field("possibleFeatureFlags", lambda x, *_: [e.value for e in FeatureFlagsEnum])
-
-    def _resolve_guilds(self, *_, filter=None):
-        if filter is None or "id" not in filter:
-            return self._bot.guilds
-
-        return self._bot.guilds.where(lambda g: g.id == int(filter["id"]))
+        self.set_field("achievementAttributes", lambda *_: achievement_service.get_attributes())
+        self.set_field("achievementOperators", lambda *_: achievement_service.get_operators())
+        self.set_field("possibleFeatureFlags", lambda *_: [e.value for e in FeatureFlagsEnum])
+        self.set_field("discord", lambda *_: Discord(bot.guilds, List(any).extend(bot.users)))

kdb-bot/src/bot_graphql/schema.py

@@ -10,7 +10,7 @@ from bot_graphql.query import Query
 
 class Schema:
     def __init__(self, query: Query, mutation: Mutation, queries: list[QueryABC]):
-        type_defs = load_schema_from_path(os.path.join(os.path.dirname(os.path.realpath(__file__)), "model/"))
+        type_defs = load_schema_from_path(os.path.join(os.path.dirname(os.path.realpath(__file__)), "graphql/"))
         self._schema = make_executable_schema(type_defs, query, mutation, *queries)
 
     @property

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

@@ -15,7 +15,7 @@ __title__ = "modules.achievements"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "1",
-      "Micro": "0.rc3"
+      "Micro": "3"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=1.1.0.rc3"
+      "cpl-core>=1.1.1"
     ],
     "DevDependencies": [
-      "cpl-cli>=1.1.0.rc3"
+      "cpl-cli>=1.1.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.events"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -53,6 +53,7 @@ class AchievementOnMessageEvent(OnMessageABC):
         user = self._users.get_user_by_discord_id_and_server_id(message.author.id, server.id)
 
         user.message_count += 1
+        self._users.update_user(user)
         self._db.save_changes()
 
         await self._achievements.validate_achievements_for_user(user)

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

@@ -53,9 +53,10 @@ class AchievementOnReactionAddEvent(OnReactionAddABC):
             return
 
         server = self._servers.get_server_by_discord_id(user.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(user.author.id, server.id)
+        user = self._users.get_user_by_discord_id_and_server_id(user.id, server.id)
 
         user.reaction_count += 1
         self._db.save_changes()
+        self._users.update_user(user)
 
         await self._achievements.validate_achievements_for_user(user)

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

@@ -53,9 +53,10 @@ class AchievementOnReactionRemoveEvent(OnReactionRemoveABC):
             return
 
         server = self._servers.get_server_by_discord_id(user.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(user.author.id, server.id)
+        user = self._users.get_user_by_discord_id_and_server_id(user.id, server.id)
 
         user.reaction_count -= 1
         self._db.save_changes()
+        self._users.update_user(user)
 
         await self._achievements.validate_achievements_for_user(user)

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

@@ -40,7 +40,7 @@ class AchievementOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         if member.guild is None:
             return
 
-        if member.author.bot:
+        if member.bot:
             return
 
         server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{member.guild.id}")
@@ -50,6 +50,6 @@ class AchievementOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             return
 
         server = self._servers.get_server_by_discord_id(member.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(member.author.id, server.id)
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
 
         await self._achievements.validate_achievements_for_user(user)

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

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc3"
+__version__ = "1.1.3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc3")
+version_info = VersionInfo(major="1", minor="1", micro="3")

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "1",
       "Minor": "1",
-      "Micro": "0.rc3"
+      "Micro": "3"
     },
     "Author": "",
     "AuthorEmail": "",