Added logic to wait before handling command & migrated shutdown command #42
This commit is contained in:
@@ -39,6 +39,9 @@ class RestartCommand(DiscordCommandABC):
|
||||
@commands.guild_only()
|
||||
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)
|
||||
|
||||
if not self._permissions.is_member_moderator(ctx.author):
|
||||
|
@@ -35,10 +35,13 @@ class ShutdownCommand(DiscordCommandABC):
|
||||
|
||||
self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
|
||||
|
||||
@commands.command()
|
||||
@commands.hybrid_command()
|
||||
@commands.guild_only()
|
||||
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)
|
||||
|
||||
if not self._permissions.is_member_moderator(ctx.author):
|
||||
|
@@ -72,6 +72,7 @@ class BootLogOnReadyEvent(OnReadyABC):
|
||||
),
|
||||
self._t.transform('modules.boot_log.login_message').format(init_time)
|
||||
)
|
||||
self._logger.info(__name__, 'Bot is ready')
|
||||
|
||||
self._config.add_configuration('IS_READY', 'true')
|
||||
self._logger.info(__name__, 'Bot is ready')
|
||||
self._logger.trace(__name__, f'Module {type(self)} stopped')
|
||||
|
@@ -106,7 +106,7 @@ class PermissionService(PermissionServiceABC):
|
||||
return self._moderators[g_id]
|
||||
|
||||
def is_member_admin(self, member: discord.Member) -> bool:
|
||||
return member in self._admins[member.guild.id]
|
||||
return member.guild.id in self._admins and member in self._admins[member.guild.id]
|
||||
|
||||
def is_member_moderator(self, member: discord.Member) -> bool:
|
||||
return member in self._moderators[member.guild.id] or self.is_member_admin(member)
|
||||
return member.guild.id in self._moderators and member in self._moderators[member.guild.id] or self.is_member_admin(member)
|
||||
|
Reference in New Issue
Block a user