kdb-bot/src/bot/main.py

@@ -12,7 +12,6 @@ from bot.startup_migration_extension import StartupMigrationExtension
 from bot.startup_module_extension import StartupModuleExtension
 from bot.startup_settings_extension import StartupSettingsExtension
 from bot_api.app_api_extension import AppApiExtension
-from bot_core.core_extension.core_extension import CoreExtension
 from modules.boot_log.boot_log_extension import BootLogExtension
 from modules.database.database_extension import DatabaseExtension
 
@@ -32,7 +31,6 @@ class Program:
             .use_extension(BootLogExtension) \
             .use_extension(DatabaseExtension) \
             .use_extension(AppApiExtension) \
-            .use_extension(CoreExtension) \
             .use_startup(Startup)
         self.app: Application = await app_builder.build_async()
         await self.app.run_async()

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

@@ -17,9 +17,6 @@ class ClientUtilsServiceABC(ABC):
     @abstractmethod
     def get_client(self, dc_ic: int, guild_id: int): pass
 
-    @abstractmethod
-    async def check_if_bot_is_ready_yet(self) -> bool: pass
-
     @abstractmethod
     async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool: pass
 

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

@@ -1,30 +0,0 @@
-from cpl_core.application import ApplicationExtensionABC
-from cpl_core.configuration import ConfigurationABC
-from cpl_core.dependency_injection import ServiceProviderABC
-from cpl_translation import TranslatePipe
-
-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_core.helper.command_checks import CommandChecks
-from bot_core.helper.event_checks import EventChecks
-from modules.permission.abc.permission_service_abc import PermissionServiceABC
-
-
-class CoreExtension(ApplicationExtensionABC):
-
-    def __init__(self):
-        ApplicationExtensionABC.__init__(self)
-
-    async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
-        feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
-        if not feature_flags.get_flag(FeatureFlagsEnum.core_module):
-            return
-
-        permissions: PermissionServiceABC = services.get_service(PermissionServiceABC)
-        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)
-        EventChecks.init(client_utils)

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

@@ -1,7 +0,0 @@
-from discord.ext.commands import CommandError
-
-
-class CheckError(CommandError):
-
-    def __init__(self, message, *args):
-        CommandError.__init__(self, message, *args)

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

@@ -1,76 +0,0 @@
-from typing import Optional
-
-from cpl_translation import TranslatePipe
-from discord.ext import commands
-from discord.ext.commands import Context
-
-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 CommandChecks:
-    _permissions: Optional[PermissionServiceABC] = None
-    _client_utils: Optional[ClientUtilsServiceABC] = None
-    _message_service: Optional[MessageServiceABC] = None
-    _t: Optional[TranslatePipe] = None
-
-    @classmethod
-    def init(
-            cls,
-            permissions: PermissionServiceABC,
-            client_utils: ClientUtilsServiceABC,
-            message_service: MessageServiceABC,
-            translate: TranslatePipe,
-    ):
-        cls._permissions = permissions
-        cls._client_utils = client_utils
-        cls._message_service = message_service
-        cls._t = translate
-
-    @classmethod
-    def check_is_ready(cls):
-        async def check_if_bot_is_ready_yet_and_respond(ctx: Context) -> bool:
-            result = await cls._client_utils.check_if_bot_is_ready_yet_and_respond(ctx)
-            if not result:
-                raise CheckError(f'Bot is not ready')
-            return result
-
-        return commands.check(check_if_bot_is_ready_yet_and_respond)
-
-    @classmethod
-    def check_is_member_admin(cls):
-        async def check_is_member_admin(ctx: Context):
-            has_permission = cls._permissions.is_member_admin(ctx.author)
-            if not has_permission:
-                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
-                raise CheckError(f'Member {ctx.author.name} is not admin')
-
-            return has_permission
-
-        return commands.check(check_is_member_admin)
-
-    @classmethod
-    def check_is_member_technician(cls):
-        async def check_is_member_technician(ctx: Context):
-            has_permission = cls._permissions.is_member_technician(ctx.author)
-            if not has_permission:
-                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
-                raise CheckError(f'Member {ctx.author.name} is not technician')
-
-            return has_permission
-
-        return commands.check(check_is_member_technician)
-
-    @classmethod
-    def check_is_member_moderator(cls):
-        async def check_is_member_moderator(ctx: Context):
-            has_permission = cls._permissions.is_member_moderator(ctx.author)
-            if not has_permission:
-                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
-                raise CheckError(f'Member {ctx.author.name} is not moderator')
-
-            return has_permission
-
-        return commands.check(check_is_member_moderator)

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

@@ -1,31 +0,0 @@
-from typing import Optional
-
-from cpl_translation import TranslatePipe
-from discord.ext import commands
-from discord.ext.commands import Context
-
-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[ClientUtilsServiceABC] = None
-
-    @classmethod
-    def init(
-            cls,
-            client_utils: ClientUtilsServiceABC,
-    ):
-        cls._client_utils = client_utils
-
-    @classmethod
-    def check_is_ready(cls):
-        async def check_if_bot_is_ready() -> bool:
-            result = await cls._client_utils.check_if_bot_is_ready()
-            if not result:
-                raise CheckError(f'Bot is not ready')
-            return result
-
-        return commands.check(check_if_bot_is_ready)

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

@@ -59,20 +59,14 @@ class ClientUtilsService(ClientUtilsServiceABC):
         client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.server_id)
         return client
 
-    async def check_if_bot_is_ready_yet(self) -> bool:
+    async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool:
         if self._config.get_configuration('IS_READY') == 'true':
             return True
 
         self._logger.debug(__name__, f'Bot is not ready yet {self._t.transform("common.errors.bot_not_ready_yet")}')
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
         return False
 
-    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)
-
-        return result
-
     async def presence_game(self, t_key: str):
         if not self._feature_flags.get_flag(FeatureFlagsEnum.presence):
             return

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

@@ -13,7 +13,6 @@ from discord.ext.commands import Context
 
 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_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -57,10 +56,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command(alias='auto-roles')
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, wait: int = None):
         self._logger.debug(__name__, f'Received command auto-role list {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role list')
+            return
 
         if ctx.guild is None:
             return
@@ -90,10 +95,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def add(self, ctx: Context, channel: discord.TextChannel, message_id: str):
         self._logger.debug(__name__, f'Received command auto-role add {ctx} {message_id}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role add')
+            return
 
         message = List(discord.Message, [message async for message in channel.history(limit=50)]).where(lambda m: m.id == int(message_id)).single_or_default()
         if message is None:
@@ -131,10 +142,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def remove(self, ctx: Context, auto_role: int):
         self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role remove')
+            return
 
         auto_role_from_db = self._auto_roles.find_auto_role_by_id(auto_role)
         if auto_role_from_db is None:
@@ -166,10 +183,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @rule.command(alias='rules')
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, auto_role: int, wait: int = None):
         self._logger.debug(__name__, f'Received command auto-role rule list {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role rule list')
+            return
 
         embed = discord.Embed(
             title=self._t.transform('modules.auto_role.list.title'),
@@ -204,10 +227,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @rule.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def add(self, ctx: Context, auto_role: int, emoji_name: str, role_id: str):
         self._logger.debug(__name__, f'Received command auto-role add {ctx} {auto_role}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role rule add')
+            return
 
         emoji = discord.utils.get(self._bot.emojis, name=emoji_name)
         if emoji is None:
@@ -271,10 +300,16 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @rule.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def remove(self, ctx: Context, auto_role_rule: int):
         self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role_rule}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command auto-role remove')
+            return
 
         auto_role_from_db = self._auto_roles.get_auto_role_rule_by_id(auto_role_rule)
         if auto_role_from_db is None:

kdb-bot/src/modules/auto_role/events/auto_role_on_raw_reaction_add.py

@@ -3,7 +3,6 @@ from cpl_discord.events.on_raw_reaction_add_abc import OnRawReactionAddABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
-from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from modules.auto_role.helper.reaction_handler import ReactionHandler
@@ -27,7 +26,6 @@ class AutoRoleOnRawReactionAddEvent(OnRawReactionAddABC):
         self._auto_roles = auto_roles
         self._reaction_handler = reaction_handler
 
-    @EventChecks.check_is_ready()
     async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
         self._logger.debug(__name__, f'Module {type(self)} started')
 

kdb-bot/src/modules/auto_role/events/auto_role_on_raw_reaction_remove.py

@@ -3,7 +3,6 @@ from cpl_discord.events.on_raw_reaction_remove_abc import OnRawReactionRemoveABC
 from cpl_discord.service import DiscordBotServiceABC
 from discord import RawReactionActionEvent
 
-from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from modules.auto_role.helper.reaction_handler import ReactionHandler
@@ -27,7 +26,6 @@ class AutoRoleOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
         self._auto_roles = auto_roles
         self._reaction_handler = reaction_handler
 
-    @EventChecks.check_is_ready()
     async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
         self._logger.debug(__name__, f'Module {type(self)} started')
 

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

@@ -8,7 +8,6 @@ from discord.ext.commands import Context
 
 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 modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -37,9 +36,11 @@ class AFKCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
     async def afk(self, ctx: Context):
         self._logger.debug(__name__, f'Received command afk {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
         settings: BaseServerSettings = self._config.get_configuration(f'BaseServerSettings_{ctx.guild.id}')
 
         if ctx.author.voice is None or ctx.author.voice.channel is None:

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

@@ -10,7 +10,6 @@ from discord.ext.commands import Context
 
 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 modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -37,9 +36,11 @@ class HelpCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
     async def help(self, ctx: Context, persistent_flag: str = None):
         self._logger.debug(__name__, f'Received command help {ctx}:{persistent_flag}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
         settings: BaseServerSettings = self._config.get_configuration(f'BaseServerSettings_{ctx.guild.id}')
         is_persistent = persistent_flag == '--stay'
         await self._message_service.send_ctx_msg(ctx, settings.help_command_reference_url, is_persistent=is_persistent)

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

@@ -11,7 +11,6 @@ from discord.ext.commands import Context
 import bot
 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
 
 
@@ -39,9 +38,11 @@ class InfoCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
     async def info(self, ctx: Context, *, wait: int = None):
         self._logger.debug(__name__, f'Received command info {ctx},{wait}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
         client = self._client_utils.get_client(self._bot.user.id, ctx.guild.id)
 
         embed = discord.Embed(

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

@@ -6,7 +6,6 @@ from discord.ext.commands import Context
 
 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
 
 
@@ -32,8 +31,10 @@ class PingCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
     async def ping(self, ctx: Context):
         self._logger.debug(__name__, f'Received command ping {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.pong'))
         self._logger.trace(__name__, f'Finished ping command')

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

@@ -9,7 +9,6 @@ from discord.ext.commands import Context
 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
 from bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -38,12 +37,18 @@ class PurgeCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def purge(self, ctx: Context):
         self._logger.debug(__name__, f'Received command purge {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
         server_settings: ServerSettings = self._config.get_configuration(f'ServerSettings_{ctx.guild.id}')
 
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished purge command')
+            return
+
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.moderator.purge_message'))
         await asyncio.sleep(server_settings.message_delete_timer)
         try:

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

@@ -1,5 +1,6 @@
 import asyncio
 
+import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
@@ -10,7 +11,6 @@ from discord.ext.commands import Context
 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
 from bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -43,10 +43,18 @@ class RestartCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def restart(self, ctx: Context):
         self._logger.debug(__name__, f'Received command restart {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished restart command')
+            return
 
         self._config.add_configuration('IS_RESTART', 'true')
         await self._client_utils.presence_game('common.presence.restart')

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

@@ -11,7 +11,6 @@ from discord.ext.commands import Context
 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
 from bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -44,10 +43,18 @@ class ShutdownCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def shutdown(self, ctx: Context):
         self._logger.debug(__name__, f'Received command shutdown {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished shutdown command')
+            return
 
         await self._client_utils.presence_game('common.presence.shutdown')
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.shutdown_message'))

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

@@ -10,7 +10,6 @@ from discord.ext.commands import Context
 
 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
@@ -61,10 +60,16 @@ class UserGroup(DiscordCommandABC):
 
     @user.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def info(self, ctx: Context, member: Optional[discord.Member] = None, *, wait: int = None):
         self._logger.debug(__name__, f'Received command user-info {ctx}:{member},{wait}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished purge command')
+            return
 
         if member is None or not isinstance(member, discord.Member):
             member = ctx.author

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

@@ -13,7 +13,6 @@ from cpl_discord.events.on_command_error_abc import OnCommandErrorABC
 
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.bot_settings import BotSettings
-from bot_core.exception.check_error import CheckError
 
 
 class BaseOnCommandErrorEvent(OnCommandErrorABC):
@@ -36,9 +35,6 @@ class BaseOnCommandErrorEvent(OnCommandErrorABC):
         self._t = translate
 
     async def on_command_error(self, ctx: Context, error: CommandError):
-        if isinstance(error, CheckError):
-            return
-
         error = getattr(error, 'original', error)
         uid = uuid.uuid4()
         self._logger.error(__name__, f'Got error: {type(error).__name__} UID: {uid}')

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

@@ -9,7 +9,6 @@ from cpl_discord.events import OnMemberJoinABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
-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
@@ -92,7 +91,6 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
         except Exception as e:
             self._logger.error(__name__, f'Cannot get user {member.id}', e)
 
-    @EventChecks.check_is_ready()
     async def on_member_join(self, member: discord.Member):
         self._logger.debug(__name__, f'Module {type(self)} started')
         self._check_for_known_user(member)

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

@@ -8,7 +8,6 @@ from cpl_discord.events import OnMemberRemoveABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
-from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -60,7 +59,6 @@ class BaseOnMemberRemoveEvent(OnMemberRemoveABC):
         except Exception as e:
             self._logger.error(__name__, f'Cannot get user {member.id}', e)
 
-    @EventChecks.check_is_ready()
     async def on_member_remove(self, member: discord.Member):
         self._logger.debug(__name__, f'Module {type(self)} started')
         await self._remove_user(member)

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

@@ -5,7 +5,6 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.events import OnMessageABC
 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_data.abc.client_repository_abc import ClientRepositoryABC
@@ -71,7 +70,6 @@ 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)}')

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

@@ -7,7 +7,6 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
-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
@@ -84,7 +83,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         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):
         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}')

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

@@ -12,7 +12,6 @@ from discord.ext.commands import Context
 
 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_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -100,10 +99,16 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command(alias='levels')
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, wait: int = None):
         self._logger.debug(__name__, f'Received command level list {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level list')
+            return
 
         if ctx.guild is None:
             return
@@ -136,10 +141,16 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_admin()
     async def create(self, ctx: Context, name: str, color: str, min_xp: int, permissions: int):
         self._logger.debug(__name__, f'Received command level create {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_admin(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level remove')
+            return
 
         try:
             color = hex(discord.Colour.from_str(color).value)
@@ -188,10 +199,19 @@ class LevelGroup(DiscordCommandABC):
 
     @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):
         self._logger.debug(__name__, f'Received command level edit {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_admin(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level remove')
+            return
+
+        if ctx.guild is None:
+            return
 
         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()
@@ -228,8 +248,7 @@ class LevelGroup(DiscordCommandABC):
             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__,
+            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}')
-                              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)
         else:
@@ -252,10 +271,20 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_admin()
     async def remove(self, ctx: Context, level: str):
         self._logger.debug(__name__, f'Received command level remove {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_admin(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level remove')
+            return
+
+        if ctx.guild is None:
+            self._logger.trace(__name__, f'Finished command level remove')
+            return
 
         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()
