From 6aaef7d3b2e74fbd39c82a1a2d184271b823a10d Mon Sep 17 00:00:00 2001
From: Seaswimmer <seaswimmerthefsh@gmail.com>
Date: Tue, 13 Aug 2024 23:59:36 -0400
Subject: [PATCH] fix(aurora): fixed removerole and addrole being broken if
 used without a duration set

---
 aurora/aurora.py                  | 2 +-
 aurora/models/moderation_types.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aurora/aurora.py b/aurora/aurora.py
index 468c760..6539561 100644
--- a/aurora/aurora.py
+++ b/aurora/aurora.py
@@ -46,7 +46,7 @@ class Aurora(commands.Cog):
     This cog stores all of its data in an SQLite database."""
 
     __author__ = ["Seaswimmer"]
-    __version__ = "3.0.0-indev6"
+    __version__ = "3.0.0-indev7"
     __documentation__ = "https://seacogs.coastalcommits.com/aurora/"
 
     async def red_delete_data_for_user(self, *, requester, user_id: int):
diff --git a/aurora/models/moderation_types.py b/aurora/models/moderation_types.py
index 0adea3d..5bf6341 100644
--- a/aurora/models/moderation_types.py
+++ b/aurora/models/moderation_types.py
@@ -158,7 +158,7 @@ class AddRole(Type):
         return None
 
     @classmethod
-    async def handler(cls, ctx: commands.Context, target: Member, role: Role, silent: bool, duration: str = None, reason: str = None):
+    async def handler(cls, ctx: commands.Context, target: Member, role: Role, silent: bool, duration: str | None = None, reason: str | None = None):
         addrole_whitelist = await config.guild(ctx.guild).addrole_whitelist()
 
         if not addrole_whitelist:
@@ -192,7 +192,7 @@ class AddRole(Type):
             return
 
         response = await ctx.send(
-            content=f"{target.mention} has {cls.embed_desc}{role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has {cls.embed_desc}{role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time else ''}!\n**Reason** - `{reason}`"
         )
 
         if silent is False:
@@ -331,7 +331,7 @@ class RemoveRole(Type):
         return None
 
     @classmethod
-    async def handler(cls, ctx: commands.Context, target: Member, role: Role, silent: bool, duration: str | None = None, reason: str = None):
+    async def handler(cls, ctx: commands.Context, target: Member, role: Role, silent: bool, duration: str | None = None, reason: str | None = None):
         addrole_whitelist = await config.guild(ctx.guild).addrole_whitelist()
 
         if not addrole_whitelist:
@@ -365,7 +365,7 @@ class RemoveRole(Type):
             return
 
         response = await ctx.send(
-            content=f"{target.mention} has {cls.embed_desc}{role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
+            content=f"{target.mention} has {cls.embed_desc}{role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time else ''}!\n**Reason** - `{reason}`"
         )
 
         if silent is False: