?blocked now no longers show blocks that have expired.

Author: fourjr

CHANGELOG.md

@@ -27,6 +27,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 - Mentioned `competing` as an activity type. ([PR #2902](https://github.com/kyb3r/modmail/pull/2902))
 - Level permissions were not checked if command permissions were set.
 - Regex autotriggers were not working if term was in the middle of strings.
+- `?blocked` now no longers show blocks that have expired.
 
 ### Internal
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.7.14-dev5"
+__version__ = "3.7.14-dev6"
 
 
 import asyncio

cogs/modmail.py

@@ -1050,8 +1050,30 @@ async def blocked(self, ctx):
 
         roles = []
         users = []
+        now = ctx.message.created_at
+
+        blocked_users = list(self.bot.blocked_users.items())
+        for id_, reason in blocked_users:
+            # parse "reason" and check if block is expired
+            # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
+            end_time = re.search(r"until ([^`]+?)\.$", reason)
+            if end_time is None:
+                # backwards compat
+                end_time = re.search(r"%([^%]+?)%", reason)
+                if end_time is not None:
+                    logger.warning(
+                        r"Deprecated time message for user %s, block and unblock again to update.",
+                        id_,
+                    )
+
+            if end_time is not None:
+                after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
+                if after <= 0:
+                    # No longer blocked
+                    self.bot.blocked_users.pop(str(id_))
+                    logger.debug("No longer blocked, user %s.", id_)
+                    continue
 
-        for id_, reason in self.bot.blocked_users.items():
             user = self.bot.get_user(int(id_))
             if user:
                 users.append((user.mention, reason))
@@ -1062,7 +1084,28 @@ async def blocked(self, ctx):
                 except discord.NotFound:
                     users.append((id_, reason))
 
-        for id_, reason in self.bot.blocked_roles.items():
+        blocked_roles = list(self.bot.blocked_roles.items())
+        for id_, reason in blocked_roles:
+            # parse "reason" and check if block is expired
+            # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
+            end_time = re.search(r"until ([^`]+?)\.$", reason)
+            if end_time is None:
+                # backwards compat
+                end_time = re.search(r"%([^%]+?)%", reason)
+                if end_time is not None:
+                    logger.warning(
+                        r"Deprecated time message for role %s, block and unblock again to update.",
+                        id_,
+                    )
+
+            if end_time is not None:
+                after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
+                if after <= 0:
+                    # No longer blocked
+                    self.bot.blocked_roles.pop(str(id_))
+                    logger.debug("No longer blocked, role %s.", id_)
+                    continue
+
             role = self.bot.guild.get_role(int(id_))
             if role:
                 roles.append((role.mention, reason))
@@ -1175,7 +1218,7 @@ async def block(
         after: UserFriendlyTime = None,
     ):
         """
-        Block a user from using Modmail.
+        Block a user or role from using Modmail.
 
         You may choose to set a time as to when the user will automatically be unblocked.
 
@@ -1190,9 +1233,9 @@ async def block(
             if thread:
                 user_or_role = thread.recipient
             elif after is None:
-                raise commands.MissingRequiredArgument(SimpleNamespace(name="user"))
+                raise commands.MissingRequiredArgument(SimpleNamespace(name="user or role"))
             else:
-                raise commands.BadArgument(f'User "{after.arg}" not found.')
+                raise commands.BadArgument(f'User or role "{after.arg}" not found.')
 
         mention = getattr(user_or_role, "mention", f"`{user_or_role.id}`")