From 57d2d31006cb510a357cbda830d5cb60de67fd9a Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 5 Aug 2021 16:22:41 -0600 Subject: [PATCH] Close #79 --- jarvis/cogs/modlog/member.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/jarvis/cogs/modlog/member.py b/jarvis/cogs/modlog/member.py index 9472f52..41be3cd 100644 --- a/jarvis/cogs/modlog/member.py +++ b/jarvis/cogs/modlog/member.py @@ -240,14 +240,28 @@ class ModlogMemberCog(commands.Cog): verified = Setting.objects( guild=before.guild.id, setting="verified" ).first() - if mute and before.guild.get_role(mute.value) in after.roles: + mute_role = None + verified_role = None + if mute: + mute_role = before.guild.get_role(mute.value) + if verified: + verified_role = before.guild.get_role(verified.value) + if ( + mute + and mute_role in after.roles + and mute_role not in before.roles + ): embed = await self.process_mute(before, after) - elif mute and before.guild.get_role(mute.value) in before.roles: + elif ( + mute + and mute_role in before.roles + and mute_role not in after.roles + ): embed = await self.process_unmute(before, after) elif ( verified - and before.guild.get_role(verified.value) not in before.roles - and after.guild.get_role(verified.value) in after.roles + and verified_role not in before.roles + and verified_role in after.roles ): embed = await self.process_verify(before, after) elif before.nick != after.nick: