Skip to content

[Mutes] Catch failure to add or remove role #5467

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

Open
wants to merge 2 commits into
base: V3/develop
Choose a base branch
from
Open

[Mutes] Catch failure to add or remove role #5467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7021e5b
[Mutes] Catch failure to add or remove role
Jan200101 Dec 14, 2021
ecc2591
Merge branch 'V3/develop' into PR/mute-check
Kowlin Oct 20, 2022
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
8 changes: 5 additions & 3 deletions redbot/cogs/mutes/mutes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,12 +1661,14 @@ async def unmute_user(
ret["reason"] = _(MUTE_UNMUTE_ISSUES["role_missing"])
return ret

if guild.id in self._server_mutes:
if user.id in self._server_mutes[guild.id]:
del self._server_mutes[guild.id][user.id]
if guild.id in self._server_mutes and user.id in self._server_mutes[guild.id]:
Copy link
Contributor Author

@Jan200101 Jan200101 Dec 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if statement changed to match the one in mute_user

del self._server_mutes[guild.id][user.id]
if not guild.me.guild_permissions.manage_roles or role >= guild.me.top_role:
ret["reason"] = _(MUTE_UNMUTE_ISSUES["permissions_issue_role"])
return ret
if not role in user.roles:
ret["reason"] = _(MUTE_UNMUTE_ISSUES["already_unmuted"])
return ret
try:
await user.remove_roles(role, reason=reason)
except discord.errors.Forbidden:
Expand Down