Add mute infraction check to role restoration

1 files changed, 28 insertions, 0 deletions

diff --git a/bot/cogs/events.py b/bot/cogs/events.py
index edfc6e579..c604169c0 100644
--- a/bot/cogs/events.py
+++ b/bot/cogs/events.py
@@ -25,6 +25,7 @@ class Events:
 
     def __init__(self, bot: Bot):
         self.bot = bot
+        self.headers = {"X-API-KEY": Keys.site_api}
 
     @property
     def mod_log(self) -> ModLog:
@@ -103,6 +104,29 @@ class Events:
         resp = await response.json()
         return resp["data"]
 
+    async def has_active_mute(self, user_id: str) -> bool:
+        """
+        Check whether a user has any active mute infractions
+        """
+        response = await self.bot.http_session.get(
+            URLs.site_infractions_user.format(
+                user_id=user_id
+            ),
+            params={"hidden": "True"},
+            headers=self.headers
+        )
+        infraction_list = await response.json()
+
+        # Check for active mute infractions
+        if len(infraction_list) == 0:
+            # Short circuit
+            return False
+
+        muted_check = any(
+            [infraction["active"] for infraction in infraction_list if infraction["type"].lower() == "mute"]
+        )
+        return muted_check
+
     async def on_command_error(self, ctx: Context, e: CommandError):
         command = ctx.command
         parent = None
@@ -236,6 +260,10 @@ class Events:
 
                 for role in RESTORE_ROLES:
                     if role in old_roles:
+                        # Check for mute roles that were not able to be removed and skip if present
+                        if role == str(Roles.muted) and not await self.has_active_mute(str(member.id)):
+                            continue
+
                         new_roles.append(Object(int(role)))
 
                 for role in new_roles: