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

Improved formatting #164

Browse Source
This commit is contained in:
Sven Heidemann
2023-01-12 07:29:45 +01:00
parent 053c190c78
commit 5d6c55fc86
3 changed files with 91 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,16 +192,20 @@ class LevelGroup(DiscordCommandABC):
try:
self._levels.add_level(level)
self._db.save_changes()
self._logger.info(__name__,
f'Saved level {name} with color {color}, min_xp {min_xp} and permissions {permissions}')
self._logger.info(
__name__, f'Saved level {name} with color {color}, min_xp {min_xp} and permissions {permissions}'
)
except Exception as e:
self._logger.error(__name__,
f'Could not save level {name} with color {color}, min_xp {min_xp} and permissions {permissions}',
e)
self._logger.error(
__name__,
f'Could not save level {name} with color {color}, min_xp {min_xp} and permissions {permissions}',
e
)
else:
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.create.created').format(name,
permissions))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.create.created').format(name, permissions)
)
await self._seed_levels(ctx)
self._logger.trace(__name__, f'Finished command level create')
@@ -211,23 +215,30 @@ class LevelGroup(DiscordCommandABC):
app_commands.Choice[str]]:
# value in rg format see:
# https://discordpy.readthedocs.io/en/latest/api.html#discord.Colour.to_rgb
return [app_commands.Choice(name=self._t.transform(f'common.colors.{color}'),
value=f'rgb({code[0]}, {code[1]}, {code[2]})') for color, code in self._colors]
return [
app_commands.Choice(
name=self._t.transform(f'common.colors.{color}'), value=f'rgb({code[0]}, {code[1]}, {code[2]})'
) for color, code in self._colors
]
@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):
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}')
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()
if level_from_db is None:
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.edit.not_found').format(level))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.edit.not_found').format(level)
)
return
guild: Guild = self._bot.guilds.where(lambda g: g == ctx.guild).single()
@@ -240,9 +251,10 @@ class LevelGroup(DiscordCommandABC):
try:
level_from_db.color = hex(discord.Colour.from_str(color).value)
except Exception as e:
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.edit.color_invalid').format(
color))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.edit.color_invalid').format(color)
)
self._logger.error(__name__, f'Error parsing color {color}', e)
return
@@ -261,14 +273,21 @@ class LevelGroup(DiscordCommandABC):
try:
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}')
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}'
)
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)
self._logger.error(
__name__,
f'Could not save level {level} with color {color}, min_xp {min_xp} and permissions {permissions}',
e
)
else:
await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.level.edit.edited').format(level))
await self._seed_levels(ctx)
@@ -285,8 +304,12 @@ class LevelGroup(DiscordCommandABC):
app_commands.Choice[str]]:
# value in rg format see:
# https://discordpy.readthedocs.io/en/latest/api.html#discord.Colour.to_rgb
return [app_commands.Choice(name=self._t.transform(f'common.colors.{color}'),
value=f'rgb({code[0]}, {code[1]}, {code[2]})') for color, code in self._colors]
return [
app_commands.Choice(
name=self._t.transform(f'common.colors.{color}'),
value=f'rgb({code[0]}, {code[1]}, {code[2]})'
) for color, code in self._colors
]
@level.command()
@commands.guild_only()
@@ -300,9 +323,10 @@ class LevelGroup(DiscordCommandABC):
lambda l: l.name == level).first_or_default()
if level_from_db is None:
self._logger.debug(__name__, f'level {level} not found')
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.remove.error.not_found').format(
level))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.remove.error.not_found').format(level)
)
self._logger.trace(__name__, f'Finished command level remove')
return
@@ -317,8 +341,10 @@ class LevelGroup(DiscordCommandABC):
except Exception as e:
self._logger.error(__name__, f'Could not remove level {level}', e)
else:
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.remove.success').format(level))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.remove.success').format(level)
)
await self._seed_levels(ctx)
self._logger.trace(__name__, f'Finished command level remove')
@@ -417,8 +443,10 @@ class LevelGroup(DiscordCommandABC):
lambda l: l.name == level).single_or_default()
if new_level is None:
await self._message_service.send_ctx_msg(ctx,
self._t.transform('modules.level.set.not_found').format(level))
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('modules.level.set.not_found').format(level)
)
self._logger.trace(__name__, f'Finished command level set')
return