From 50a1a9c8a12eff6f199add786ead9917323602b2 Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Mon, 9 Oct 2023 11:27:20 +0300
Subject: [PATCH] logging: Greatly increase role remove logging.

---
 src/core/lion_member.py      | 12 ++++++++++++
 src/modules/rolemenus/cog.py | 18 ++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/core/lion_member.py b/src/core/lion_member.py
index 4a7a5632..3e5a2e25 100644
--- a/src/core/lion_member.py
+++ b/src/core/lion_member.py
@@ -117,8 +117,20 @@ class LionMember(Timezoned):
                     f"<uid: {member.id}>, <gid: {member.guild.id}>, <rid: {role.id}>. "
                     f"Error: {repr(e)}",
                 )
+            else:
+                if role not in member.roles:
+                    logger.info(
+                        f"Removed role <rid: {role.id}> from member <uid: {self.userid}> in <gid: {self.guildid}>"
+                    )
+                else:
+                    logger.error(
+                        f"Tried to remove role <rid: {role.id}> "
+                        f"from member <uid: {self.userid}> in <gid: {self.guildid}>. "
+                        "Role remove succeeded, but member still has the role."
+                    )
         else:
             # Remove the role from persistent role storage
             cog = self.bot.get_cog('MemberAdminCog')
             if cog:
                 await cog.absent_remove_role(self.guildid, self.userid, role.id)
+            logger.info(f"Removed role <rid: {role.id}> from absent lion <uid: {self.userid}> in <gid: {self.guildid}>")
diff --git a/src/modules/rolemenus/cog.py b/src/modules/rolemenus/cog.py
index a95c18d2..051cfb32 100644
--- a/src/modules/rolemenus/cog.py
+++ b/src/modules/rolemenus/cog.py
@@ -308,7 +308,7 @@ class RoleMenuCog(LionCog):
         If the bot is no longer in the server, ignores the expiry.
         If the member is no longer in the server, removes the role from persisted roles, if applicable.
         """
-        logger.info(f"Expiring RoleMenu equipped role {equipid}")
+        logger.debug(f"Expiring RoleMenu equipped role {equipid}")
         rows = await self.data.RoleMenuHistory.fetch_expiring_where(equipid=equipid)
         if rows:
             equip_row = rows[0]
@@ -319,8 +319,22 @@ class RoleMenuCog(LionCog):
                 if role is not None:
                     lion = await self.bot.core.lions.fetch_member(guild.id, equip_row.userid)
                     await lion.remove_role(role)
+                    if (member := lion.member):
+                        if role in member.roles:
+                            logger.error(f"Expired {equipid}, but the member still has the role!")
+                        else:
+                            logger.info(f"Expired {equipid}, and successfully removed the role from the member!")
+                    else:
+                        logger.info(
+                            f"Expired {equipid} for non-existent member {equip_row.userid}. "
+                            "Removed from persistent roles."
+                        )
+                else:
+                    logger.info(f"Could not expire {equipid} because the role was not found.")
                 now = utc_now()
                 await equip_row.update(removed_at=now)
+            else:
+                logger.info(f"Could not expire {equipid} because the guild was not found.")
         else:
             # equipid is no longer valid or is not expiring
             logger.info(f"RoleMenu equipped role {equipid} is no longer valid or is not expiring.")
@@ -351,7 +365,7 @@ class RoleMenuCog(LionCog):
                     error = t(_p(
                         'parse:message_link|suberror:no_perms',
                         "Insufficient permissions! I need the `MESSAGE_HISTORY` permission in {channel}."
-                    )).format(channel=channel.menion)
+                    )).format(channel=channel.mention)
             else:
                 error = t(_p(
                     'parse:message_link|suberror:channel_dne',