Merge pull request '0.3' (#146) from 0.3 into master

Reviewed-on: sh-edraft.de/kd_discord_bot#146
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>

kdb-bot/src/bot/application.py

@@ -44,9 +44,7 @@ class Application(DiscordBotApplicationABC):
         try:
             self._logger.debug(__name__, f'Starting...')
 
-            if self._feature_flags.get_flag(FeatureFlagsEnum.api_module) and \
-                    self._feature_flags.get_flag(FeatureFlagsEnum.api_only) and \
-                    self._environment.environment_name == 'development':
+            if self._feature_flags.get_flag(FeatureFlagsEnum.api_module) and self._feature_flags.get_flag(FeatureFlagsEnum.api_only) and self._environment.environment_name == 'development':
                 self._api.start()
                 self._api.join()
                 return

kdb-bot/src/bot/bot.json

@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.12.1.post2",
-      "cpl-translation==2022.12.1",
-      "cpl-query==2022.12.2.post1",
-      "cpl-discord==2022.12.1.post2",
+      "cpl-core==2022.12.0",
+      "cpl-translation==2022.10.0.post2",
+      "cpl-query==2022.12.2",
+      "cpl-discord==2022.12.0",
       "Flask==2.2.2",
       "Flask-Classful==0.14.2",
       "Flask-Cors==3.0.10",
@@ -31,7 +31,7 @@
       "icmplib==3.0.3"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.1.post2"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

@@ -1,20 +0,0 @@
-from cpl_core.application import ApplicationExtensionABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_discord.service import DiscordBotServiceABC
-
-from bot_core.configuration.bot_settings import BotSettings
-
-
-class InitBotExtension(ApplicationExtensionABC):
-
-    def __init__(self):
-        ApplicationExtensionABC.__init__(self)
-
-    async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
-        settings = config.get_configuration(BotSettings)
-
-        bot: DiscordBotServiceABC = services.get_service(
-            DiscordBotServiceABC,
-            max_messages=settings.cache_max_messages
-        )

kdb-bot/src/bot/main.py

@@ -6,7 +6,6 @@ from cpl_core.application import ApplicationBuilder
 from cpl_core.console import Console
 
 from bot.application import Application
-from bot.extension.init_bot_extension import InitBotExtension
 from bot.startup import Startup
 from bot.startup_discord_extension import StartupDiscordExtension
 from bot.startup_migration_extension import StartupMigrationExtension
@@ -30,7 +29,6 @@ class Program:
             .use_extension(StartupDiscordExtension) \
             .use_extension(StartupModuleExtension) \
             .use_extension(StartupMigrationExtension) \
-            .use_extension(InitBotExtension) \
             .use_extension(BootLogExtension) \
             .use_extension(DatabaseExtension) \
             .use_extension(AppApiExtension) \

kdb-bot/src/bot/startup_migration_extension.py

@@ -10,7 +10,6 @@ from bot_data.migration.auto_role_migration import AutoRoleMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
 from bot_data.migration.stats_migration import StatsMigration
-from bot_data.migration.user_message_count_per_hour_migration import UserMessageCountPerHourMigration
 from bot_data.service.migration_service import MigrationService
 
 
@@ -30,4 +29,3 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, LevelMigration)  # 06.11.2022 #25 - 0.3.0
         services.add_transient(MigrationABC, StatsMigration)  # 09.11.2022 #46 - 0.3.0
         services.add_transient(MigrationABC, AutoRoleFix1Migration)  # 30.12.2022 #151 - 0.3.0
-        services.add_transient(MigrationABC, UserMessageCountPerHourMigration)  # 11.01.2023 #168 - 0.3.1

kdb-bot/src/bot/startup_settings_extension.py

@@ -31,8 +31,6 @@ 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,13 +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
-from modules.base.configuration.base_server_settings import BaseServerSettings
-from bot_data.model.user import User
 
-
-
-class ClientUtilsABC(ABC):
+class ClientUtilsServiceABC(ABC):
 
     @abstractmethod
     def __init__(self): pass
@@ -38,12 +33,3 @@ class ClientUtilsABC(ABC):
 
     @abstractmethod
     def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List: pass
-
-    @abstractmethod
-    def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-            self, created_at: datetime, user: User, settings: BaseServerSettings,
-            is_reaction: bool = False
-    ) -> bool: 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, Optional
+from typing import Union
 
 import discord
 from cpl_query.extension import List
@@ -19,24 +19,13 @@ 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
-    ) -> Optional[discord.Message]: 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): 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/configuration/bot_settings.py

@@ -16,7 +16,6 @@ class BotSettings(ConfigurationModelABC):
         self._technicians: List[int] = List(int)
         self._wait_for_restart = 2
         self._wait_for_shutdown = 2
-        self._cache_max_messages = 1000
     
     @property
     def servers(self) -> List[ServerSettings]:
@@ -34,10 +33,6 @@ class BotSettings(ConfigurationModelABC):
     def wait_for_shutdown(self) -> int:
         return self._wait_for_shutdown
 
-    @property
-    def cache_max_messages(self) -> int:
-        return self._cache_max_messages
-
     def from_dict(self, settings: dict):
         try:
             self._technicians = settings["Technicians"]
@@ -46,11 +41,6 @@ class BotSettings(ConfigurationModelABC):
             settings.pop("Technicians")
             settings.pop("WaitForRestart")
             settings.pop("WaitForShutdown")
-
-            if 'CacheMaxMessages' in settings:
-                self._cache_max_messages = settings["CacheMaxMessages"]
-                settings.pop("CacheMaxMessages")
-
             servers = List(ServerSettings)
             for s in settings:
                 st = ServerSettings()

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

@@ -3,7 +3,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
@@ -23,7 +23,7 @@ class CoreExtension(ApplicationExtensionABC):
             return
 
         permissions: PermissionServiceABC = services.get_service(PermissionServiceABC)
-        client_utils: ClientUtilsABC = services.get_service(ClientUtilsABC)
+        client_utils: ClientUtilsServiceABC = services.get_service(ClientUtilsServiceABC)
         message_service: MessageServiceABC = services.get_service(MessageServiceABC)
         t: TranslatePipe = services.get_service(TranslatePipe)
         CommandChecks.init(permissions, client_utils, message_service, t)

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

@@ -5,7 +5,7 @@ from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 
 
 class CoreExtensionOnReadyEvent(OnReadyABC):
@@ -14,7 +14,7 @@ class CoreExtensionOnReadyEvent(OnReadyABC):
             self,
             logger: LoggerABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             t: TranslatePipe
     ):
         OnReadyABC.__init__(self)

kdb-bot/src/bot_core/core_module.py

@@ -4,7 +4,7 @@ from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.abc.module_abc import ModuleABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
@@ -24,7 +24,7 @@ class CoreModule(ModuleABC):
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(MessageServiceABC, MessageService)
-        services.add_transient(ClientUtilsABC, ClientUtilsService)
+        services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
 
         # pipes
         services.add_transient(DateTimeOffsetPipe)

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

@@ -3,7 +3,7 @@ from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 
 
 class CoreOnReadyEvent(OnReadyABC):
@@ -12,7 +12,7 @@ class CoreOnReadyEvent(OnReadyABC):
             self,
             logger: LoggerABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             t: TranslatePipe,
     ):
         OnReadyABC.__init__(self)

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

@@ -4,7 +4,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.exception.check_error import CheckError
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
@@ -12,7 +12,7 @@ from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 class CommandChecks:
     _permissions: Optional[PermissionServiceABC] = None
-    _client_utils: Optional[ClientUtilsABC] = None
+    _client_utils: Optional[ClientUtilsServiceABC] = None
     _message_service: Optional[MessageServiceABC] = None
     _t: Optional[TranslatePipe] = None
 
@@ -20,7 +20,7 @@ class CommandChecks:
     def init(
             cls,
             permissions: PermissionServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             message_service: MessageServiceABC,
             translate: TranslatePipe,
     ):

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

@@ -4,19 +4,19 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.exception.check_error import CheckError
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class EventChecks:
-    _client_utils: Optional[ClientUtilsABC] = None
+    _client_utils: Optional[ClientUtilsServiceABC] = None
 
     @classmethod
     def init(
             cls,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
     ):
         cls._client_utils = client_utils
 

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

@@ -1,54 +1,44 @@
 from typing import Callable
 
 import discord
-from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
-from cpl_core.time import TimeFormatSettings
+
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from cpl_translation import TranslatePipe
+from discord import app_commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
-from bot_data.model.user import User
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
-class ClientUtilsService(ClientUtilsABC):
+class ClientUtilsService(ClientUtilsServiceABC):
 
     def __init__(
             self,
             config: ConfigurationABC,
             logger: LoggerABC,
-            time_format: TimeFormatSettings,
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             clients: ClientRepositoryABC,
-            umcphs: UserMessageCountPerHourRepositoryABC,
-            user_joined_vc: UserJoinedVoiceChannelRepositoryABC,
             message_service: MessageServiceABC,
             db: DatabaseContextABC,
             t: TranslatePipe,
             feature_flags: FeatureFlagsSettings
     ):
-        ClientUtilsABC.__init__(self)
+        ClientUtilsServiceABC.__init__(self)
         self._config = config
         self._logger = logger
-        self._time_format = time_format
         self._bot = bot
         self._servers = servers
-        self._umcphs = umcphs
         self._clients = clients
-        self._user_joined_voice_channel = user_joined_vc
         self._message_service = message_service
         self._db = db
         self._t = t
@@ -90,13 +80,7 @@ class ClientUtilsService(ClientUtilsABC):
     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
-            )
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
 
         return result
 
@@ -122,53 +106,3 @@ class ClientUtilsService(ClientUtilsABC):
             _l = _l.where(lambda x: x.name in sl)
 
         return _l.take(25)
-
-    def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-            self,
-            created_at: datetime,
-            user: User,
-            settings: BaseServerSettings,
-            is_reaction: bool = False
-    ) -> bool:
-        umcph = None
-        try:
-            umcph = self._umcphs.find_user_message_count_per_hour_by_user_id_and_date(user.user_id, created_at)
-            if umcph is None:
-                self._umcphs.add_user_message_count_per_hour(UserMessageCountPerHour(
-                    created_at.strftime(self._time_format.date_time_format),
-                    created_at.hour,
-                    0,
-                    user
-                ))
-
-                self._db.save_changes()
-
-                umcph = self._umcphs.get_user_message_count_per_hour_by_user_id_and_date(
-                    user.user_id,
-                    created_at
-                )
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot add user message count per hour with id {umcph.id}', e)
-            return False
-
-        try:
-            if is_reaction:
-                umcph.xp_count += settings.xp_per_reaction
-            else:
-                umcph.xp_count += settings.xp_per_message
-
-            self._umcphs.update_user_message_count_per_hour(umcph)
-            self._db.save_changes()
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot update user message count per hour with id {umcph.id}', e)
-            return False
-
-        if umcph.xp_count is None:
-            return False
-
-        return umcph.xp_count > settings.max_message_xp_per_hour
-
-    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, Optional
+from typing import Union
 
 import discord
 from cpl_core.configuration.configuration_abc import ConfigurationABC
@@ -18,8 +18,7 @@ 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
@@ -35,16 +34,11 @@ class MessageService(MessageServiceABC):
         self._logger.debug(__name__, 'Deleting messages finished')
         
     async def delete_message(self, message: discord.Message, mass_delete=False, without_tracking=False):
-        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}')
+        server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{message.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)
@@ -56,10 +50,7 @@ class MessageService(MessageServiceABC):
                 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:
@@ -83,10 +74,7 @@ class MessageService(MessageServiceABC):
 
             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):
@@ -101,14 +89,11 @@ class MessageService(MessageServiceABC):
                 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
-    ) -> Optional[discord.Message]:
+    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):
         if ctx is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
-            return None
+            return
         
         self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {ctx.channel}')
         msg = None
@@ -129,17 +114,12 @@ class MessageService(MessageServiceABC):
                 await asyncio.sleep(wait_before_delete)
 
             if is_persistent:
-                return msg
+                return
 
             if ctx.guild is not None:
                 await self.delete_message(msg, without_tracking)
 
-        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
-    ):
+    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/abc/user_message_count_per_hour_repository_abc.py

@@ -1,39 +0,0 @@
-from abc import ABC, abstractmethod
-from datetime import datetime
-from typing import Optional
-
-from cpl_query.extension import List
-
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-
-
-class UserMessageCountPerHourRepositoryABC(ABC):
-
-    @abstractmethod
-    def __init__(self): pass
-
-    @abstractmethod
-    def get_user_message_count_per_hours(self) -> List[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def update_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def delete_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def delete_user_message_count_per_hour_by_user_id(self, user_id: int): pass

kdb-bot/src/bot_data/data_module.py

@@ -13,8 +13,7 @@ from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.statistic_repository_abc import StatisticRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.service.auth_user_repository_service import AuthUserRepositoryService
 from bot_data.service.auto_role_repository_service import AutoRoleRepositoryService
@@ -25,8 +24,7 @@ from bot_data.service.seeder_service import SeederService
 from bot_data.service.server_repository_service import ServerRepositoryService
 from bot_data.service.statistic_repository_service import StatisticRepositoryService
 from bot_data.service.user_joined_server_repository_service import UserJoinedServerRepositoryService
-from bot_data.service.user_joined_voice_channel_repository_service import UserJoinedVoiceChannelRepositoryService
-from bot_data.service.user_message_count_per_hour_repository_service import UserMessageCountPerHourRepositoryService
+from bot_data.service.user_joined_voice_channel_service import UserJoinedVoiceChannelRepositoryService
 from bot_data.service.user_repository_service import UserRepositoryService
 
 
@@ -49,6 +47,5 @@ class DataModule(ModuleABC):
         services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
         services.add_transient(LevelRepositoryABC, LevelRepositoryService)
         services.add_transient(StatisticRepositoryABC, StatisticRepositoryService)
-        services.add_transient(UserMessageCountPerHourRepositoryABC, UserMessageCountPerHourRepositoryService)
 
         services.add_transient(SeederService)

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

@@ -1,35 +0,0 @@
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class UserMessageCountPerHourMigration(MigrationABC):
-    name = '0.3.1_UserMessageCountPerHourMigration'
-
-    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"""
-            CREATE TABLE IF NOT EXISTS `UserMessageCountPerHour` (
-                `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                `Date` DATETIME(6) NOT NULL,
-                `Hour` BIGINT,
-                `XPCount` BIGINT,
-                `UserId` BIGINT,
-                `CreatedAt` DATETIME(6),
-                `LastModifiedAt` DATETIME(6),
-                PRIMARY KEY(`Id`),
-                FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`)
-            );
-            """)
-        )
-
-    def downgrade(self):
-        self._cursor.execute('DROP TABLE `UserMessageCountPerHour`;')

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

@@ -29,7 +29,6 @@ class Level(TableABC):
     
     @name.setter
     def name(self, value: str):
-        self._modified_at = datetime.now().isoformat()
         self._name = value
         
     @property
@@ -38,7 +37,6 @@ class Level(TableABC):
     
     @color.setter
     def color(self, value: str):
-        self._modified_at = datetime.now().isoformat()
         self._color = value
         
     @property
@@ -47,7 +45,6 @@ class Level(TableABC):
     
     @min_xp.setter
     def min_xp(self, value: int):
-        self._modified_at = datetime.now().isoformat()
         self._min_xp = value
     
     @property
@@ -56,7 +53,6 @@ class Level(TableABC):
     
     @permissions.setter
     def permissions(self, value: int):
-        self._modified_at = datetime.now().isoformat()
         self._permissions = value
     
     @property
@@ -65,7 +61,6 @@ class Level(TableABC):
     
     @server.setter
     def server(self, value: Server):
-        self._modified_at = datetime.now().isoformat()
         self._server = value
 
     @staticmethod

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

@@ -1,121 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-from bot_data.model.user import User
-
-
-class UserMessageCountPerHour(TableABC):
-
-    def __init__(
-            self,
-            date: str,
-            hour: int,
-            xp_count: int,
-            user: User,
-            created_at: datetime = None,
-            modified_at: datetime = None,
-            id=0):
-        self._id = id
-        self._date = date
-        self._hour = hour
-        self._xp_count = xp_count
-        self._user = user
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def date(self) -> datetime:
-        return self._date
-
-    @property
-    def hour(self) -> int:
-        return self._hour
-
-    @property
-    def xp_count(self) -> int:
-        return self._xp_count
-
-    @xp_count.setter
-    def xp_count(self, value: int):
-        self._modified_at = datetime.now().isoformat()
-        self._xp_count = value
-
-    @property
-    def user(self) -> User:
-        return self._user
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`;
-        """)
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `Id` = {id};
-        """)
-
-    @staticmethod
-    def get_select_by_user_id_string(id: int) -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `UserId` = {id};
-        """)
-
-    @staticmethod
-    def get_select_by_user_id_and_date_string(id: int, date: datetime) -> str:
-        date_str = f'{str(date.year).zfill(4)}-{str(date.month).zfill(2)}-{str(date.day).zfill(2)}%'
-
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `UserId` = {id}
-            AND `Date` LIKE '{date_str}'
-            AND `Hour` = {date.hour};
-        """)
-
-    @property
-    def insert_string(self) -> str:
-        return str(f"""
-            INSERT INTO `UserMessageCountPerHour` (
-                `UserId`, `Date`, `Hour`, `XPCount`, `CreatedAt`, `LastModifiedAt`
-            ) VALUES (
-                {self._user.user_id},
-                '{self._date}',
-                {self._hour},
-                {self._xp_count},
-                '{self._created_at}',
-                '{self._modified_at}'
-            );
-        """)
-
-    @property
-    def udpate_string(self) -> str:
-        return str(f"""
-            UPDATE `UserMessageCountPerHour`
-            SET `XPCount` = '{self._xp_count}',
-            `LastModifiedAt` = '{self._modified_at}'
-            WHERE `Id` = {self._id};
-        """)
-
-    @property
-    def delete_string(self) -> str:
-        return str(f"""
-            DELETE FROM `UserMessageCountPerHour`
-            WHERE `Id` = {self._id};
-        """)
-
-    @staticmethod
-    def delete_by_user_id_string(id: int) -> str:
-        return str(f"""
-            DELETE FROM `UserMessageCountPerHour`
-            WHERE `UserId` = {id}
-    """)

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

@@ -4,7 +4,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_query.extension import List
 
 from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
 
@@ -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_active_by_user_id_string(user_id)}')
+        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.get_select_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/bot_data/service/user_message_count_per_hour_repository_service.py

@@ -1,101 +0,0 @@
-from datetime import datetime
-from typing import Optional
-
-from cpl_core.database.context import DatabaseContextABC
-from cpl_query.extension import List
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
-from bot_data.abc.user_repository_abc import UserRepositoryABC
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-
-
-class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepositoryABC):
-
-    def __init__(
-            self,
-            logger: DatabaseLogger,
-            db_context: DatabaseContextABC,
-            users: UserRepositoryABC,
-    ):
-        UserMessageCountPerHourRepositoryABC.__init__(self)
-
-        self._logger = logger
-        self._context = db_context
-        self._users = users
-
-    @staticmethod
-    def _get_value_from_result(value: any) -> Optional[any]:
-        if isinstance(value, str) and 'NULL' in value:
-            return None
-
-        return value
-
-    def _from_result(self, result: tuple) -> UserMessageCountPerHour:
-        return UserMessageCountPerHour(
-            self._get_value_from_result(result[1]),
-            self._get_value_from_result(result[2]),
-            self._get_value_from_result(result[3]),
-            self._users.get_user_by_id(self._get_value_from_result(result[4])),
-            self._get_value_from_result(result[5]),
-            self._get_value_from_result(result[6]),
-            id=self._get_value_from_result(result[0])
-        )
-
-    def get_user_message_count_per_hours(self) -> List[UserMessageCountPerHour]:
-        umcphs = List(UserMessageCountPerHour)
-        self._logger.trace(__name__, f'Send SQL command: {UserMessageCountPerHour.get_select_all_string()}')
-        results = self._context.select(UserMessageCountPerHour.get_select_all_string())
-        for result in results:
-            self._logger.trace(__name__, f'Get user message count per hour with id {result[0]}')
-            umcphs.append(self._from_result(result))
-
-        return umcphs
-
-    def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]:
-        umcphs = List(UserMessageCountPerHour)
-        sql = UserMessageCountPerHour.get_select_by_user_id_string(user_id)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        results = self._context.select(sql)
-        if results is None or len(results) == 0:
-            return umcphs
-
-        for result in results:
-            self._logger.trace(__name__, f'Get user message count per hour with id {result[0]}')
-            umcphs.append(self._from_result(result))
-
-        return umcphs
-
-    def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            UserMessageCountPerHour:
-        sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        result = self._context.select(sql)[0]
-        return self._from_result(result)
-
-    def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]:
-        sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        result = self._context.select(sql)
-        if result is None or len(result) == 0:
-            return None
-
-        return self._from_result(result[0])
-
-    def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.insert_string}')
-        self._context.cursor.execute(umcph.insert_string)
-
-    def update_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.udpate_string}')
-        self._context.cursor.execute(umcph.udpate_string)
-
-    def delete_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.delete_string}')
-        self._context.cursor.execute(umcph.delete_string)
-
-    def delete_user_message_count_per_hour_by_user_id(self, user_id: int):
-        sql = UserMessageCountPerHour.delete_by_user_id_string(user_id)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        self._context.cursor.execute(sql)

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

@@ -11,7 +11,7 @@ from discord import app_commands, Guild
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -29,7 +29,7 @@ class AutoRoleGroup(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             servers: ServerRepositoryABC,
             auto_roles: AutoRoleRepositoryABC,

kdb-bot/src/modules/base/base_module.py

@@ -19,7 +19,6 @@ from modules.base.events.base_on_command_error_event import BaseOnCommandErrorEv
 from modules.base.events.base_on_command_event import BaseOnCommandEvent
 from modules.base.events.base_on_member_join_event import BaseOnMemberJoinEvent
 from modules.base.events.base_on_member_remove_event import BaseOnMemberRemoveEvent
-from modules.base.events.base_on_message_delete_event import BaseOnMessageDeleteEvent
 from modules.base.events.base_on_message_event import BaseOnMessageEvent
 from modules.base.events.base_on_raw_reaction_add import BaseOnRawReactionAddEvent
 from modules.base.events.base_on_raw_reaction_remove import BaseOnRawReactionRemoveEvent
@@ -56,7 +55,6 @@ class BaseModule(ModuleABC):
         self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, BaseOnMemberJoinEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_member_remove.value, BaseOnMemberRemoveEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_message.value, BaseOnMessageEvent)
-        self._dc.add_event(DiscordEventTypesEnum.on_message_delete.value, BaseOnMessageDeleteEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, BaseOnRawReactionAddEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_remove.value, BaseOnRawReactionRemoveEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_voice_state_update.value, BaseOnVoiceStateUpdateEvent)

kdb-bot/src/modules/base/command/afk_command.py

@@ -6,7 +6,7 @@ from discord import VoiceChannel
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -21,7 +21,7 @@ class AFKCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

kdb-bot/src/modules/base/command/help_command.py

@@ -8,7 +8,7 @@ from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -23,7 +23,7 @@ class HelpCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC
+            client_utils: ClientUtilsServiceABC
     ):
         DiscordCommandABC.__init__(self)
 

kdb-bot/src/modules/base/command/info_command.py

@@ -9,7 +9,7 @@ from discord.ext import commands
 from discord.ext.commands import Context
 
 import bot
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -23,7 +23,7 @@ class InfoCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

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

@@ -5,7 +5,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -22,7 +22,7 @@ class PingCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
             base_helper: BaseHelperABC,

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

@@ -6,7 +6,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.server_settings import ServerSettings
 from bot_core.helper.command_checks import CommandChecks
@@ -22,7 +22,7 @@ class PurgeCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             permissions: PermissionServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

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

@@ -9,15 +9,16 @@ 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_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from modules.level.service.level_service import LevelService
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
@@ -31,7 +32,7 @@ class UserGroup(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             permissions: PermissionServiceABC,
             servers: ServerRepositoryABC,
             db: DatabaseContextABC,
@@ -97,6 +98,10 @@ 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'),
@@ -104,8 +109,7 @@ 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(self._client_utils.get_ontime_for_user(user)))
+        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'), value=str(ontime))
 
         roles = ''
         for role in member.roles:
@@ -158,13 +162,14 @@ class UserGroup(DiscordCommandABC):
             value = str(user.xp)
 
         elif atr == 'ontime':
-            value = str(self._client_utils.get_ontime_for_user(user))
+            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
+            ))
 
         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(
@@ -191,19 +196,14 @@ 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,16 +211,10 @@ 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]]:
@@ -251,10 +245,7 @@ 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(
@@ -263,7 +254,5 @@ 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/configuration/base_server_settings.py

@@ -14,7 +14,6 @@ class BaseServerSettings(ConfigurationModelABC):
         self._max_voice_state_hours: int = 0
         self._xp_per_message: int = 0
         self._xp_per_reaction: int = 0
-        self._max_message_xp_per_hour: int = 0
         self._xp_per_ontime_hour: int = 0
         self._afk_channel_ids: List[int] = List(int)
         self._afk_command_channel_id: int = 0
@@ -38,10 +37,6 @@ class BaseServerSettings(ConfigurationModelABC):
     def xp_per_reaction(self) -> int:
         return self._xp_per_reaction
 
-    @property
-    def max_message_xp_per_hour(self) -> int:
-        return self._max_message_xp_per_hour
-
     @property
     def xp_per_ontime_hour(self) -> int:
         return self._xp_per_ontime_hour
@@ -72,7 +67,6 @@ class BaseServerSettings(ConfigurationModelABC):
             self._max_voice_state_hours = int(settings['MaxVoiceStateHours'])
             self._xp_per_message = int(settings['XpPerMessage'])
             self._xp_per_reaction = int(settings['XpPerReaction'])
-            self._max_message_xp_per_hour = int(settings['MaxMessageXpPerHour'])
             self._xp_per_ontime_hour = int(settings['XpPerOntimeHour'])
             for index in settings['AFKChannelIds']:
                 self._afk_channel_ids.append(int(index))

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

@@ -1,83 +0,0 @@
-from typing import Optional
-
-import discord
-from cpl_core.database.context import DatabaseContextABC
-from cpl_discord.events import OnMessageDeleteABC
-from cpl_discord.service import DiscordBotServiceABC
-
-from bot_core.helper.log_message_helper import LogMessageHelper
-from bot_core.logging.message_logger import MessageLogger
-from bot_data.abc.client_repository_abc import ClientRepositoryABC
-from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.user_repository_abc import UserRepositoryABC
-from bot_data.model.user import User
-from modules.base.abc.base_helper_abc import BaseHelperABC
-from modules.base.configuration.base_server_settings import BaseServerSettings
-
-
-class BaseOnMessageDeleteEvent(OnMessageDeleteABC):
-
-    def __init__(
-            self,
-            logger: MessageLogger,
-            bhs: BaseHelperABC,
-            db: DatabaseContextABC,
-            bot: DiscordBotServiceABC,
-            users: UserRepositoryABC,
-            clients: ClientRepositoryABC,
-            servers: ServerRepositoryABC,
-    ):
-        OnMessageDeleteABC.__init__(self)
-        self._logger = logger
-        self._base_helper = bhs
-        self._db = db
-        self._bot = bot
-        self._users = users
-        self._clients = clients
-        self._servers = servers
-
-    def _append_deleted_message_count(self, g_id: int):
-        try:
-            self._clients.append_deleted_message_count(self._bot.user.id, g_id, 1)
-            self._db.save_changes()
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot edit client {self._bot.user.id}@{g_id}', e)
-
-    def _handle_message_delete(self, message: discord.Message):
-        dc_user_id = message.author.id
-        try:
-            server = self._servers.get_server_by_discord_id(message.guild.id)
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot get server {message.guild.id}', e)
-            return
-
-        user: Optional[User] = None
-        try:
-            user = self._users.find_user_by_discord_id_and_server_id(dc_user_id, server.server_id)
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot get user {dc_user_id}', e)
-            return
-
-        if user is None:
-            self._logger.error(__name__, f'User not found {dc_user_id}')
-            return
-
-        settings: BaseServerSettings = self._base_helper.get_config(message.guild.id)
-        old_xp = user.xp
-        user.xp -= settings.xp_per_message
-        self._users.update_user(user)
-        self._db.save_changes()
-
-        self._logger.debug(__name__, f'Removed message from user {user}. xp: from {old_xp} to {user.xp}')
-
-    async def on_message_delete(self, message: discord.Message):
-        self._logger.debug(__name__, f'Module {type(self)} started')
-        if message is None or message.guild is None:
-            return
-
-        self._logger.info(__name__, f'Received message: {LogMessageHelper.get_log_string(message)}')
-        self._append_deleted_message_count(message.guild.id)
-
-        if not message.author.bot:
-            self._handle_message_delete(message)
-        self._logger.debug(__name__, f'Module {type(self)} stopped')

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

@@ -8,7 +8,6 @@ from cpl_discord.service import DiscordBotServiceABC
 from bot_core.helper.event_checks import EventChecks
 from bot_core.helper.log_message_helper import LogMessageHelper
 from bot_core.logging.message_logger import MessageLogger
-from bot_core.service.client_utils_service import ClientUtilsService
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -23,7 +22,6 @@ class BaseOnMessageEvent(OnMessageABC):
             self,
             logger: MessageLogger,
             bhs: BaseHelperABC,
-            client_utils: ClientUtilsService,
             db: DatabaseContextABC,
             bot: DiscordBotServiceABC,
             users: UserRepositoryABC,
@@ -33,8 +31,6 @@ class BaseOnMessageEvent(OnMessageABC):
         OnMessageABC.__init__(self)
         self._logger = logger
         self._base_helper = bhs
-        self._client_utils = client_utils
-        self._bot = bot
         self._db = db
         self._bot = bot
         self._users = users
@@ -68,9 +64,6 @@ class BaseOnMessageEvent(OnMessageABC):
             return
 
         settings: BaseServerSettings = self._base_helper.get_config(message.guild.id)
-        if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(message.created_at, user, settings):
-            return
-
         old_xp = user.xp
         user.xp += settings.xp_per_message
         self._users.update_user(user)
@@ -78,17 +71,13 @@ class BaseOnMessageEvent(OnMessageABC):
 
         self._logger.debug(__name__, f'User {user} sent message. xp: from {old_xp} to {user.xp}')
 
-
-
     @EventChecks.check_is_ready()
     async def on_message(self, message: discord.Message):
         self._logger.debug(__name__, f'Module {type(self)} started')
+        self._logger.info(__name__, f'Received message: {LogMessageHelper.get_log_string(message)}')
         if message is None or message.guild is None:
             return
-
-        self._logger.info(__name__, f'Received message: {LogMessageHelper.get_log_string(message)}')
         self._append_received_message_count(message.guild.id)
 
         if not message.author.bot:
             self._handle_message_for_xp(message)
-        self._logger.debug(__name__, f'Module {type(self)} stopped')

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

@@ -7,12 +7,11 @@ 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
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.server import Server
 from bot_data.model.user import User
@@ -33,7 +32,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             users: UserRepositoryABC,
             user_joins: UserJoinedServerRepositoryABC,
             user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
-            client_utils: ClientUtilsServiceABC,
             db: DatabaseContextABC,
     ):
         OnVoiceStateUpdateABC.__init__(self)
@@ -45,7 +43,6 @@ 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')
@@ -75,7 +72,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             join.leaved_on = datetime.now()
 
             # ontime as hours
-            ontime = self._client_utils.get_ontime_for_user(user)
+            ontime = round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2)
             old_xp = user.xp
             user.xp += round(ontime * settings.xp_per_ontime_hour)
 
@@ -83,18 +80,12 @@ 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)
@@ -125,7 +116,5 @@ 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

@@ -1,12 +1,8 @@
-from datetime import datetime
-
 from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
-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
@@ -22,7 +18,6 @@ class BaseReactionHandler:
             servers: ServerRepositoryABC,
             users: UserRepositoryABC,
             base_helper: BaseHelperABC,
-            client_utils: ClientUtilsABC,
             db: DatabaseContextABC,
     ):
         self._logger = logger
@@ -30,7 +25,6 @@ class BaseReactionHandler:
         self._servers = servers
         self._users = users
         self._base_helper = base_helper
-        self._client_utils = client_utils
         self._db = db
 
     async def handle(self, payload: RawReactionActionEvent, r_type=None) -> None:
@@ -42,20 +36,6 @@ 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
 
@@ -64,11 +44,6 @@ class BaseReactionHandler:
         settings: BaseServerSettings = self._base_helper.get_config(guild.id)
 
         if r_type == 'add':
-            if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-                    datetime.now(), user, settings, is_reaction=True
-            ):
-                return
-
             user.xp += settings.xp_per_reaction
             self._users.update_user(user)
             self._db.save_changes()

kdb-bot/src/modules/database/database_on_ready_event.py

@@ -12,7 +12,7 @@ from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.client import Client
 from bot_data.model.known_user import KnownUser

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

@@ -10,7 +10,7 @@ from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -30,7 +30,7 @@ class LevelGroup(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             permission_service: PermissionServiceABC,
             translate: TranslatePipe,
             db: DatabaseContextABC,
@@ -83,34 +83,20 @@ class LevelGroup(DiscordCommandABC):
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
-    async def _seed_levels(self, ctx: Context):
+    async def _seed_levels(self, channel: discord.TextChannel):
         # send message to ctx.channel because send_ctx_msg resolves ctx
         try:
-            start = await self._message_service.send_ctx_msg(
-                ctx,
-                self._t.transform('modules.level.seeding_started'),
-                is_persistent=True
-            )
+            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_started'))
             await self._level_seeder.seed()
-
-            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)
-
+            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_finished'))
         except Exception as e:
             self._logger.error(__name__, f'Level seeding failed', e)
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.seeding_failed'))
+            await self._message_service.send_channel_message(channel, 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()
@@ -181,66 +167,41 @@ 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)
+                await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.create.created').format(name, permissions))
+                await self._seed_levels(ctx.channel)
 
         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()
@@ -253,10 +214,7 @@ 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
 
@@ -267,51 +225,33 @@ 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)
+            await self._seed_levels(ctx.channel)
 
         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()
@@ -321,14 +261,10 @@ 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
 
@@ -343,17 +279,13 @@ 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)
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.remove.success').format(level))
+            await self._seed_levels(ctx.channel)
 
         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()
@@ -372,9 +304,7 @@ 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
 
@@ -383,13 +313,11 @@ 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')
 
@@ -409,10 +337,7 @@ 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
 
@@ -421,13 +346,11 @@ 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')
 
@@ -444,20 +367,15 @@ 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
 
@@ -465,25 +383,14 @@ 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,15 +42,8 @@ class LevelService:
         self._t = t
 
     def get_level(self, user: User) -> Level:
-        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()
+        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()
 
     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)

kdb-bot/src/modules/stats/command/stats_group.py

@@ -8,7 +8,7 @@ from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
@@ -25,7 +25,7 @@ class StatsGroup(DiscordCommandABC):
             self,
             logger: CommandLogger,
             message_service: MessageServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permission_service: PermissionServiceABC,
             statistic: StatisticService,

kdb-bot/src/modules/stats/service/statistic_service.py

@@ -10,7 +10,7 @@ from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.auto_role import AutoRole
 from bot_data.model.client import Client

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

@@ -13,7 +13,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.helper.command_checks import CommandChecks
@@ -29,7 +29,7 @@ class LogCommand(DiscordCommandABC):
             logging_settings: LoggingSettings,
             services: ServiceProviderABC,
             message_service: MessageServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
             time_format: TimeFormatSettings,

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

@@ -7,7 +7,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.bot_settings import BotSettings
 from bot_core.helper.command_checks import CommandChecks
@@ -23,7 +23,7 @@ class RestartCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
             settings: BotSettings

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

@@ -8,7 +8,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.bot_settings import BotSettings
 from bot_core.helper.command_checks import CommandChecks
@@ -24,7 +24,7 @@ class ShutdownCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
             settings: BotSettings