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

@@ -13,6 +13,7 @@ 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
@@ -56,16 +57,10 @@ 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
@@ -95,16 +90,10 @@ 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:
@@ -142,16 +131,10 @@ 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:
@@ -183,16 +166,10 @@ 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'),
@@ -227,16 +204,10 @@ 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:
@@ -300,16 +271,10 @@ 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/base/command/afk_command.py

@@ -8,6 +8,7 @@ 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
 
@@ -36,11 +37,9 @@ 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,6 +10,7 @@ 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
 
@@ -36,11 +37,9 @@ 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,6 +11,7 @@ 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
 
 
@@ -38,11 +39,9 @@ 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,6 +6,7 @@ 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
 
 
@@ -31,10 +32,8 @@ 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,6 +9,7 @@ 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
 
@@ -37,18 +38,12 @@ 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/shutdown_command.py

@@ -11,6 +11,7 @@ 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,18 +44,10 @@ 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,6 +10,7 @@ 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
@@ -60,16 +61,10 @@ 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/level/command/level_group.py

@@ -12,6 +12,7 @@ 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
@@ -99,16 +100,10 @@ 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
@@ -141,16 +136,10 @@ 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)
@@ -199,19 +188,10 @@ 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()
@@ -248,7 +228,8 @@ 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__, 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}')
+            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)
         else:
@@ -271,20 +252,10 @@ 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()
@@ -318,19 +289,10 @@ 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
@@ -360,19 +322,10 @@ 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
@@ -402,19 +355,10 @@ 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/stats/command/stats_group.py

@@ -10,6 +10,7 @@ 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
@@ -51,16 +52,10 @@ 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
@@ -91,16 +86,10 @@ 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
@@ -139,16 +128,10 @@ 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
@@ -161,16 +144,10 @@ 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)
@@ -192,16 +169,10 @@ 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)