Merge pull request 'Levelsystem per Befehl neuladen #164' (#175) from #164 into 0.3.1

Reviewed-on: sh-edraft.de/kd_discord_bot#175
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #164

kdb-bot/src/bot/startup_settings_extension.py

@@ -31,6 +31,8 @@ class StartupSettingsExtension(StartupExtensionABC):
         configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
         # load feature-flags
         configuration.add_json_file(f'config/feature-flags.json', optional=False)
+        configuration.add_json_file(f'config/feature-flags.{environment.environment_name}.json', optional=True)
+        configuration.add_json_file(f'config/feature-flags.{environment.host_name}.json', optional=True)
 
         configuration.add_configuration('Startup_StartTime', str(self._start_time))
         self._configure_settings_with_sub_settings(configuration, BotSettings, lambda x: x.servers, lambda x: x.id)

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

@@ -4,6 +4,8 @@ from typing import Callable
 from cpl_query.extension import List
 from discord.ext.commands import Context
 
+from bot_data.model.user import User
+
 
 class ClientUtilsServiceABC(ABC):
 
@@ -33,3 +35,6 @@ class ClientUtilsServiceABC(ABC):
 
     @abstractmethod
     def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List: pass
+
+    @abstractmethod
+    def get_ontime_for_user(self, user: User) -> float: pass

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

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Union
+from typing import Union, Optional
 
 import discord
 from cpl_query.extension import List
@@ -19,13 +19,24 @@ class MessageServiceABC(ABC):
     async def delete_message(self, message: discord.Message, without_tracking=False): pass
 
     @abstractmethod
-    async def send_channel_message(self, channel: discord.TextChannel, message: Union[str, discord.Embed], without_tracking=True): pass
+    async def send_channel_message(
+            self, channel: discord.TextChannel, message: Union[str, discord.Embed], without_tracking=True
+    ): pass
 
     @abstractmethod
-    async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False): pass
+    async def send_dm_message(
+            self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member],
+            without_tracking=False
+    ): pass
 
     @abstractmethod
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True): pass
+    async def send_ctx_msg(
+            self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None,
+            is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True
+    ) -> Optional[discord.Message]: pass
 
     @abstractmethod
-    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True, **kwargs): pass
+    async def send_interaction_msg(
+            self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False,
+            is_public: bool = False, wait_before_delete: int = None, without_tracking=True, **kwargs
+    ): pass

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

@@ -17,6 +17,8 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.model.user import User
 
 
 class ClientUtilsService(ClientUtilsServiceABC):
@@ -28,6 +30,7 @@ class ClientUtilsService(ClientUtilsServiceABC):
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             clients: ClientRepositoryABC,
+            user_joined_vc: UserJoinedVoiceChannelRepositoryABC,
             message_service: MessageServiceABC,
             db: DatabaseContextABC,
             t: TranslatePipe,
@@ -39,6 +42,7 @@ class ClientUtilsService(ClientUtilsServiceABC):
         self._bot = bot
         self._servers = servers
         self._clients = clients
+        self._user_joined_voice_channel = user_joined_vc
         self._message_service = message_service
         self._db = db
         self._t = t
@@ -80,7 +84,11 @@ class ClientUtilsService(ClientUtilsServiceABC):
     async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool:
         result = await self.check_if_bot_is_ready_yet()
         if not result:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('common.errors.bot_not_ready_yet'),
+                without_tracking=True
+            )
 
         return result
 
@@ -106,3 +114,8 @@ class ClientUtilsService(ClientUtilsServiceABC):
             _l = _l.where(lambda x: x.name in sl)
 
         return _l.take(25)
+
+    def get_ontime_for_user(self, user: User) -> float:
+        return self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id) \
+            .where(lambda x: x.leaved_on is not None and x.joined_on is not None) \
+            .sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))

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

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Union
+from typing import Union, Optional
 
 import discord
 from cpl_core.configuration.configuration_abc import ConfigurationABC
@@ -18,13 +18,14 @@ from bot_data.abc.client_repository_abc import ClientRepositoryABC
 
 class MessageService(MessageServiceABC):
 
-    def __init__(self, config: ConfigurationABC, logger: MessageLogger, bot: DiscordBotServiceABC, clients: ClientRepositoryABC, db: DatabaseContextABC):
+    def __init__(self, config: ConfigurationABC, logger: MessageLogger, bot: DiscordBotServiceABC,
+                 clients: ClientRepositoryABC, db: DatabaseContextABC):
         self._config = config
         self._logger = logger
         self._bot = bot
         self._clients = clients
         self._db = db
-    
+
     async def delete_messages(self, messages: List[discord.Message], guild_id: int, without_tracking=False):
         self._logger.debug(__name__, f'Try to delete {messages.count()} messages')
         server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{guild_id}')
@@ -32,13 +33,18 @@ class MessageService(MessageServiceABC):
         for message in messages:
             await self.delete_message(message, mass_delete=True, without_tracking=without_tracking)
         self._logger.debug(__name__, 'Deleting messages finished')
-        
+
     async def delete_message(self, message: discord.Message, mass_delete=False, without_tracking=False):
-        server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{message.guild.id}')
+        guild_id = \
+            message.guild.id if message.guild is not None else \
+                message.channel.guild.id if message.channel is not None and message.channel.guild is not None else \
+                    message.reference.guild_id if message.reference is not None and message.reference.guild_id is not None \
+                        else None
+
+        server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{guild_id}')
         if not mass_delete:
             await asyncio.sleep(server_st.message_delete_timer)
         self._logger.debug(__name__, f'Try to delete message: {LogMessageHelper.get_log_string(message)}')
-        guild_id = message.guild.id
         try:
             await message.delete()
             await asyncio.sleep(server_st.message_delete_timer)
@@ -49,8 +55,11 @@ class MessageService(MessageServiceABC):
                 self._clients.append_deleted_message_count(self._bot.user.id, guild_id, 1)
                 self._db.save_changes()
             self._logger.info(__name__, f'Deleted message {message}')
-    
-    async def send_channel_message(self, channel: discord.TextChannel, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
+
+    async def send_channel_message(
+            self, channel: discord.TextChannel, message: Union[str, discord.Embed], is_persistent: bool = False,
+            wait_before_delete: int = None, without_tracking=False
+    ):
         self._logger.debug(__name__, f'Try to send message\n\t{message}\n\tto: {channel}')
         msg = None
         try:
@@ -73,8 +82,11 @@ class MessageService(MessageServiceABC):
                 return
 
             await self.delete_message(msg, without_tracking)
-    
-    async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False):
+
+    async def send_dm_message(
+            self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member],
+            without_tracking=False
+    ):
         self._logger.debug(__name__, f'Try to send message\n\t{message}\n\tto: {receiver}')
         try:
             if isinstance(message, discord.Embed):
@@ -88,13 +100,16 @@ class MessageService(MessageServiceABC):
                 self._clients.append_sent_message_count(self._bot.user.id, receiver.guild.id, 1)
                 self._db.save_changes()
             self._logger.info(__name__, f'Sent message to user {receiver.id}')
-    
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False):
+
+    async def send_ctx_msg(
+            self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None,
+            is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False
+    ) -> Optional[discord.Message]:
         if ctx is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
-            return
-        
+            return None
+
         self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {ctx.channel}')
         msg = None
         try:
@@ -114,12 +129,17 @@ class MessageService(MessageServiceABC):
                 await asyncio.sleep(wait_before_delete)
 
             if is_persistent:
-                return
+                return msg
 
             if ctx.guild is not None:
                 await self.delete_message(msg, without_tracking)
 
-    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False, **kwargs):
+        return msg
+
+    async def send_interaction_msg(
+            self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False,
+            is_public: bool = False, wait_before_delete: int = None, without_tracking=False, **kwargs
+    ):
         if interaction is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')

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

@@ -94,7 +94,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
         )
 
     def find_active_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[Optional[UserJoinedVoiceChannel]]:
-        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)}')
+        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)}')
         result = List(UserJoinedVoiceChannel)
         db_results = self._context.select(UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id))
 

kdb-bot/src/modules/base/command/user_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 mysql.connector.errors import DatabaseError
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
@@ -98,10 +97,6 @@ class UserGroup(DiscordCommandABC):
             color=int('ef9d0d', 16)
         )
 
-        ontime = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)\
-            .where(lambda x: x.leaved_on is not None and x.joined_on is not None)\
-            .sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
-
         embed.add_field(name=self._t.transform('modules.base.user.atr.id'), value=member.id)
         embed.add_field(name=self._t.transform('modules.base.user.atr.name'), value=member.name)
         embed.add_field(name=self._t.transform('modules.base.user.atr.discord_join'),
@@ -109,7 +104,8 @@ class UserGroup(DiscordCommandABC):
         embed.add_field(name=self._t.transform('modules.base.user.atr.last_join'),
                         value=self._date.transform(member.joined_at), inline=False)
         embed.add_field(name=self._t.transform('modules.base.user.atr.xp'), value=str(user.xp))
-        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'), value=str(ontime))
+        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'),
+                        value=str(self._client_utils.get_ontime_for_user(user)))
 
         roles = ''
         for role in member.roles:
@@ -162,14 +158,13 @@ class UserGroup(DiscordCommandABC):
             value = str(user.xp)
 
         elif atr == 'ontime':
-            value = str(round(
-                self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
-                .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
-                2
-            ))
+            value = str(self._client_utils.get_ontime_for_user(user))
 
         else:
-            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            await self._message_service.send_interaction_msg(
+                ctx.interaction,
+                self._t.transform('modules.base.user.error.atr_not_found').format(atr)
+            )
             return
 
         await self._message_service.send_interaction_msg(
@@ -196,14 +191,19 @@ class UserGroup(DiscordCommandABC):
 
         if atr == 'xp':
             if not value.isnumeric():
-                await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.set.error.value_type_not_numeric'))
+                await self._message_service.send_interaction_msg(
+                    ctx.interaction, self._t.transform('modules.base.user.set.error.value_type_not_numeric')
+                )
                 return
 
             try:
                 user.xp = int(value)
             except TypeError as te:
                 self._logger.error(__name__, f'String value couldn\'t be converted to int', te)
-                await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.set.error.type_error'))
+                await self._message_service.send_interaction_msg(
+                    ctx.interaction,
+                    self._t.transform('modules.base.user.set.error.type_error')
+                )
                 return
             else:
                 self._users.update_user(user)
@@ -211,10 +211,16 @@ class UserGroup(DiscordCommandABC):
                 await self._level.check_level(member)
 
         else:
-            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            await self._message_service.send_interaction_msg(
+                ctx.interaction,
+                self._t.transform('modules.base.user.error.atr_not_found').format(atr)
+            )
             return
 
-        await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform(f'modules.base.user.set.{atr.lower()}').format(member.mention, value))
+        await self._message_service.send_interaction_msg(
+            ctx.interaction,
+            self._t.transform(f'modules.base.user.set.{atr.lower()}').format(member.mention, value)
+        )
 
     @set.autocomplete('atr')
     async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
@@ -245,7 +251,10 @@ class UserGroup(DiscordCommandABC):
             self._db.save_changes()
 
         else:
-            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            await self._message_service.send_interaction_msg(
+                ctx.interaction,
+                self._t.transform('modules.base.user.error.atr_not_found').format(atr)
+            )
             return
 
         await self._message_service.send_interaction_msg(
@@ -254,5 +263,7 @@ class UserGroup(DiscordCommandABC):
         )
 
     @remove.autocomplete('atr')
-    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
+    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> List[
+        app_commands.Choice[str]
+    ]:
         return [app_commands.Choice(name=value, value=key) for key, value in self._atr_list]

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

@@ -7,6 +7,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -32,6 +33,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             users: UserRepositoryABC,
             user_joins: UserJoinedServerRepositoryABC,
             user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
+            client_utils: ClientUtilsServiceABC,
             db: DatabaseContextABC,
     ):
         OnVoiceStateUpdateABC.__init__(self)
@@ -43,6 +45,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         self._users = users
         self._user_joins = user_joins
         self._user_joins_vc = user_joins_vc
+        self._client_utils = client_utils
         self._db = db
 
         self._logger.info(__name__, f'Module {type(self)} loaded')
@@ -72,7 +75,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             join.leaved_on = datetime.now()
 
             # ontime as hours
