Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(timers): Unify command interface.

Browse Source
This commit is contained in:
Conatum
2023-09-12 15:15:53 +03:00
parent 0b669456cb
commit 66434e5a29
3 changed files with 247 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/meta/help_sections.py
View File

@@ -22,7 +22,7 @@ cmd_map = {
"cmd_room": "room rent", "cmd_room": "room rent",
"cmd_reminders": "remindme in", "cmd_reminders": "remindme in",
"cmd_tasklist": "tasklist", "cmd_tasklist": "tasklist",
"cmd_timers": "timers list", "cmd_timers": "timers",
"cmd_schedule": "schedule", "cmd_schedule": "schedule",
"cmd_dashboard": "dashboard" "cmd_dashboard": "dashboard"
} }
@@ -79,8 +79,8 @@ admin_extra = _p(
Other relevant commands for guild configuration below: Other relevant commands for guild configuration below:
`/editshop`: Add/Edit/Remove colour roles from the {coin} shop. `/editshop`: Add/Edit/Remove colour roles from the {coin} shop.
`/ranks`: Add/Edit/Remove activity ranks. `/ranks`: Add/Edit/Refresh/Remove activity ranks.
`/timer admin`: Add/Edit/Remove Pomodoro timers in voice channels. `/pomodoro`: Add/Edit/Remove Pomodoro timers in voice channels.
`/rolemenus`: Allow members to equip roles from customisable messages. `/rolemenus`: Allow members to equip roles from customisable messages.
`/economy balance`: Display and modify LionCoin balance for members and roles. `/economy balance`: Display and modify LionCoin balance for members and roles.
""" """

412
src/modules/pomodoro/cog.py
View File

@@ -21,7 +21,6 @@ from .settings import TimerSettings
from .settingui import TimerConfigUI from .settingui import TimerConfigUI
from .timer import Timer from .timer import Timer
from .options import TimerOptions from .options import TimerOptions
from .ui import TimerStatusUI
from .ui.config import TimerOptionsUI from .ui.config import TimerOptionsUI
_p = babel._p _p = babel._p
@@ -317,29 +316,24 @@ class TimerCog(LionCog):
await timer.destroy(**kwargs) await timer.destroy(**kwargs)
# ----- Timer Commands ----- # ----- Timer Commands -----
@cmds.hybrid_group(
name=_p('cmd:pomodoro', "timers"),
description=_p('cmd:pomodoro|desc', "Base group for all pomodoro timer commands.")
)
@cmds.guild_only()
async def pomodoro_group(self, ctx: LionContext):
...
# -- User Display Commands -- # -- User Display Commands --
@pomodoro_group.command( @cmds.hybrid_command(
name=_p('cmd:pomodoro_status', "show"), name=_p('cmd:timer', "timer"),
description=_p('cmd:pomodoro_status|desc', "Display the status of a single pomodoro timer.") description=_p('cmd:timer|desc', "Show your current (or selected) pomodoro timer.")
) )
@appcmds.rename( @appcmds.rename(
channel=_p('cmd:pomodoro_status|param:channel', "timer_channel") channel=_p('cmd:timer|param:channel', "timer_channel")
) )
@appcmds.describe( @appcmds.describe(
channel=_p( channel=_p(
'cmd:pomodoro_status|param:channel|desc', 'cmd:timer|param:channel|desc',
"The channel for which you want to view the timer." "Select a timer to display (by selecting the timer voice channel)"
) )
) )
async def cmd_pomodoro_status(self, ctx: LionContext, channel: discord.VoiceChannel): @cmds.guild_only()
async def cmd_timer(self, ctx: LionContext,
channel: Optional[discord.VoiceChannel] = None):
t = self.bot.translator.t t = self.bot.translator.t
if not ctx.guild: if not ctx.guild:
@@ -347,27 +341,63 @@ class TimerCog(LionCog):
if not ctx.interaction: if not ctx.interaction:
return return
# Check if a timer exists in the given channel timers: list[Timer] = list(self.get_guild_timers(ctx.guild.id).values())
timer = self.get_channel_timer(channel.id) error: Optional[discord.Embed] = None
if timer is None:
embed = discord.Embed( if not timers:
# Guild has no timers
error = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'cmd:pomodoro_status|error:no_timer', 'cmd:timer|error:no_timers|desc',
"The channel {channel} does not have a timer set up!" "**This server has no timers set up!**\n"
)).format(channel=channel.mention) "Ask an admin to set up and configure a timer with {create_cmd} first, "
"or rent a private room with {room_cmd} and create one yourself!"
)).format(create_cmd=self.bot.core.mention_cmd('pomodoro create'),
room_cmd=self.bot.core.mention_cmd('rooms rent'))
) )
await ctx.reply(embed=embed, ephemeral=True) elif channel is None:
else: if ctx.author.voice and ctx.author.voice.channel:
# Display the timer status ephemerally channel = ctx.author.voice.channel
status = await timer.current_status(with_notify=False, with_warnings=False) else:
await ctx.reply(**status.send_args, ephemeral=True) error = discord.Embed(
colour=discord.Colour.brand_red(),
description=t(_p(
'cmd:timer|error:no_channel|desc',
"**I don't know what timer to show you.**\n"
"No channel selected and you are not in a voice channel! "
"Use {timers_cmd} to list the available timers in this server."
)).format(timers_cmd=self.bot.core.mention_cmd('timers'))
)
@pomodoro_group.command( if channel is not None:
name=_p('cmd:pomodoro_list', "list"), timer = self.get_channel_timer(channel.id)
description=_p('cmd:pomodoro_list|desc', "List the available pomodoro timers.") if timer is None:
error = discord.Embed(
colour=discord.Colour.brand_red(),
description=t(_p(
'cmd:timer|error:no_timer_in_channel',
"The channel {channel} is not a pomodoro timer room!\n"
"Use {timers_cmd} to list the available timers in this server."
)).format(
channel=channel.mention,
timers_cmd=self.bot.core.mention_cmd('timers')
)
)
else:
# Display the timer status ephemerally
status = await timer.current_status(with_notify=False, with_warnings=False)
await ctx.reply(**status.send_args, ephemeral=True)
if error is not None:
await ctx.reply(embed=error, ephemeral=True)
@cmds.hybrid_command(
name=_p('cmd:timers', "timers"),
description=_p('cmd:timers|desc', "List the available pomodoro timer rooms.")
) )
async def cmd_pomodoro_list(self, ctx: LionContext): @cmds.guild_only()
async def cmd_timers(self, ctx: LionContext):
t = self.bot.translator.t t = self.bot.translator.t
if not ctx.guild: if not ctx.guild:
@@ -376,6 +406,8 @@ class TimerCog(LionCog):
return return
timers = list(self.get_guild_timers(ctx.guild.id).values()) timers = list(self.get_guild_timers(ctx.guild.id).values())
# Extra filter here to exclude owned timers, but include ones the author is a member of
visible_timers = [ visible_timers = [
timer for timer in timers timer for timer in timers
if timer.channel and timer.channel.permissions_for(ctx.author).connect if timer.channel and timer.channel.permissions_for(ctx.author).connect
@@ -383,26 +415,29 @@ class TimerCog(LionCog):
] ]
if not timers: if not timers:
# No timers in this guild! # No timers in the guild
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'cmd:pomodoro_list|error:no_timers', 'cmd:timer|error:no_timers|desc',
"No timers have been setup in this server!\n" "**This server has no timers set up!**\n"
"You can ask an admin to create one with {command}, " "Ask an admin to set up and configure a timer with {create_cmd} first, "
"or rent a private room and create one yourself!" "or rent a private room with {room_cmd} and create one yourself!"
)).format(command='`/pomodoro admin create`') )).format(create_cmd=self.bot.core.mention_cmd('pomodoro create'),
room_cmd=self.bot.core.mention_cmd('rooms rent'))
) )
# TODO: Update command mention when we have command mentions
await ctx.reply(embed=embed, ephemeral=True) await ctx.reply(embed=embed, ephemeral=True)
elif not visible_timers: elif not visible_timers:
# Timers exist, but the member can't see any # Timers exist, but the member can't see any
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'cmd:pomodoro_list|error:no_visible_timers', 'cmd:timer|error:no_visible_timers|desc',
"There are no timers you can join in this server!" "**There are no available pomodoro timers!**\n"
)) "Ask an admin to set up a new timer with {create_cmd}, "
"or rent a private room with {room_cmd} and create one yourself!"
)).format(create_cmd=self.bot.core.mention_cmd('pomodoro create'),
room_cmd=self.bot.core.mention_cmd('rooms rent'))
) )
await ctx.reply(embed=embed, ephemeral=True) await ctx.reply(embed=embed, ephemeral=True)
else: else:
@@ -410,8 +445,8 @@ class TimerCog(LionCog):
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.orange(), colour=discord.Colour.orange(),
title=t(_p( title=t(_p(
'cmd:pomodoro_list|embed:timer_list|title', 'cmd:timers|embed:timer_list|title',
"Pomodoro Timers in **{guild}**" "Pomodoro Timer Rooms in **{guild}**"
)).format(guild=ctx.guild.name), )).format(guild=ctx.guild.name),
) )
for timer in visible_timers: for timer in visible_timers:
@@ -419,25 +454,26 @@ class TimerCog(LionCog):
if stage is None: if stage is None:
if timer.auto_restart: if timer.auto_restart:
lazy_status = _p( lazy_status = _p(
'cmd:pomodoro_list|status:stopped_auto', 'cmd:timers|status:stopped_auto',
"`{pattern}` timer is stopped with no members!\nJoin {channel} to restart it." "`{pattern}` timer is stopped with no members!\n"
"Join {channel} to restart it."
) )
else: else:
lazy_status = _p( lazy_status = _p(
'cmd:pomodoro_list|status:stopped_manual', 'cmd:timers|status:stopped_manual',
"`{pattern}` timer is stopped with `{members}` members!\n" "`{pattern}` timer is stopped with `{members}` members!\n"
"Join {channel} and press `Start` to start it!" "Join {channel} and press `Start` to start it!"
) )
else: else:
if stage.focused: if stage.focused:
lazy_status = _p( lazy_status = _p(
'cmd:pomodoro_list|status:running_focus', 'cmd:timers|status:running_focus',
"`{pattern}` timer is running with `{members}` members!\n" "`{pattern}` timer is running with `{members}` members!\n"
"Currently **focusing**, with break starting {timestamp}" "Currently **focusing**, with break starting {timestamp}"
) )
else: else:
lazy_status = _p( lazy_status = _p(
'cmd:pomodoro_list|status:running_break', 'cmd:timers|status:running_break',
"`{pattern}` timer is running with `{members}` members!\n" "`{pattern}` timer is running with `{members}` members!\n"
"Currently **resting**, with focus starting {timestamp}" "Currently **resting**, with focus starting {timestamp}"
) )
@@ -451,18 +487,19 @@ class TimerCog(LionCog):
await ctx.reply(embed=embed, ephemeral=False) await ctx.reply(embed=embed, ephemeral=False)
# -- Admin Commands -- # -- Admin Commands --
@pomodoro_group.group( @cmds.hybrid_group(
name=_p('cmd:pomodoro_admin', "admin"), name=_p('cmd:pomodoro', "pomodoro"),
desc=_p('cmd:pomodoro_admin|desc', "Command group for pomodoro admin controls.") description=_p('cmd:pomodoro|desc', "Create and configure pomodoro timer rooms.")
) )
async def pomodoro_admin_group(self, ctx: LionContext): @cmds.guild_only()
async def pomodoro_group(self, ctx: LionContext):
... ...
@pomodoro_admin_group.command( @pomodoro_group.command(
name=_p('cmd:pomodoro_create', "create"), name=_p('cmd:pomodoro_create', "create"),
description=_p( description=_p(
'cmd:pomodoro_create|desc', 'cmd:pomodoro_create|desc',
"Create a new Pomodoro timer. Requires admin permissions." "Create a new Pomodoro timer. Requires manage channel permissions."
) )
) )
@appcmds.rename( @appcmds.rename(
@@ -495,17 +532,15 @@ class TimerCog(LionCog):
if not ctx.interaction: if not ctx.interaction:
return return
# Check permissions # Get private room if applicable
if not ctx.author.guild_permissions.administrator: room_cog = self.bot.get_cog('RoomCog')
embed = discord.Embed( if room_cog is None:
colour=discord.Colour.brand_red(), logger.warning("Running pomodoro create without private room cog loaded!")
description=t(_p( private_room = None
'cmd:pomodoro_create|error:insufficient_perms', else:
"Only server administrators can create timers!" rooms = room_cog.get_rooms(ctx.guild.id, ctx.author.id)
)) cid = next((cid for cid, room in rooms.items() if room.data.ownerid == ctx.author.id), None)
) private_room = ctx.guild.get_channel(cid) if cid is not None else None
await ctx.reply(embed=embed, ephemeral=True)
return
# If a voice channel was not given, attempt to resolve it or make one # If a voice channel was not given, attempt to resolve it or make one
if channel is None: if channel is None:
@@ -514,112 +549,155 @@ class TimerCog(LionCog):
channel = ctx.channel channel = ctx.channel
elif ctx.author.voice and ctx.author.voice.channel: elif ctx.author.voice and ctx.author.voice.channel:
channel = ctx.author.voice.channel channel = ctx.author.voice.channel
elif not ctx.author.guild_permissions.manage_channels:
embed = discord.Embed(
colour=discord.Colour.brand_red(),
title=t(_p(
'cmd:pomodoro_create|new_channel|error:your_insufficient_perms|title',
"Could not create pomodoro voice channel!"
)),
description=t(_p(
'cmd:pomodoro_create|new_channel|error:your_insufficient_perms',
"No `timer_channel` was provided, and you lack the 'Manage Channels` permission "
"required to create a new timer room!"
))
)
await ctx.reply(embed=embed, ephemeral=True)
elif not ctx.guild.me.guild_permissions.manage_channels:
# Error
embed = discord.Embed(
colour=discord.Colour.brand_red(),
title=t(_p(
'cmd:pomodoro_create|new_channel|error:my_insufficient_perms|title',
"Could not create pomodoro voice channel!"
)),
description=t(_p(
'cmd:pomodoro_create|new_channel|error:my_insufficient_perms|desc',
"No `timer_channel` was provided, and I lack the 'Manage Channels' permission "
"required to create a new voice channel."
))
)
await ctx.reply(embed=embed, ephemeral=True)
else: else:
# Attempt to create new channel in current category # Attempt to create new channel in current category
if ctx.guild.me.guild_permissions.manage_channels: try:
try: channel = await ctx.guild.create_voice_channel(
channel = await ctx.guild.create_voice_channel( name=name or t(_p(
name=name or "Timer", 'cmd:pomodoro_create|new_channel|default_name',
reason="Creating Pomodoro Voice Channel", "Timer"
category=ctx.channel.category )),
) reason=t(_p(
except discord.HTTPException: 'cmd:pomodoro_create|new_channel|audit_reason',
embed = discord.Embed( "Creating Pomodoro Voice Channel"
colour=discord.Colour.brand_red(), )),
title=t(_p( category=ctx.channel.category
'cmd:pomodoro_create|error:channel_create_failed|title', )
"Could not create pomodoro voice channel!" except discord.HTTPException:
)),
description=t(_p(
'cmd:pomodoro_create|error:channel_create|desc',
"Failed to create a new pomodoro voice channel due to an unknown "
"Discord communication error. "
"Please try creating the channel manually and pass it to the "
"`timer_channel` argument of this command."
))
)
await ctx.reply(embed=embed, ephemeral=True)
return
else:
# Error
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
title=t(_p( title=t(_p(
'cmd:pomodoro_create|error:channel_create_permissions|title', 'cmd:pomodoro_create|new_channel|error:channel_create_failed|title',
"Could not create pomodoro voice channel!" "Could not create pomodoro voice channel!"
)), )),
description=t(_p( description=t(_p(
'cmd:pomodoro_create|error:channel_create_permissions|desc', 'cmd:pomodoro_create|new_channel|error:channel_create_failed|desc',
"No `timer_channel` was provided, and I lack the `MANAGE_CHANNELS` permission " "Failed to create a new pomodoro voice channel due to an unknown "
"needed to create a new voice channel." "Discord communication error. "
"Please try creating the channel manually and pass it to the "
"`timer_channel` argument of this command."
)) ))
) )
await ctx.reply(embed=embed, ephemeral=True) await ctx.reply(embed=embed, ephemeral=True)
return
# At this point, we have a voice channel if not channel:
# Make sure a timer does not already exist in the channel # Already handled the creation error
if (self.get_channel_timer(channel.id)) is not None: pass
elif (self.get_channel_timer(channel.id)) is not None:
# A timer already exists in the resolved channel
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'cmd:pomodoro_create|error:timer_exists', 'cmd:pomodoro_create|add_timer|error:timer_exists',
"A timer already exists in {channel}! Use `/pomodoro admin edit` to modify it." "A timer already exists in {channel}! "
)).format(channel=channel.mention) "Reconfigure it with {edit_cmd}."
)).format(
channel=channel.mention,
edit_cmd=self.bot.core.mention_cmd('pomodoro edit')
)
) )
await ctx.reply(embed=embed, ephemeral=True) await ctx.reply(embed=embed, ephemeral=True)
return elif not channel.permissions_for(ctx.author).manage_channels:
# Note that this takes care of private room owners as well
embed = discord.Embed(
colour=discord.Colour.brand_red(),
description=t(_p(
'cmd:pomodoro_create|add_timer|error:your_insufficient_perms',
"You must have the 'Manage Channel' permission in {channel} "
"in order to add a timer there!"
))
)
await ctx.reply(embed=embed, ephemeral=True)
else:
# Finally, we are sure they can create a timer here
# Build the creation arguments from the rest of the provided args
provided = {
'focus_length': focus_length * 60,
'break_length': break_length * 60,
'inactivity_threshold': inactivity_threshold,
'voice_alerts': voice_alerts,
'name': name or channel.name,
'channel_name': channel_name or None,
}
create_args = {'channelid': channel.id, 'guildid': channel.guild.id}
# Build the creation arguments from the rest of the provided args owned = (private_room and (channel == private_room))
provided = { if owned:
'focus_length': focus_length * 60, provided['manager_role'] = manager_role or ctx.guild.default_role
'break_length': break_length * 60, create_args['notification_channelid'] = channel.id
'notification_channel': notification_channel, create_args['ownerid'] = ctx.author.id
'inactivity_threshold': inactivity_threshold, else:
'manager_role': manager_role, provided['notification_channel'] = notification_channel
'voice_alerts': voice_alerts, provided['manager_role'] = manager_role
'name': name or channel.name,
'channel_name': channel_name or None,
}
create_args = {'channelid': channel.id, 'guildid': channel.guild.id} for param, value in provided.items():
for param, value in provided.items(): if value is not None:
if value is not None: setting, _ = _param_options[param]
setting, _ = _param_options[param] create_args[setting._column] = setting._data_from_value(channel.id, value)
create_args[setting._column] = setting._data_from_value(channel.id, value)
# Permission checks and input checking done # Permission checks and input checking done
await ctx.interaction.response.defer(thinking=True) await ctx.interaction.response.defer(thinking=True)
# Create timer # Create timer
timer = await self.create_timer(**create_args) timer = await self.create_timer(**create_args)
# Start timer # Start timer
await timer.start() await timer.start()
# Ack with a config UI # Ack with a config UI
ui = TimerOptionsUI(self.bot, timer, TimerRole.ADMIN, callerid=ctx.author.id) ui = TimerOptionsUI(
await ui.run( self.bot, timer, TimerRole.ADMIN if not owned else TimerRole.OWNER, callerid=ctx.author.id
ctx.interaction, )
content=t(_p( await ui.run(
'cmd:pomodoro_create|response:success|content', ctx.interaction,
"Timer created successfully! Use the panel below to reconfigure." content=t(_p(
)) 'cmd:pomodoro_create|response:success|content',
) "Timer created successfully! Use the panel below to reconfigure."
await ui.wait() ))
)
await ui.wait()
@pomodoro_admin_group.command( @pomodoro_group.command(
name=_p('cmd:pomodoro_destroy', "destroy"), name=_p('cmd:pomodoro_destroy', "destroy"),
description=_p( description=_p(
'cmd:pomodoro_destroy|desc', 'cmd:pomodoro_destroy|desc',
"Delete a pomodoro timer from a voice channel. Requires admin permissions." "Remove a pomodoro timer from a voice channel."
) )
) )
@appcmds.rename( @appcmds.rename(
channel=_p('cmd:pomodoro_destroy|param:channel', "timer_channel"), channel=_p('cmd:pomodoro_destroy|param:channel', "timer_channel"),
) )
@appcmds.describe( @appcmds.describe(
channel=_p('cmd:pomodoro_destroy|param:channel', "Channel with the timer to delete."), channel=_p('cmd:pomodoro_destroy|param:channel', "Select a timer voice channel to remove the timer from."),
) )
async def cmd_pomodoro_delete(self, ctx: LionContext, channel: discord.VoiceChannel): async def cmd_pomodoro_delete(self, ctx: LionContext, channel: discord.VoiceChannel):
t = self.bot.translator.t t = self.bot.translator.t
@@ -644,46 +722,42 @@ class TimerCog(LionCog):
return return
# Check the user has sufficient permissions to delete the timer # Check the user has sufficient permissions to delete the timer
# TODO: Should we drop the admin requirement down to manage channel?
timer_role = timer.get_member_role(ctx.author) timer_role = timer.get_member_role(ctx.author)
if timer.owned: if timer.owned and timer_role < TimerRole.OWNER:
if timer_role < TimerRole.OWNER: embed = discord.Embed(
embed = discord.Embed( colour=discord.Colour.brand_red(),
colour=discord.Colour.brand_red(), description=t(_p(
description=t(_p( 'cmd:pomodoro_destroy|error:insufficient_perms|owned',
'cmd:pomodoro_destroy|error:insufficient_perms|owned', "You need to be an administrator or own this channel to remove this timer!"
"You need to be an administrator or own this channel to remove this timer!" ))
)) )
) await ctx.interaction.response.send_message(embed=embed, ephemeral=True)
await ctx.interaction.response.send_message(embed=embed, ephemeral=True) elif timer_role is not TimerRole.ADMIN and not channel.permissions_for(ctx.author).manage_channels:
return
elif timer_role is not TimerRole.ADMIN:
embed = discord.Embed( embed = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'cmd:pomodoro_destroy|error:insufficient_perms|notowned', 'cmd:pomodoro_destroy|error:insufficient_perms|notowned',
"You need to be a server administrator to remove this timer!" "You need to have the `Manage Channels` permission in {channel} to remove this timer!"
)) )).format(channel=channel.mention)
) )
await ctx.interaction.response.send_message(embed=embed, ephemeral=True) await ctx.interaction.response.send_message(embed=embed, ephemeral=True)
return else:
await ctx.interaction.response.defer(thinking=True)
await self.destroy_timer(timer, reason="Deleted by command")
embed = discord.Embed(
colour=discord.Colour.brand_green(),
description=t(_p(
'cmd:pomdoro_destroy|response:success|description',
"Timer successfully removed from {channel}."
)).format(channel=channel.mention)
)
await ctx.interaction.edit_original_response(embed=embed)
await ctx.interaction.response.defer(thinking=True) @pomodoro_group.command(
await self.destroy_timer(timer, reason="Deleted by command")
embed = discord.Embed(
colour=discord.Colour.brand_green(),
description=t(_p(
'cmd:pomdoro_destroy|response:success|description',
"Timer successfully removed from {channel}."
)).format(channel=channel.mention)
)
await ctx.interaction.edit_original_response(embed=embed)
@pomodoro_admin_group.command(
name=_p('cmd:pomodoro_edit', "edit"), name=_p('cmd:pomodoro_edit', "edit"),
description=_p( description=_p(
'cmd:pomodoro_edit|desc', 'cmd:pomodoro_edit|desc',
"Edit a Timer" "Reconfigure a pomodoro timer."
) )
) )
@appcmds.rename( @appcmds.rename(
@@ -693,7 +767,7 @@ class TimerCog(LionCog):
@appcmds.describe( @appcmds.describe(
channel=_p( channel=_p(
'cmd:pomodoro_edit|param:channel|desc', 'cmd:pomodoro_edit|param:channel|desc',
"Channel holding the timer to edit." "Select a timer voice channel to reconfigure."
), ),
**{param: option._desc for param, (option, _) in _param_options.items()} **{param: option._desc for param, (option, _) in _param_options.items()}
) )
@@ -827,8 +901,6 @@ class TimerCog(LionCog):
@low_management_ward @low_management_ward
async def configure_pomodoro_command(self, ctx: LionContext, async def configure_pomodoro_command(self, ctx: LionContext,
pomodoro_channel: Optional[discord.VoiceChannel | discord.TextChannel] = None): pomodoro_channel: Optional[discord.VoiceChannel | discord.TextChannel] = None):
t = self.bot.translator.t
# Type checking guards # Type checking guards
if not ctx.guild: if not ctx.guild:
return return

4
src/modules/rooms/roomui.py
View File

@@ -233,8 +233,8 @@ class RoomUI(MessageUI):
await submit.edit_original_response( await submit.edit_original_response(
content=t(_p( content=t(_p(
'ui:room_status|button:timer|timer_created', 'ui:room_status|button:timer|timer_created',
"Timer created successfully! Use `/pomodoro edit` to configure further." "Timer created successfully! Use {edit_cmd} to configure further."
)) )).format(edit_cmd=self.bot.core.mention_cmd('pomodoro edit'))
) )
await self.refresh() await self.refresh()
except UserInputError: except UserInputError: