From a7fcbc4daba057c88921f53fd79eed1e27943a68 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:08:57 -0400
Subject: [PATCH 01/22] feat(aurora): implemented removerole command

---
 aurora/aurora.py | 123 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 119 insertions(+), 4 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 5d8ead0..758d549 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,7 +18,8 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -27,10 +28,18 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, log, send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -396,6 +405,112 @@ class Aurora(commands.Cog):
         case = await fetch_case(moderation_id, interaction.guild.id)
         await send_evidenceformat(interaction, case)
 
+    @app_commands.command(name="removerole")
+    async def removerole(
+        self,
+        interaction: discord.Interaction,
+        target: discord.Member,
+        role: discord.Role,
+        reason: str,
+        duration: str = None,
+        silent: bool = None,
+    ):
+        """Add a role to a user.
+
+        Parameters
+        -----------
+        target: discord.Member
+            Who are you removing a role from?
+        role: discord.Role
+            What role are you removing from the target?
+        reason: str
+            Why are you removing a role from this user?
+        duration: str
+            How long are you removing this role for?
+        silent: bool
+            Should the user be messaged?"""
+        addrole_whitelist = await config.guild(interaction.guild).addrole_whitelist()
+
+        if not addrole_whitelist:
+            await interaction.response.send_message(
+                content=error("There are no whitelisted roles set for this server!"),
+                ephemeral=True,
+            )
+            return
+
+        if duration is not None:
+            parsed_time = parse_timedelta(duration)
+            if parsed_time is None:
+                await interaction.response.send_message(
+                    content=error("Please provide a valid duration!"), ephemeral=True
+                )
+                return
+        else:
+            parsed_time = "NULL"
+
+        if role.id not in addrole_whitelist:
+            await interaction.response.send_message(
+                content=error("That role isn't whitelisted!"), ephemeral=True
+            )
+            return
+
+        if not await check_moddable(
+            target, interaction, ["moderate_members", "manage_roles"]
+        ):
+            return
+
+        if role.id not in [user_role.id for user_role in target.roles]:
+            await interaction.response.send_message(
+                content=error(f"{target.mention} does not have this role!"),
+                ephemeral=True,
+            )
+            return
+
+        await interaction.response.defer()
+        if silent is None:
+            silent = not await config.guild(interaction.guild).dm_users()
+        if silent is False:
+            try:
+                embed = await message_factory(
+                    await self.bot.get_embed_color(interaction.channel),
+                    guild=interaction.guild,
+                    moderator=interaction.user,
+                    reason=reason,
+                    moderation_type="addrole",
+                    response=await interaction.original_response(),
+                    duration=parsed_time,
+                    role=role,
+                )
+                await target.send(embed=embed)
+            except discord.errors.HTTPException:
+                pass
+
+        await target.add_roles(
+            role,
+            reason=f"Role removed by {interaction.user.id}{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')} for: {reason}",
+        )
+        response: discord.WebhookMessage = await interaction.followup.send(
+            content=f"{target.mention} has had the {role.mention} role removed{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}!\n**Reason** - `{reason}`"
+        )
+
+        moderation_id = await mysql_log(
+            interaction.guild.id,
+            interaction.user.id,
+            "REMOVEROLE",
+            "USER",
+            target.id,
+            role.id,
+            parsed_time,
+            reason,
+        )
+        await response.edit(
+            content=f"{target.mention} has had the {role.mention} role removed{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
+        )
+        await log(interaction, moderation_id)
+
+        case = await fetch_case(moderation_id, interaction.guild.id)
+        await send_evidenceformat(interaction, case)
+
     @app_commands.command(name="mute")
     async def mute(
         self,

From b8a4d247f876016a641c349c8ad22babd8ecfb12 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:09:23 -0400
Subject: [PATCH 02/22] fix(aurora): fixed a bug in /case with exports to
 codeblocks being improperly formatted

---
 aurora/aurora.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 758d549..42804a7 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1421,7 +1421,7 @@ class Aurora(commands.Cog):
                         os.remove(filename)
                         return
                     await interaction.response.send_message(
-                        content=box({json.dumps(case_dict, indent=2)}),
+                        content=box(json.dumps(case_dict, indent=2), 'json'),
                         ephemeral=ephemeral,
                     )
                     return

From f6b827c64fce78cc0f623e81f74ea7091687b734 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:09:48 -0400
Subject: [PATCH 03/22] feat(aurora): added expiry handling for addrole and
 removerole

---
 aurora/aurora.py | 48 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 42804a7..144b2a8 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1670,12 +1670,9 @@ class Aurora(commands.Cog):
                             e,
                         )
 
-                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0 AND moderation_type != 'BLACKLIST') OR (expired = 0 AND resolved = 1  AND moderation_type != 'BLACKLIST')"
-                cursor.execute(expiry_query, (time.time(),))
-
-                blacklist_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'BLACKLIST' AND expired = 0"
+                addrole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'ADDROLE' AND expired = 0"
                 try:
-                    cursor.execute(blacklist_query, (time.time(),))
+                    cursor.execute(addrole_query, (time.time(),))
                     result = cursor.fetchall()
                 except sqlite3.OperationalError:
                     continue
@@ -1687,11 +1684,15 @@ class Aurora(commands.Cog):
                     target_ids, moderation_ids, role_ids
                 ):
                     try:
-                        # member: discord.Member = await guild.fetch_member(target_id)
+                        member = await guild.fetch_member(target_id)
 
-                        role: discord.Role = guild.get_role(role_id)
+                        role = guild.get_role(role_id)
                         if role is None:
                             raise discord.errors.NotFound
+
+                        await member.remove_roles(
+                            role, reason=f"Automatic role removal from case #{moderation_id}"
+                        )
                     except (
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
@@ -1699,6 +1700,39 @@ class Aurora(commands.Cog):
                     ):
                         continue
 
+                removerole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'REMOVEROLE' AND expired = 0"
+                try:
+                    cursor.execute(removerole_query, (time.time(),))
+                    result = cursor.fetchall()
+                except sqlite3.OperationalError:
+                    continue
+                target_ids = [row[0] for row in result]
+                moderation_ids = [row[1] for row in result]
+                role_ids = [row[2] for row in result]
+
+                for target_id, moderation_id, role_id in zip(
+                    target_ids, moderation_ids, role_ids
+                ):
+                    try:
+                        member = await guild.fetch_member(target_id)
+
+                        role = guild.get_role(role_id)
+                        if role is None:
+                            raise discord.errors.NotFound
+
+                        await member.add_roles(
+                            role, reason=f"Automatic role addition from case #{moderation_id}"
+                        )
+                    except (
+                        discord.errors.NotFound,
+                        discord.errors.Forbidden,
+                        discord.errors.HTTPException,
+                    ):
+                        continue
+
+                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1"
+                cursor.execute(expiry_query, (time.time(),))
+
                 per_guild_completion_time = (time.time() - time_per_guild) * 1000
                 logger.debug(
                     "Completed expiry loop for %s (%s) in %sms with %s users unbanned",

From ebf739b563530d30e2d08f8f134cef410f962217 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:10:26 -0400
Subject: [PATCH 04/22] feat(aurora): added a listener to readd roles to a user
 on guild join

---
 aurora/aurora.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 144b2a8..c890109 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -122,6 +122,20 @@ class Aurora(commands.Cog):
             except ConnectionRefusedError:
                 return
 
+    @commands.Cog.listener("on_member_join")
+    async def addrole_on_member_join(self, member: discord.Member):
+        """This method automatically adds roles to users when they join the server."""
+        if not await self.bot.cog_disabled_in_guild(self, member.guild):
+            query = f"""SELECT moderation_id, role_id, reason FROM moderation_{member.guild.id} WHERE target_id = ? AND action = 'ADDROLE' AND expired = 0 AND resolved = 0;"""
+            database = connect()
+            cursor = database.cursor()
+            cursor.execute(query, (member.id,))
+            results = cursor.fetchall()
+            for result in results:
+                role = member.guild.get_role(result[1])
+                reason = result[2]
+                await member.add_roles(role, reason=f"Role automatically added on member rejoin for: {reason} (Case #{result[0]:,})")
+
     @commands.Cog.listener("on_audit_log_entry_create")
     async def autologger(self, entry: discord.AuditLogEntry):
         """This method automatically logs moderations done by users manually ("right clicks")."""

From 0642d5eb42189665c86146c13d5e057f9bc9d602 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:18:29 -0400
Subject: [PATCH 05/22] fix(aurora): fixed a bug in addrole and removerole with
 string concatenation

---
 aurora/aurora.py | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index c890109..532fea8 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,8 +18,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -28,18 +27,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, log, send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -395,10 +386,10 @@ class Aurora(commands.Cog):
 
         await target.add_roles(
             role,
-            reason=f"Role added by {interaction.user.id}{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')} for: {reason}",
+            reason=f"Role added by {interaction.user.id}{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''} for: {reason}",
         )
         response: discord.WebhookMessage = await interaction.followup.send(
-            content=f"{target.mention} has been given the {role.mention} role{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has been given the {role.mention} role{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
         )
 
         moderation_id = await mysql_log(
@@ -412,7 +403,7 @@ class Aurora(commands.Cog):
             reason,
         )
         await response.edit(
-            content=f"{target.mention} has been given the {role.mention} role{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
+            content=f"{target.mention} has been given the {role.mention} role{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
         )
         await log(interaction, moderation_id)
 
@@ -501,10 +492,10 @@ class Aurora(commands.Cog):
 
         await target.add_roles(
             role,
-            reason=f"Role removed by {interaction.user.id}{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')} for: {reason}",
+            reason=f"Role removed by {interaction.user.id}{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''} for: {reason}",
         )
         response: discord.WebhookMessage = await interaction.followup.send(
-            content=f"{target.mention} has had the {role.mention} role removed{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has had the {role.mention} role removed{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
         )
 
         moderation_id = await mysql_log(
@@ -518,7 +509,7 @@ class Aurora(commands.Cog):
             reason,
         )
         await response.edit(
-            content=f"{target.mention} has had the {role.mention} role removed{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
+            content=f"{target.mention} has had the {role.mention} role removed{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
         )
         await log(interaction, moderation_id)
 

From 752a41855ae4203c7f118061de38736fce22e005 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:21:30 -0400
Subject: [PATCH 06/22] fix(aurora): actually fixed the string concatenation
 bug

---
 aurora/aurora.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 532fea8..25c5cd4 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,7 +18,8 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -27,10 +28,18 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, log, send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -386,10 +395,10 @@ class Aurora(commands.Cog):
 
         await target.add_roles(
             role,
-            reason=f"Role added by {interaction.user.id}{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''} for: {reason}",
+            reason=f"Role added by {interaction.user.id}{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''} for: {reason}",
         )
         response: discord.WebhookMessage = await interaction.followup.send(
-            content=f"{target.mention} has been given the {role.mention} role{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has been given the {role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
         )
 
         moderation_id = await mysql_log(
@@ -403,7 +412,7 @@ class Aurora(commands.Cog):
             reason,
         )
         await response.edit(
-            content=f"{target.mention} has been given the {role.mention} role{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
+            content=f"{target.mention} has been given the {role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
         )
         await log(interaction, moderation_id)
 
@@ -492,10 +501,10 @@ class Aurora(commands.Cog):
 
         await target.add_roles(
             role,
-            reason=f"Role removed by {interaction.user.id}{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''} for: {reason}",
+            reason=f"Role removed by {interaction.user.id}{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''} for: {reason}",
         )
         response: discord.WebhookMessage = await interaction.followup.send(
-            content=f"{target.mention} has had the {role.mention} role removed{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has had the {role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
         )
 
         moderation_id = await mysql_log(
@@ -509,7 +518,7 @@ class Aurora(commands.Cog):
             reason,
         )
         await response.edit(
-            content=f"{target.mention} has had the {role.mention} role removed{' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
+            content=f"{target.mention} has had the {role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
         )
         await log(interaction, moderation_id)
 

From 6966ea161390563d0cf6e9f2bba69e983da55a48 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:24:16 -0400
Subject: [PATCH 07/22] fix(aurora): added a missing `)` in an sql query

---
 aurora/aurora.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 25c5cd4..4101a2b 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,8 +18,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -28,18 +27,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, log, send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -1744,7 +1735,7 @@ class Aurora(commands.Cog):
                     ):
                         continue
 
-                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1"
+                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1)"
                 cursor.execute(expiry_query, (time.time(),))
 
                 per_guild_completion_time = (time.time() - time_per_guild) * 1000

From 8e59b5a4bdfd16499d35e5d55703ad1e9b0fa8dd Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:25:42 -0400
Subject: [PATCH 08/22] fix(aurora): added a missing `;` to an sql statement

---
 aurora/aurora.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 4101a2b..446c9a6 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,7 +18,8 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -27,10 +28,18 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, log, send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -1735,7 +1744,7 @@ class Aurora(commands.Cog):
                     ):
                         continue
 
-                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1)"
+                expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1);"
                 cursor.execute(expiry_query, (time.time(),))
 
                 per_guild_completion_time = (time.time() - time_per_guild) * 1000

From f9e807957f6ef211f36cf1254b915dc16e3a0803 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:28:26 -0400
Subject: [PATCH 09/22] fix(aurora): why was I trying to raise an exception????

---
 aurora/aurora.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 446c9a6..64987a6 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1702,7 +1702,7 @@ class Aurora(commands.Cog):
 
                         role = guild.get_role(role_id)
                         if role is None:
-                            raise discord.errors.NotFound
+                            continue
 
                         await member.remove_roles(
                             role, reason=f"Automatic role removal from case #{moderation_id}"
@@ -1732,7 +1732,7 @@ class Aurora(commands.Cog):
 
                         role = guild.get_role(role_id)
                         if role is None:
-                            raise discord.errors.NotFound
+                            continue
 
                         await member.add_roles(
                             role, reason=f"Automatic role addition from case #{moderation_id}"

From dc8138bd89a7f3981370a98f7a36a795f0048deb Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:32:02 -0400
Subject: [PATCH 10/22] fix(aurora): added warning logging to the expiry task

---
 aurora/aurora.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 64987a6..b767ff7 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -18,8 +18,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -28,18 +27,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, log, send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -1702,6 +1693,7 @@ class Aurora(commands.Cog):
 
                         role = guild.get_role(role_id)
                         if role is None:
+                            logger.warning("Role %s does not exist in %s, unable to remove role from user %s", role_id, guild.id, target_id)
                             continue
 
                         await member.remove_roles(
@@ -1732,6 +1724,7 @@ class Aurora(commands.Cog):
 
                         role = guild.get_role(role_id)
                         if role is None:
+                            logger.warning("Role %s does not exist in %s, unable to add role to user %s", role_id, guild.id, target_id)
                             continue
 
                         await member.add_roles(

From 67142c64589739024716c7d00c14652fbd9770b1 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:37:01 -0400
Subject: [PATCH 11/22] fix(aurora): added more verbose debug logging to the
 expiry task

---
 aurora/aurora.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index b767ff7..73bbf62 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1628,7 +1628,7 @@ class Aurora(commands.Cog):
                 target_ids = [row[0] for row in result]
                 moderation_ids = [row[1] for row in result]
 
-                num = 0
+                unban_num = 0
                 for target_id, moderation_id in zip(target_ids, moderation_ids):
                     user: discord.User = await self.bot.fetch_user(target_id)
                     name = (
@@ -1660,7 +1660,7 @@ class Aurora(commands.Cog):
                             guild.name,
                             guild.id,
                         )
-                        num = num + 1
+                        unban_num = unban_num + 1
                     except (
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
@@ -1675,6 +1675,7 @@ class Aurora(commands.Cog):
                             e,
                         )
 
+                removerole_num = 0
                 addrole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'ADDROLE' AND expired = 0"
                 try:
                     cursor.execute(addrole_query, (time.time(),))
@@ -1699,6 +1700,8 @@ class Aurora(commands.Cog):
                         await member.remove_roles(
                             role, reason=f"Automatic role removal from case #{moderation_id}"
                         )
+
+                        removerole_num = removerole_num + 1
                     except (
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
@@ -1706,6 +1709,7 @@ class Aurora(commands.Cog):
                     ):
                         continue
 
+                addrole_num = 0
                 removerole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'REMOVEROLE' AND expired = 0"
                 try:
                     cursor.execute(removerole_query, (time.time(),))
@@ -1730,6 +1734,8 @@ class Aurora(commands.Cog):
                         await member.add_roles(
                             role, reason=f"Automatic role addition from case #{moderation_id}"
                         )
+
+                        addrole_num = addrole_num + 1
                     except (
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
@@ -1742,13 +1748,15 @@ class Aurora(commands.Cog):
 
                 per_guild_completion_time = (time.time() - time_per_guild) * 1000
                 logger.debug(
-                    "Completed expiry loop for %s (%s) in %sms with %s users unbanned",
+                    "Completed expiry loop for %s (%s) in %sms with %s users unbanned, %s roles added, and %s roles removed",
                     guild.name,
                     guild.id,
                     f"{per_guild_completion_time:.6f}",
-                    num,
+                    unban_num,
+                    addrole_num,
+                    removerole_num,
                 )
-                global_num = global_num + num
+                global_num = global_num + unban_num + addrole_num + removerole_num
 
         database.commit()
         cursor.close()
@@ -1756,7 +1764,7 @@ class Aurora(commands.Cog):
 
         completion_time = (time.time() - current_time) * 1000
         logger.debug(
-            "Completed expiry loop in %sms with %s users unbanned",
+            "Completed expiry loop in %sms with %s users unbanned, %s roles added, and %s roles removed",
             f"{completion_time:.6f}",
             global_num,
         )

From 1a74ce9130bfbc3908cd34f5d87fb1f927c54afc Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:38:07 -0400
Subject: [PATCH 12/22] fix(aurora): fixed a broken logging statement

---
 aurora/aurora.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 73bbf62..6a79224 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1610,7 +1610,9 @@ class Aurora(commands.Cog):
         current_time = time.time()
         database = connect()
         cursor = database.cursor()
-        global_num = 0
+        global_unban_num = 0
+        global_addrole_num = 0
+        global_removerole_num = 0
 
         guilds: list[discord.Guild] = self.bot.guilds
         for guild in guilds:
@@ -1756,7 +1758,9 @@ class Aurora(commands.Cog):
                     addrole_num,
                     removerole_num,
                 )
-                global_num = global_num + unban_num + addrole_num + removerole_num
+                global_unban_num = global_unban_num + unban_num
+                global_addrole_num = global_addrole_num + addrole_num
+                global_removerole_num = global_removerole_num + removerole_num
 
         database.commit()
         cursor.close()
@@ -1766,7 +1770,9 @@ class Aurora(commands.Cog):
         logger.debug(
             "Completed expiry loop in %sms with %s users unbanned, %s roles added, and %s roles removed",
             f"{completion_time:.6f}",
-            global_num,
+            global_unban_num,
+            global_addrole_num,
+            global_removerole_num,
         )
 
     ########################################################################################################################

From bcef643349bf3ba71c1689021598cb296f5aedf6 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:44:04 -0400
Subject: [PATCH 13/22] fix(aurora): fixed an incorrectly named column in
 on_member_join

---
 aurora/aurora.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 6a79224..e42f394 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -117,7 +117,7 @@ class Aurora(commands.Cog):
     async def addrole_on_member_join(self, member: discord.Member):
         """This method automatically adds roles to users when they join the server."""
         if not await self.bot.cog_disabled_in_guild(self, member.guild):
-            query = f"""SELECT moderation_id, role_id, reason FROM moderation_{member.guild.id} WHERE target_id = ? AND action = 'ADDROLE' AND expired = 0 AND resolved = 0;"""
+            query = f"""SELECT moderation_id, role_id, reason FROM moderation_{member.guild.id} WHERE target_id = ? AND moderation_type = 'ADDROLE' AND expired = 0 AND resolved = 0;"""
             database = connect()
             cursor = database.cursor()
             cursor.execute(query, (member.id,))

From 877f5e00d30264adde59afcf308b52394ca9a662 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:47:19 -0400
Subject: [PATCH 14/22] fix(aurora): adding some more logging to the expiry
 task

---
 aurora/aurora.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index e42f394..3d7d3da 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -1694,13 +1694,8 @@ class Aurora(commands.Cog):
                     try:
                         member = await guild.fetch_member(target_id)
 
-                        role = guild.get_role(role_id)
-                        if role is None:
-                            logger.warning("Role %s does not exist in %s, unable to remove role from user %s", role_id, guild.id, target_id)
-                            continue
-
                         await member.remove_roles(
-                            role, reason=f"Automatic role removal from case #{moderation_id}"
+                            role_id, reason=f"Automatic role removal from case #{moderation_id}"
                         )
 
                         removerole_num = removerole_num + 1
@@ -1708,7 +1703,13 @@ class Aurora(commands.Cog):
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
                         discord.errors.HTTPException,
-                    ):
+                    ) as e:
+                        logger.error(
+                            "Removing the role %s from user %s failed due to: \n%s",
+                            role_id,
+                            target_id,
+                            e,
+                        )
                         continue
 
                 addrole_num = 0
@@ -1728,13 +1729,8 @@ class Aurora(commands.Cog):
                     try:
                         member = await guild.fetch_member(target_id)
 
-                        role = guild.get_role(role_id)
-                        if role is None:
-                            logger.warning("Role %s does not exist in %s, unable to add role to user %s", role_id, guild.id, target_id)
-                            continue
-
                         await member.add_roles(
-                            role, reason=f"Automatic role addition from case #{moderation_id}"
+                            role_id, reason=f"Automatic role addition from case #{moderation_id}"
                         )
 
                         addrole_num = addrole_num + 1
@@ -1742,7 +1738,8 @@ class Aurora(commands.Cog):
                         discord.errors.NotFound,
                         discord.errors.Forbidden,
                         discord.errors.HTTPException,
-                    ):
+                    ) as e:
+                        logger.error("Adding the role %s to user %s failed due to: \n%s", role_id, target_id, e)
                         continue
 
                 expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1);"

