sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Merge branch '0.3' into #97

Browse Source
This commit is contained in:
Sven Heidemann 2022-11-10 07:12:32 +01:00
commit 36a8d14720
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kdb-bot/src/modules/auto_role/command/auto_role_group.py
View File

@ -60,6 +60,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role list {ctx}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -98,6 +99,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role add {ctx} {message_id}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -144,6 +146,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -184,6 +187,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role rule list {ctx}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -227,6 +231,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role add {ctx} {auto_role}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -285,6 +290,7 @@ class AutoRoleGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role_rule}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))

1
kdb-bot/src/modules/base/command/purge_command.py
View File

@ -41,7 +41,6 @@ class PurgeCommand(DiscordCommandABC):
self._logger.debug(__name__, f'Received command purge {ctx}') self._logger.debug(__name__, f'Received command purge {ctx}')
if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id) self._client_utils.received_command(ctx.guild.id)
server_settings: ServerSettings = self._config.get_configuration(f'ServerSettings_{ctx.guild.id}') server_settings: ServerSettings = self._config.get_configuration(f'ServerSettings_{ctx.guild.id}')

1
kdb-bot/src/modules/base/command/restart_command.py
View File

@ -47,6 +47,7 @@ class RestartCommand(DiscordCommandABC):
self._logger.debug(__name__, f'Received command restart {ctx}') self._logger.debug(__name__, f'Received command restart {ctx}')
if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
self._client_utils.received_command(ctx.guild.id) self._client_utils.received_command(ctx.guild.id)

1
kdb-bot/src/modules/base/command/shutdown_command.py
View File

@ -47,6 +47,7 @@ class ShutdownCommand(DiscordCommandABC):
self._logger.debug(__name__, f'Received command shutdown {ctx}') self._logger.debug(__name__, f'Received command shutdown {ctx}')
if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
self._client_utils.received_command(ctx.guild.id) self._client_utils.received_command(ctx.guild.id)

12
kdb-bot/src/modules/level/command/level_group.py
View File

@ -78,6 +78,7 @@ class LevelGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command level list {ctx}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -117,6 +118,9 @@ class LevelGroup(DiscordCommandABC):
@commands.guild_only() @commands.guild_only()
async def create(self, ctx: Context, name: str, color: str, min_xp: int, permissions: int): 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}') 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: try:
color = hex(discord.Colour.from_str(color).value) color = hex(discord.Colour.from_str(color).value)
@ -130,9 +134,6 @@ class LevelGroup(DiscordCommandABC):
self._logger.error(__name__, f'Error parsing permissions {permissions}', e) self._logger.error(__name__, f'Error parsing permissions {permissions}', e)
return return
if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return
if ctx.guild is None: if ctx.guild is None:
return return
@ -194,9 +195,9 @@ class LevelGroup(DiscordCommandABC):
@commands.guild_only() @commands.guild_only()
async def remove(self, ctx: Context, level: str): async def remove(self, ctx: Context, level: str):
self._logger.debug(__name__, f'Received command level remove {ctx}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_admin(ctx.author): if not self._permissions.is_member_admin(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -243,6 +244,7 @@ class LevelGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command level down {ctx} {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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -284,6 +286,7 @@ class LevelGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command level up {ctx} {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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -325,6 +328,7 @@ class LevelGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command level up {ctx} {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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))

5
kdb-bot/src/modules/stats/command/stats_group.py
View File

@ -55,6 +55,7 @@ class StatsGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command stats list {ctx}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -94,6 +95,7 @@ class StatsGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command stats view {ctx}:{name}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_moderator(ctx.author): if not self._permissions.is_member_moderator(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -141,6 +143,7 @@ class StatsGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command stats add {ctx}: {name}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_technician(ctx.author): if not self._permissions.is_member_technician(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -162,6 +165,7 @@ class StatsGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command stats edit {ctx}: {name}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_technician(ctx.author): if not self._permissions.is_member_technician(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
@ -192,6 +196,7 @@ class StatsGroup(DiscordCommandABC):
self._logger.debug(__name__, f'Received command stats remove {ctx}: {name}') 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): if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
return return
self._client_utils.received_command(ctx.guild.id)
if not self._permissions.is_member_technician(ctx.author): if not self._permissions.is_member_technician(ctx.author):
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message')) await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))