Merge branch '0.3' into #28
# Conflicts: # kdb-bot/src/bot/translation/de.json # kdb-bot/src/modules/level/command/level_group.py
This commit is contained in:
@@ -14,7 +14,6 @@ from bot_core.abc.message_service_abc import MessageServiceABC
|
||||
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
|
||||
from bot_data.abc.user_repository_abc import UserRepositoryABC
|
||||
from bot_data.model.level import Level
|
||||
from modules.level.level_seeder import LevelSeeder
|
||||
from modules.level.service.level_service import LevelService
|
||||
@@ -31,10 +30,9 @@ class LevelGroup(DiscordCommandABC):
|
||||
client_utils: ClientUtilsServiceABC,
|
||||
permission_service: PermissionServiceABC,
|
||||
translate: TranslatePipe,
|
||||
db: DatabaseContextABC,
|
||||
db_context: DatabaseContextABC,
|
||||
levels: LevelRepositoryABC,
|
||||
servers: ServerRepositoryABC,
|
||||
users: UserRepositoryABC,
|
||||
level_service: LevelService,
|
||||
level_seeder: LevelSeeder,
|
||||
):
|
||||
@@ -46,10 +44,9 @@ class LevelGroup(DiscordCommandABC):
|
||||
self._client_utils = client_utils
|
||||
self._permissions = permission_service
|
||||
self._t = translate
|
||||
self._db = db
|
||||
self._db_context = db_context
|
||||
self._levels = levels
|
||||
self._servers = servers
|
||||
self._users = users
|
||||
|
||||
self._level_service = level_service
|
||||
self._level_seeder = level_seeder
|
||||
@@ -139,7 +136,7 @@ class LevelGroup(DiscordCommandABC):
|
||||
else:
|
||||
try:
|
||||
self._levels.add_level(level)
|
||||
self._db.save_changes()
|
||||
self._db_context.save_changes()
|
||||
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)
|
||||
@@ -187,6 +184,53 @@ class LevelGroup(DiscordCommandABC):
|
||||
# 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 colors]
|
||||
|
||||
@level.command()
|
||||
@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
|
||||
|
||||
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()
|
||||
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))
|
||||
self._logger.trace(__name__, f'Finished command level remove')
|
||||
return
|
||||
|
||||
try:
|
||||
self._levels.delete_level(level_from_db)
|
||||
self._db_context.save_changes()
|
||||
guild: Guild = self._bot.guilds.where(lambda g: g == ctx.guild).single()
|
||||
role: Role = guild.roles.where(lambda r: r.name == level).single_or_default()
|
||||
if role is not None:
|
||||
await role.delete()
|
||||
self._logger.info(__name__, f'Removed level {level}')
|
||||
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._seed_levels(ctx.channel)
|
||||
|
||||
self._logger.trace(__name__, f'Finished command level remove')
|
||||
|
||||
@remove.autocomplete('level')
|
||||
async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
|
||||
server = self._servers.get_server_by_discord_id(interaction.guild.id)
|
||||
levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
|
||||
return [app_commands.Choice(name=level, value=level) for level in levels]
|
||||
|
||||
@level.command()
|
||||
@commands.guild_only()
|
||||
async def down(self, ctx: Context, member: discord.Member):
|
||||
|
Reference in New Issue
Block a user