From 7ef13016d95c922a1e6681e96f3cd0919bfc79f0 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:51:02 -0400
Subject: [PATCH 15/22] fix(aurora): fixed an AttributeError in the expiry
 handler

---
 aurora/aurora.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 3d7d3da..c113b42 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -13,12 +13,14 @@ from datetime import datetime, timedelta, timezone
 from math import ceil
 
 import discord
+from discord import Object
 from discord.ext import tasks
 from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -27,10 +29,18 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, log, send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -1695,7 +1705,7 @@ class Aurora(commands.Cog):
                         member = await guild.fetch_member(target_id)
 
                         await member.remove_roles(
-                            role_id, reason=f"Automatic role removal from case #{moderation_id}"
+                            roles=[Object(role_id)], reason=f"Automatic role removal from case #{moderation_id}"
                         )
 
                         removerole_num = removerole_num + 1
@@ -1730,7 +1740,7 @@ class Aurora(commands.Cog):
                         member = await guild.fetch_member(target_id)
 
                         await member.add_roles(
-                            role_id, reason=f"Automatic role addition from case #{moderation_id}"
+                            roles=[Object(role_id)], reason=f"Automatic role addition from case #{moderation_id}"
                         )
 
                         addrole_num = addrole_num + 1

From 908fed37bcc838a5e90ccf8403a49083f16fb981 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:52:29 -0400
Subject: [PATCH 16/22] fix(aurora): fixed a TypeError in the expiry handler
 task