-            ontime = round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2)
+            ontime = self._client_utils.get_ontime_for_user(user)
             old_xp = user.xp
             user.xp += round(ontime * settings.xp_per_ontime_hour)
 
@@ -80,12 +83,18 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             self._users.update_user(user)
             self._db.save_changes()
 
-            self._logger.debug(__name__, f'User {user} leaved_on {join.leaved_on}. Ontime: {ontime}h | xp: from {old_xp} to {user.xp}')
+            self._logger.debug(__name__,
+                               f'User {user} leaved_on {join.leaved_on}. Ontime: {ontime}h | xp: from {old_xp} to {user.xp}')
         except Exception as e:
             self._logger.error(__name__, f'Ontime validation failed', e)
 
     @EventChecks.check_is_ready()
-    async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
+    async def on_voice_state_update(
+            self,
+            member: discord.Member,
+            before: discord.VoiceState,
+            after: discord.VoiceState
+    ):
         self._logger.debug(__name__, f'Module {type(self)} started')
         self._logger.trace(__name__, f'Detected on_voice_state_update {member.id} from {before} to {after}')
         settings: BaseServerSettings = self._base_helper.get_config(member.guild.id)
@@ -116,5 +125,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
 
                 else:
                     self._logger.trace(__name__, f'User {member.id} switched to {after.channel}')
+                    self._update_voice_state(False, member.id, before.channel.id, server)
+                    self._update_voice_state(True, member.id, after.channel.id, server)
         except Exception as e:
             self._logger.error(__name__, f'Cannot handle voice state for user {member.id}', e)

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

@@ -3,6 +3,7 @@ from cpl_core.logging import LoggerABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
+from bot_core.helper.log_message_helper import LogMessageHelper
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from modules.base.abc.base_helper_abc import BaseHelperABC
@@ -36,6 +37,20 @@ class BaseReactionHandler:
             self._logger.warn(__name__, f'User {payload.user_id} in {guild.name} not found - skipping')
             return
 
+        try:
+            log_msg = f'{member.name} reacted'
+            if payload.emoji.name is not None:
+                log_msg += f' with {payload.emoji.name}'
+            try:
+                channel = guild.get_channel(payload.channel_id)
+                message = await channel.fetch_message(payload.message_id)
+                self._logger.info(__name__, f'{log_msg} to message {LogMessageHelper.get_log_string(message)}')
+            except Exception as e:
+                self._logger.error(__name__, f'Getting message for reaction logging failed', e)
+                self._logger.info(__name__, f'{log_msg} to message {payload.message_id}')
+        except Exception as e:
+            self._logger.error(__name__, f'Reaction logging failed', e)
+
         if member.bot:
             return
 

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

@@ -83,20 +83,34 @@ class LevelGroup(DiscordCommandABC):
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
-    async def _seed_levels(self, channel: discord.TextChannel):
+    async def _seed_levels(self, ctx: Context):
         # send message to ctx.channel because send_ctx_msg resolves ctx
         try:
-            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_started'))
+            start = await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.seeding_started'),
+                is_persistent=True
+            )
             await self._level_seeder.seed()
-            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_finished'))
+
+            end = await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.seeding_finished'),
+                is_persistent=True
+            )
+            await self._message_service.delete_message(start)
+            await self._message_service.delete_message(end)
+
         except Exception as e:
             self._logger.error(__name__, f'Level seeding failed', e)
-            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_failed'))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.seeding_failed'))
 
-    async def _level_auto_complete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+    async def _level_auto_complete(self, interaction: discord.Interaction, current: str) -> TList[
+        app_commands.Choice[str]]:
         server = self._servers.get_server_by_discord_id(interaction.guild.id)
         levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
-        return [app_commands.Choice(name=level, value=level) for level in self._client_utils.get_auto_complete_list(levels, current)]
+        return [app_commands.Choice(name=level, value=level) for level in
+                self._client_utils.get_auto_complete_list(levels, current)]
 
     @commands.hybrid_group()
     @commands.guild_only()
@@ -167,41 +181,66 @@ class LevelGroup(DiscordCommandABC):
 
         if levels.where(lambda l: l.name == level.name).first_or_default() is not None:
             self._logger.debug(__name__, f'Level with name {level.name} already exists')
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.error.level_with_name_already_exists').format(level.name))
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.error.level_with_name_already_exists').format(level.name)
+            )
         elif levels.where(lambda l: l.min_xp == level.min_xp).first_or_default() is not None:
             self._logger.debug(__name__, f'Level with min_xp {level.min_xp} already exists {level.name}')
             found_level = levels.where(lambda l: l.min_xp == level.min_xp).first_or_default()
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.error.level_with_xp_already_exists').format(found_level.name, found_level.min_xp))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform(
+                'modules.level.error.level_with_xp_already_exists').format(found_level.name, found_level.min_xp))
         else:
             try:
                 self._levels.add_level(level)
                 self._db.save_changes()
-                self._logger.info(__name__, f'Saved level {name} with color {color}, min_xp {min_xp} and permissions {permissions}')
+                self._logger.info(
+                    __name__, f'Saved level {name} with color {color}, min_xp {min_xp} and permissions {permissions}'
+                )
             except Exception as e:
-                self._logger.error(__name__, f'Could not save level {name} with color {color}, min_xp {min_xp} and permissions {permissions}', e)
+                self._logger.error(
+                    __name__,
+                    f'Could not save level {name} with color {color}, min_xp {min_xp} and permissions {permissions}',
+                    e
+                )
             else:
-                await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.create.created').format(name, permissions))
-                await self._seed_levels(ctx.channel)
+                await self._message_service.send_ctx_msg(
+                    ctx,
+                    self._t.transform('modules.level.create.created').format(name, permissions)
+                )
+                await self._seed_levels(ctx)
 
         self._logger.trace(__name__, f'Finished command level create')
 
     @create.autocomplete('color')
-    async def create_color_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+    async def create_color_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[
+        app_commands.Choice[str]]:
         # value in rg format see:
         # https://discordpy.readthedocs.io/en/latest/api.html#discord.Colour.to_rgb
-        return [app_commands.Choice(name=self._t.transform(f'common.colors.{color}'), value=f'rgb({code[0]}, {code[1]}, {code[2]})') for color, code in self._colors]
+        return [
+            app_commands.Choice(
+                name=self._t.transform(f'common.colors.{color}'), value=f'rgb({code[0]}, {code[1]}, {code[2]})'
+            ) for color, code in self._colors
+        ]
 
     @level.command()
     @commands.guild_only()
     @CommandChecks.check_is_ready()
     @CommandChecks.check_is_member_admin()
-    async def edit(self, ctx: Context, level: str, name: str = None, color: str = None, min_xp: int = None, permissions: int = None):
+    async def edit(
+            self, ctx: Context, level: str, name: str = None, color: str = None, min_xp: int = None,
+            permissions: int = None
+    ):
         self._logger.debug(__name__, f'Received command level edit {ctx}')
 
         server = self._servers.get_server_by_discord_id(ctx.guild.id)
-        level_from_db = self._levels.get_levels_by_server_id(server.server_id).where(lambda l: l.name == level).single_or_default()
+        level_from_db = self._levels.get_levels_by_server_id(server.server_id).where(
+            lambda l: l.name == level).single_or_default()
         if level_from_db is None:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.edit.not_found').format(level))
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.edit.not_found').format(level)
+            )
             return
 
         guild: Guild = self._bot.guilds.where(lambda g: g == ctx.guild).single()
@@ -214,7 +253,10 @@ class LevelGroup(DiscordCommandABC):
             try:
                 level_from_db.color = hex(discord.Colour.from_str(color).value)
             except Exception as e:
-                await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.edit.color_invalid').format(color))
+                await self._message_service.send_ctx_msg(
+                    ctx,
+                    self._t.transform('modules.level.edit.color_invalid').format(color)
+                )
                 self._logger.error(__name__, f'Error parsing color {color}', e)
                 return
 
@@ -225,33 +267,51 @@ class LevelGroup(DiscordCommandABC):
             try:
                 level_from_db.permissions = discord.Permissions(permissions).value
             except Exception as e:
