Skip to content

fix: Fix issues within /mute #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nydauron merged 2 commits into from
Sep 13, 2025
Merged

fix: Fix issues within /mute #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78812fa
fix: Fetch new member object after applying timeout for test
Nydauron Sep 13, 2025
27fc086
fix: Add check to ensure provided timestamp is in the future
Nydauron Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/discord/staffcommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,11 @@ async def mute(
selected_time = self.time_str_to_datetime(mute_length)
time_statement = f"The user will be muted until {discord.utils.format_dt(selected_time)}."
if until:
if until <= datetime.datetime.now(tz=datetime.timezone.utc).timestamp():
raise Exception(
"`until` unix timestamp must be set in the future. No timeout will be applied otherwise.",
)

selected_time = datetime.datetime.fromtimestamp(
until,
tz=datetime.timezone.utc,
Expand Down Expand Up @@ -785,6 +790,13 @@ async def mute(
view=None,
)
return
if selected_time and selected_time <= datetime.datetime.now(
tz=datetime.timezone.utc,
):
await interaction.edit_original_response(
content="Proposed expiration timestamp is now set in the past. No timeout will be applied.",
)
return
muted_role = discord.utils.get(interaction.guild.roles, name=ROLE_MUTED)
if not muted_role:
raise Exception("Muted role was not found.")
Expand Down Expand Up @@ -818,23 +830,27 @@ async def mute(
raise e

# Test
updated_member = await interaction.guild.fetch_member(member.id)
if selected_time:
if not member.timed_out_until or member.timed_out_until != selected_time:
if (
not updated_member.timed_out_until
or updated_member.timed_out_until != selected_time
):
timeout_str = (
f"timeout that ends {discord.utils.format_dt(member.timed_out_until)} ({discord.utils.format_dt(member.timed_out_until, style='R')})"
if member.timed_out_until
f"timeout that ends {discord.utils.format_dt(updated_member.timed_out_until)} ({discord.utils.format_dt(updated_member.timed_out_until, style='R')})"
if updated_member.timed_out_until
else "no timeout that was applied"
)
await interaction.edit_original_response(
content=f"Test for timeout failed. Found {timeout_str} on {member.mention}.",
content=f"Test for timeout failed. Found {timeout_str} on {updated_member.mention}.",
embed=None,
view=None,
)
return
else:
if muted_role not in member.roles:
if muted_role not in updated_member.roles:
await interaction.edit_original_response(
content=f"Test for timeout failed. Did not find {muted_role.name} role on {member.mention}",
content=f"Test for timeout failed. Did not find {muted_role.name} role on {updated_member.mention}",
embed=None,
view=None,
)
Expand Down
Loading