---
 aurora/aurora.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index c113b42..8bfef83 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -19,8 +19,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -29,18 +28,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, log, send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -1705,7 +1696,7 @@ class Aurora(commands.Cog):
                         member = await guild.fetch_member(target_id)
 
                         await member.remove_roles(
-                            roles=[Object(role_id)], reason=f"Automatic role removal from case #{moderation_id}"
+                            Object(role_id), reason=f"Automatic role removal from case #{moderation_id}"
                         )
 
                         removerole_num = removerole_num + 1
@@ -1740,7 +1731,7 @@ class Aurora(commands.Cog):
                         member = await guild.fetch_member(target_id)
 
                         await member.add_roles(
-                            roles=[Object(role_id)], reason=f"Automatic role addition from case #{moderation_id}"
+                            Object(role_id), reason=f"Automatic role addition from case #{moderation_id}"
                         )
 
                         addrole_num = addrole_num + 1

From cd514d05354818fd9a892f69d593944058a17658 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 20:56:07 -0400
Subject: [PATCH 17/22] fix(aurora): fixed removerole adding roles instead of
 removing them

---
 aurora/aurora.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 8bfef83..324b32a 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -19,7 +19,8 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -28,10 +29,18 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, log, send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -421,7 +430,7 @@ class Aurora(commands.Cog):
         duration: str = None,
         silent: bool = None,
     ):