-                await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.edit.permission_invalid').format(permissions))
+                await self._message_service.send_ctx_msg(ctx, self._t.transform(
+                    'modules.level.edit.permission_invalid').format(permissions))
                 self._logger.error(__name__, f'Error parsing permissions {permissions}', e)
                 return
 
         try:
             self._levels.update_level(level_from_db)
             self._db.save_changes()
-            await role.edit(name=level_from_db.name, permissions=discord.Permissions(level_from_db.permissions), colour=discord.Colour(int(level_from_db.color, 16)))
-            self._logger.info(__name__,
-                              f'Saved level {level_from_db.name} with color {level_from_db.color}, min_xp {level_from_db.min_xp} and permissions {level_from_db.permissions}')
+            await role.edit(
+                name=level_from_db.name,
+                permissions=discord.Permissions(level_from_db.permissions),
+                colour=discord.Colour(int(level_from_db.color, 16))
+            )
+            self._logger.info(
+                __name__,
+                f'Saved level {level_from_db.name} with color {level_from_db.color}, min_xp {level_from_db.min_xp} and permissions {level_from_db.permissions}'
+            )
         except Exception as e:
-            self._logger.error(__name__, f'Could not save level {level} with color {color}, min_xp {min_xp} and permissions {permissions}', e)
+            self._logger.error(
+                __name__,
+                f'Could not save level {level} with color {color}, min_xp {min_xp} and permissions {permissions}',
+                e
+            )
         else:
             await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.edit.edited').format(level))
-            await self._seed_levels(ctx.channel)
+            await self._seed_levels(ctx)
 
         self._logger.trace(__name__, f'Finished command level edit')
 
     @edit.autocomplete('level')
-    async def edit_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+    async def edit_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[
+        app_commands.Choice[str]]:
         return await self._level_auto_complete(interaction, current)
 
     @edit.autocomplete('color')
-    async def edit_color_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+    async def edit_color_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[
+        app_commands.Choice[str]]:
         # value in rg format see:
         # https://discordpy.readthedocs.io/en/latest/api.html#discord.Colour.to_rgb
-        return [app_commands.Choice(name=self._t.transform(f'common.colors.{color}'), value=f'rgb({code[0]}, {code[1]}, {code[2]})') for color, code in self._colors]
+        return [
+            app_commands.Choice(
+                name=self._t.transform(f'common.colors.{color}'),
+                value=f'rgb({code[0]}, {code[1]}, {code[2]})'
+            ) for color, code in self._colors
+        ]
 
     @level.command()
     @commands.guild_only()
@@ -261,10 +321,14 @@ class LevelGroup(DiscordCommandABC):
         self._logger.debug(__name__, f'Received command level remove {ctx}')
 
         server = self._servers.get_server_by_discord_id(ctx.guild.id)
-        level_from_db = self._levels.get_levels_by_server_id(server.server_id).where(lambda l: l.name == level).first_or_default()
+        level_from_db = self._levels.get_levels_by_server_id(server.server_id).where(
+            lambda l: l.name == level).first_or_default()
         if level_from_db is None:
             self._logger.debug(__name__, f'level {level} not found')
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.remove.error.not_found').format(level))
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.remove.error.not_found').format(level)
+            )
             self._logger.trace(__name__, f'Finished command level remove')
             return
 
@@ -279,13 +343,17 @@ class LevelGroup(DiscordCommandABC):
         except Exception as e:
             self._logger.error(__name__, f'Could not remove level {level}', e)
         else:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.remove.success').format(level))
-            await self._seed_levels(ctx.channel)
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.remove.success').format(level)
+            )
+            await self._seed_levels(ctx)
 
         self._logger.trace(__name__, f'Finished command level remove')
 
     @remove.autocomplete('level')
-    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[
+        app_commands.Choice[str]]:
         return await self._level_auto_complete(interaction, current)
 
     @level.command()
@@ -304,7 +372,9 @@ class LevelGroup(DiscordCommandABC):
         levels = self._levels.get_levels_by_server_id(server.server_id).order_by(lambda l: l.min_xp)
 
         if level == levels.first():
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.down.already_first').format(member.mention))
+            await self._message_service.send_ctx_msg(
+                ctx, self._t.transform('modules.level.down.already_first').format(member.mention)
+            )
             self._logger.trace(__name__, f'Finished command level down')
             return
 
@@ -313,11 +383,13 @@ class LevelGroup(DiscordCommandABC):
             user.xp = new_level.min_xp
             self._users.update_user(user)
             self._db.save_changes()
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.down.success').format(member.mention, new_level.name))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.down.success').format(
+                member.mention, new_level.name))
             await self._level_service.set_level(user)
         except Exception as e:
             self._logger.error(__name__, f'Cannot level down {member.name} with level {level.name}', e)
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.down.failed').format(member.mention))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.down.failed').format(
+                member.mention))
 
         self._logger.trace(__name__, f'Finished command level down')
 
@@ -337,7 +409,10 @@ class LevelGroup(DiscordCommandABC):
         levels = self._levels.get_levels_by_server_id(server.server_id).order_by(lambda l: l.min_xp)
 
         if level.name == levels.last().name:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.up.already_last').format(member.mention))
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.up.already_last').format(member.mention)
+            )
             self._logger.trace(__name__, f'Finished command level up')
             return
 
@@ -346,11 +421,13 @@ class LevelGroup(DiscordCommandABC):
             user.xp = new_level.min_xp
             self._users.update_user(user)
             self._db.save_changes()
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.up.success').format(member.mention, new_level.name))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.up.success').format(
+                member.mention, new_level.name))
             await self._level_service.set_level(user)
         except Exception as e:
             self._logger.error(__name__, f'Cannot level up {member.name} with level {level.name}', e)
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.up.failed').format(member.mention))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.up.failed').format(
+                member.mention))
 
         self._logger.trace(__name__, f'Finished command level up')
 
@@ -367,15 +444,20 @@ class LevelGroup(DiscordCommandABC):
         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.server_id)
         current_level = self._level_service.get_level(user)
-        new_level = self._levels.get_levels_by_server_id(server.server_id).where(lambda l: l.name == level).single_or_default()
+        new_level = self._levels.get_levels_by_server_id(server.server_id).where(
+            lambda l: l.name == level).single_or_default()
 
         if new_level is None:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.not_found').format(level))
+            await self._message_service.send_ctx_msg(
+                ctx,
+                self._t.transform('modules.level.set.not_found').format(level)
+            )
             self._logger.trace(__name__, f'Finished command level set')
             return
 
         if current_level.name == level:
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.already_level').format(member.mention, level))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.already_level').format(
+                member.mention, level))
             self._logger.trace(__name__, f'Finished command level set')
             return
 
@@ -383,14 +465,25 @@ class LevelGroup(DiscordCommandABC):
             user.xp = new_level.min_xp
             self._users.update_user(user)
             self._db.save_changes()
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.success').format(member.mention, new_level.name))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.success').format(
+                member.mention, new_level.name))
             await self._level_service.set_level(user)
         except Exception as e:
             self._logger.error(__name__, f'Cannot set level {level} for {member.name}', e)
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.failed').format(member.mention))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.set.failed').format(
+                member.mention))
 
         self._logger.trace(__name__, f'Finished command level set')
 
     @set.autocomplete('level')
     async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
         return await self._level_auto_complete(interaction, current)
+
+    @level.command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def reload(self, ctx: Context):
+        self._logger.debug(__name__, f'Received command level reload {ctx}')
+        await self._seed_levels(ctx)
+        self._logger.trace(__name__, f'Finished command level reload')

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

@@ -42,8 +42,15 @@ class LevelService:
         self._t = t
 
     def get_level(self, user: User) -> Level:
-        levels = self._levels.get_levels_by_server_id(user.server.server_id).order_by(lambda l: l.min_xp)
-        return levels.where(lambda l: user.xp >= l.min_xp).last()
+        levels_by_server = self._levels.get_levels_by_server_id(user.server.server_id)
+        levels = levels_by_server \
+            .order_by(lambda l: l.min_xp) \
+            .where(lambda l: user.xp >= l.min_xp)
+
+        if levels.count() == 0:
+            return levels_by_server.order_by(lambda l: l.min_xp).last()
+
+        return levels.last()
 
     async def set_level(self, user: User):
         level_names = self._levels.get_levels_by_server_id(user.server.server_id).select(lambda l: l.name)