@@ -289,10 +318,19 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def down(self, ctx: Context, member: discord.Member):
         self._logger.debug(__name__, f'Received command level down {ctx} {member}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level down')
+            return
+
+        if ctx.guild is None:
+            return
 
         if member.bot:
             return
@@ -322,10 +360,19 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def up(self, ctx: Context, member: discord.Member):
         self._logger.debug(__name__, f'Received command level up {ctx} {member}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level up')
+            return
+
+        if ctx.guild is None:
+            return
 
         if member.bot:
             return
@@ -355,10 +402,19 @@ class LevelGroup(DiscordCommandABC):
 
     @level.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def set(self, ctx: Context, member: discord.Member, level: str):
         self._logger.debug(__name__, f'Received command level up {ctx} {member}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command level up')
+            return
+
+        if ctx.guild is None:
+            return
 
         if member.bot:
             return

kdb-bot/src/modules/level/events/level_on_message_event.py

@@ -1,7 +1,6 @@
 import discord
 from cpl_discord.events import OnMessageABC
 
-from bot_core.helper.event_checks import EventChecks
 from bot_core.logging.message_logger import MessageLogger
 from modules.level.service.level_service import LevelService
 
@@ -17,7 +16,6 @@ class LevelOnMessageEvent(OnMessageABC):
         self._logger = logger
         self._level = level
 
-    @EventChecks.check_is_ready()
     async def on_message(self, message: discord.Message):
         self._logger.debug(__name__, f'Module {type(self)} started')
         await self._level.check_level(message.author)

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

@@ -2,7 +2,6 @@ import discord
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
-from bot_core.helper.event_checks import EventChecks
 from modules.level.service.level_service import LevelService
 
 
@@ -19,7 +18,6 @@ class LevelOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
 
         self._logger.info(__name__, f'Module {type(self)} loaded')
 
-    @EventChecks.check_is_ready()
     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')
         await self._level.check_level(member)

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

@@ -10,7 +10,6 @@ from discord.ext.commands import Context
 
 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_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.statistic_repository_abc import StatisticRepositoryABC
@@ -52,10 +51,16 @@ class StatsGroup(DiscordCommandABC):
 
     @stats.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, wait: int = None):
         self._logger.debug(__name__, f'Received command stats list {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command stats list')
+            return
 
         if ctx.guild is None:
             return
@@ -86,10 +91,16 @@ class StatsGroup(DiscordCommandABC):
 
     @stats.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_moderator()
     async def view(self, ctx: Context, name: str, wait: int = None):
         self._logger.debug(__name__, f'Received command stats view {ctx}:{name}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command stats view')
+            return
 
         if ctx.guild is None:
             return
@@ -128,10 +139,16 @@ class StatsGroup(DiscordCommandABC):
 
     @stats.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_technician()
     async def add(self, ctx: Context, name: str):
         self._logger.debug(__name__, f'Received command stats add {ctx}: {name}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_technician(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command stats add')
+            return
 
         if ctx.guild is None:
             return
@@ -144,10 +161,16 @@ class StatsGroup(DiscordCommandABC):
 
     @stats.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_technician()
     async def edit(self, ctx: Context, name: str):
         self._logger.debug(__name__, f'Received command stats edit {ctx}: {name}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_technician(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command stats edit')
+            return
 
         try:
             server = self._servers.get_server_by_discord_id(ctx.guild.id)
@@ -169,10 +192,16 @@ class StatsGroup(DiscordCommandABC):
 
     @stats.command()
     @commands.guild_only()
-    @CommandChecks.check_is_ready()
-    @CommandChecks.check_is_member_technician()
     async def remove(self, ctx: Context, name: str):
         self._logger.debug(__name__, f'Received command stats remove {ctx}: {name}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_technician(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished command stats remove')
+            return
 
         try:
             server = self._servers.get_server_by_discord_id(ctx.guild.id)