-        """Add a role to a user.
+        """Remove a role from a user.
 
         Parameters
         -----------
@@ -491,7 +500,7 @@ class Aurora(commands.Cog):
             except discord.errors.HTTPException:
                 pass
 
-        await target.add_roles(
+        await target.remove_roles(
             role,
             reason=f"Role removed by {interaction.user.id}{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''} for: {reason}",
         )

From 38b0580228f8531c969100b0faa46d64ba67d46f Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 21:01:11 -0400
Subject: [PATCH 18/22] fix(aurora): updated message_factory for addrole
 support

---
 aurora/utilities/factory.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/aurora/utilities/factory.py b/aurora/utilities/factory.py
index 3cfaf9e..86aee24 100644
--- a/aurora/utilities/factory.py
+++ b/aurora/utilities/factory.py
@@ -2,16 +2,12 @@
 from datetime import datetime, timedelta
 from typing import Union
 
-from discord import (Color, Embed, Guild, Interaction, InteractionMessage,
-                     Member, Role, User)
+from discord import Color, Embed, Guild, Interaction, InteractionMessage, Member, Role, User
 from redbot.core import commands
-from redbot.core.utils.chat_formatting import (bold, box, error,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import bold, box, error, humanize_timedelta, warning
 
 from aurora.utilities.config import config
-from aurora.utilities.utils import (fetch_channel_dict, fetch_user_dict,
-                                    get_bool_emoji, get_next_case_number,
-                                    get_pagesize_str)
+from aurora.utilities.utils import fetch_channel_dict, fetch_user_dict, get_bool_emoji, get_next_case_number, get_pagesize_str
 
 
 async def message_factory(
@@ -50,6 +46,8 @@ async def message_factory(
     else:
         guild_name = guild.name
 
+    title = moderation_type
+
     if moderation_type in ["tempbanned", "muted"] and duration:
         embed_duration = f" for {humanize_timedelta(timedelta=duration)}"
     else:
@@ -59,13 +57,17 @@ async def message_factory(
         embed_desc = "received a"
     elif moderation_type == "addrole":
         embed_desc = f"received the {role.name} role"
+        title = "Role Added"
+        moderation_type = ""
     elif moderation_type == "removerole":
         embed_desc = f"lost the {role.name} role"
+        title = "Role Removed"
+        moderation_type = ""
     else:
         embed_desc = "been"
 
     embed = Embed(
-        title=str.title(moderation_type),
+        title=str.title(title),
         description=f"You have {embed_desc} {moderation_type}{embed_duration} in {guild_name}.",
         color=color,
         timestamp=datetime.now(),

From a641b11daab74dcdfeefd132d82bb18b4858f968 Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 21:02:16 -0400
Subject: [PATCH 19/22] fix(aurora): fixed the incorrect moderation type being
 passed to message_factory in /removerole

---
 aurora/aurora.py | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 324b32a..065bafe 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -19,8 +19,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -29,18 +28,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, log, send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -491,7 +482,7 @@ class Aurora(commands.Cog):
                     guild=interaction.guild,
                     moderator=interaction.user,
                     reason=reason,
-                    moderation_type="addrole",
+                    moderation_type="removerole",
                     response=await interaction.original_response(),
                     duration=parsed_time,
                     role=role,

From af108519f99792061ad93ac6f6c7c1d1a815206d Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 21:35:29 -0400
Subject: [PATCH 20/22] feat(aurora): imma be real chief i have no idea what i
 did this commit

---
 aurora/aurora.py            |  39 +++++++++++++++++++++++-------------
 aurora/data/arrow.png       | Bin 0 -> 6319 bytes
 aurora/utilities/factory.py |  12 +++++++----
 aurora/utilities/utils.py   |   9 +++++++--
 4 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 aurora/data/arrow.png

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 065bafe..89664c0 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -19,7 +19,8 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (box, error, humanize_list,
+                                               humanize_timedelta, warning)
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -28,10 +29,19 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
-from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
+from aurora.utilities.database import (connect, create_guild_table, fetch_case,
+                                       mysql_log)
+from aurora.utilities.factory import (addrole_embed, case_factory,
+                                      changes_factory, evidenceformat_factory,
+                                      guild_embed, immune_embed,
+                                      message_factory, overrides_embed)
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
+from aurora.utilities.utils import (check_moddable, check_permissions,
+                                    convert_timedelta_to_str,
+                                    fetch_channel_dict, fetch_user_dict,
+                                    generate_dict, get_footer_image, log,
+                                    send_evidenceformat,
+                                    timedelta_from_relativedelta)
 
 
 class Aurora(commands.Cog):
@@ -224,7 +234,7 @@ class Aurora(commands.Cog):
                     moderation_type="note",
                     response=await interaction.original_response(),
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -283,7 +293,7 @@ class Aurora(commands.Cog):
                     moderation_type="warned",
                     response=await interaction.original_response(),
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -381,7 +391,7 @@ class Aurora(commands.Cog):
                     duration=parsed_time,
                     role=role,
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -487,7 +497,7 @@ class Aurora(commands.Cog):
                     duration=parsed_time,
                     role=role,
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -583,7 +593,7 @@ class Aurora(commands.Cog):
                     response=await interaction.original_response(),
                     duration=parsed_time,
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -658,7 +668,7 @@ class Aurora(commands.Cog):
                     moderation_type="unmuted",
                     response=await interaction.original_response(),
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -717,7 +727,7 @@ class Aurora(commands.Cog):
                     moderation_type="kicked",
                     response=await interaction.original_response(),
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -821,7 +831,7 @@ class Aurora(commands.Cog):
                     response=await interaction.original_response(),
                     duration=parsed_time,
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -865,7 +875,7 @@ class Aurora(commands.Cog):
                         moderation_type="banned",
                         response=await interaction.original_response(),
                     )
-                    await target.send(embed=embed)
+                    await target.send(embed=embed, file=get_footer_image(self))
                 except discord.errors.HTTPException:
                     pass
 
@@ -948,7 +958,7 @@ class Aurora(commands.Cog):
                     moderation_type="unbanned",
                     response=await interaction.original_response(),
                 )
-                await target.send(embed=embed)
+                await target.send(embed=embed, file=get_footer_image(self))
             except discord.errors.HTTPException:
                 pass
 
@@ -1646,6 +1656,7 @@ class Aurora(commands.Cog):
 
                         embed = await message_factory(
                             await self.bot.get_embed_color(guild.channels[0]),
+                            file=get_footer_image(self),
                             guild=guild,
                             reason=f"Automatic unban from case #{moderation_id}",
                             moderation_type="unbanned",
diff --git a/aurora/data/arrow.png b/aurora/data/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..aedf12e53c700e75179027e0f7eca965547166d9
GIT binary patch
literal 6319
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

literal 0
HcmV?d00001

diff --git a/aurora/utilities/factory.py b/aurora/utilities/factory.py
index 86aee24..af827e8 100644
--- a/aurora/utilities/factory.py
+++ b/aurora/utilities/factory.py
@@ -2,12 +2,16 @@
 from datetime import datetime, timedelta
 from typing import Union
 
-from discord import Color, Embed, Guild, Interaction, InteractionMessage, Member, Role, User
+from discord import (Color, Embed, Guild, Interaction, InteractionMessage,
+                     Member, Role, User)
 from redbot.core import commands
-from redbot.core.utils.chat_formatting import bold, box, error, humanize_timedelta, warning
+from redbot.core.utils.chat_formatting import (bold, box, error,
+                                               humanize_timedelta, warning)
 
 from aurora.utilities.config import config
-from aurora.utilities.utils import fetch_channel_dict, fetch_user_dict, get_bool_emoji, get_next_case_number, get_pagesize_str
+from aurora.utilities.utils import (fetch_channel_dict, fetch_user_dict,
+                                    get_bool_emoji, get_next_case_number,
+                                    get_pagesize_str)
 
 
 async def message_factory(
@@ -87,7 +91,7 @@ async def message_factory(
 
     embed.set_footer(
         text=f"Case #{await get_next_case_number(guild.id):,}",
-        icon_url="https://cdn.discordapp.com/attachments/1070822161389994054/1159469476773904414/arrow-right-circle-icon-512x512-2p1e2aaw.png?ex=65312319&is=651eae19&hm=3cebdd28e805c13a79ec48ef87c32ca532ffa6b9ede2e48d0cf8e5e81f3a6818&",
+        icon_url="attachment://arrow.png",
     )
 
     return embed
diff --git a/aurora/utilities/utils.py b/aurora/utilities/utils.py
index 616fa78..1ff21fa 100644
--- a/aurora/utilities/utils.py
+++ b/aurora/utilities/utils.py
@@ -5,9 +5,9 @@ from datetime import timedelta as td
 from typing import Optional, Union
 
 from dateutil.relativedelta import relativedelta as rd
-from discord import Guild, Interaction, Member, SelectOption, User
+from discord import File, Guild, Interaction, Member, SelectOption, User
 from discord.errors import Forbidden, NotFound
-from redbot.core import commands
+from redbot.core import commands, data_manager
 from redbot.core.utils.chat_formatting import error
 
 from .config import config
@@ -291,3 +291,8 @@ def timedelta_from_relativedelta(relativedelta: rd) -> td:
     now = datetime.now()
     then = now - relativedelta
     return now - then
+
+def get_footer_image(coginstance: commands.Cog) -> File:
+    """Returns the footer image for the embeds."""
+    image_path = data_manager.bundled_data_path(coginstance) / "arrow.png"
+    return File(image_path, filename="arrow.png", description="arrow")

From 1d1795c26224806dfe97ae4f525661e59c88d18b Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 21:42:02 -0400
Subject: [PATCH 21/22] fix(aurora): added addrole/removerole support to
 case_factory

---
 aurora/utilities/factory.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/aurora/utilities/factory.py b/aurora/utilities/factory.py
index af827e8..d7f4eb7 100644
--- a/aurora/utilities/factory.py
+++ b/aurora/utilities/factory.py
@@ -2,16 +2,12 @@
 from datetime import datetime, timedelta
 from typing import Union
 
-from discord import (Color, Embed, Guild, Interaction, InteractionMessage,
-                     Member, Role, User)
+from discord import Color, Embed, Guild, Interaction, InteractionMessage, Member, Role, User
 from redbot.core import commands
-from redbot.core.utils.chat_formatting import (bold, box, error,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import bold, box, error, humanize_timedelta, warning
 
 from aurora.utilities.config import config
-from aurora.utilities.utils import (fetch_channel_dict, fetch_user_dict,
-                                    get_bool_emoji, get_next_case_number,
-                                    get_pagesize_str)
+from aurora.utilities.utils import fetch_channel_dict, fetch_user_dict, get_bool_emoji, get_next_case_number, get_pagesize_str
 
 
 async def message_factory(
@@ -273,6 +269,9 @@ async def case_factory(interaction: Interaction, case_dict: dict) -> Embed:
         else "\n**Changes:** 0"
     )
 
+    if case_dict["role_id"]:
+        embed.description += f"\n**Role:** <@&{case_dict['role_id']}>"
+
     if case_dict["metadata"]:
         if case_dict["metadata"]["imported_from"]:
             embed.description += (

From 6c859d72a8c7d5604ab618449c3b3a1ea792493c Mon Sep 17 00:00:00 2001
From: SeaswimmerTheFsh <seaswimmerthefsh@gmail.com>
Date: Fri, 3 May 2024 21:45:04 -0400
Subject: [PATCH 22/22] fix(aurora): pylint fix

---
 aurora/aurora.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 89664c0..bff9976 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -19,8 +19,7 @@ from redbot.core import app_commands, commands, data_manager
 from redbot.core.app_commands import Choice
 from redbot.core.bot import Red
 from redbot.core.commands.converter import parse_relativedelta, parse_timedelta
-from redbot.core.utils.chat_formatting import (box, error, humanize_list,
-                                               humanize_timedelta, warning)
+from redbot.core.utils.chat_formatting import box, error, humanize_list, humanize_timedelta, warning
 
 from aurora.importers.aurora import ImportAuroraView
 from aurora.importers.galacticbot import ImportGalacticBotView
@@ -29,19 +28,10 @@ from aurora.menus.guild import Guild
 from aurora.menus.immune import Immune
 from aurora.menus.overrides import Overrides
 from aurora.utilities.config import config, register_config
-from aurora.utilities.database import (connect, create_guild_table, fetch_case,
-                                       mysql_log)
-from aurora.utilities.factory import (addrole_embed, case_factory,
-                                      changes_factory, evidenceformat_factory,
-                                      guild_embed, immune_embed,
-                                      message_factory, overrides_embed)
+from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
+from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
 from aurora.utilities.logger import logger
-from aurora.utilities.utils import (check_moddable, check_permissions,
-                                    convert_timedelta_to_str,
-                                    fetch_channel_dict, fetch_user_dict,
-                                    generate_dict, get_footer_image, log,
-                                    send_evidenceformat,
-                                    timedelta_from_relativedelta)
+from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, get_footer_image, log, send_evidenceformat, timedelta_from_relativedelta
 
 
 class Aurora(commands.Cog):
@@ -1656,14 +1646,13 @@ class Aurora(commands.Cog):
 
                         embed = await message_factory(
                             await self.bot.get_embed_color(guild.channels[0]),
-                            file=get_footer_image(self),
                             guild=guild,
                             reason=f"Automatic unban from case #{moderation_id}",
                             moderation_type="unbanned",
                         )
 
                         try:
-                            await user.send(embed=embed)
+                            await user.send(embed=embed, file=get_footer_image(self))
                         except discord.errors.HTTPException:
                             pass