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

@@ -60,7 +60,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))
@@ -99,7 +98,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))
@@ -146,7 +144,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))
@@ -187,7 +184,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))
@@ -231,7 +227,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))
@@ -290,7 +285,6 @@ class AutoRoleGroup(DiscordCommandABC):
         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'))

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

@@ -41,6 +41,7 @@ class PurgeCommand(DiscordCommandABC):
         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}')
 

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

@@ -47,7 +47,6 @@ class RestartCommand(DiscordCommandABC):
         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)
 

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

@@ -47,7 +47,6 @@ class ShutdownCommand(DiscordCommandABC):
         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)
 

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

@@ -78,7 +78,6 @@ class LevelGroup(DiscordCommandABC):
         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'))
@@ -118,9 +117,6 @@ class LevelGroup(DiscordCommandABC):
     @commands.guild_only()
     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)
 
         try:
             color = hex(discord.Colour.from_str(color).value)
@@ -134,6 +130,9 @@ class LevelGroup(DiscordCommandABC):
             self._logger.error(__name__, f'Error parsing permissions {permissions}', e)
             return
 
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+
         if ctx.guild is None:
             return
 
@@ -195,9 +194,9 @@ class LevelGroup(DiscordCommandABC):
     @commands.guild_only()
     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'))
@@ -244,7 +243,6 @@ class LevelGroup(DiscordCommandABC):
         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'))
@@ -286,7 +284,6 @@ class LevelGroup(DiscordCommandABC):
         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'))
@@ -328,7 +325,6 @@ class LevelGroup(DiscordCommandABC):
         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'))

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

@@ -55,7 +55,6 @@ class StatsGroup(DiscordCommandABC):
         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'))
@@ -95,7 +94,6 @@ class StatsGroup(DiscordCommandABC):
         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'))
@@ -143,7 +141,6 @@ class StatsGroup(DiscordCommandABC):
         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'))
@@ -165,7 +162,6 @@ class StatsGroup(DiscordCommandABC):
         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'))
@@ -196,7 +192,6 @@ class StatsGroup(DiscordCommandABC):
         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'))