Use new timestamps for userinfo and fix potential blocked parsing

Author: fourjr

bot.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.0-dev20"
+__version__ = "4.0.0"
 
 
 import asyncio

cogs/modmail.py

@@ -1654,21 +1654,48 @@ async def blocked(self, ctx):
         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:
+            # etc "blah blah blah... until <t:XX:f>."
+            end_time = re.search(r"until <t:(\d+):(?:R|f)>.$", reason)
+            attempts = [
                 # backwards compat
-                end_time = re.search(r"%([^%]+?)%", reason)
+                re.search(r"until ([^`]+?)\.$", reason),
+                re.search(r"%([^%]+?)%", reason),
+            ]
+            if end_time is None:
+                for i in attempts:
+                    if i is not None:
+                        end_time = i
+                        break
+
                 if end_time is not None:
+                    # found a deprecated version
+                    try:
+                        after = (
+                            datetime.fromisoformat(end_time.group(1)).replace(tzinfo=timezone.utc) - now
+                        ).total_seconds()
+                    except ValueError:
+                        logger.warning(
+                            r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
+                            id_,
+                        )
+                        continue
                     logger.warning(
                         r"Deprecated time message for user %s, block and unblock again to update.",
                         id_,
                     )
+            else:
+                try:
+                    after = (
+                        datetime.fromtimestamp(int(end_time.group(1))).replace(tzinfo=timezone.utc) - now
+                    ).total_seconds()
+                except ValueError:
+                    logger.warning(
+                        r"Broken block message for user %s, block and unblock again with a different message to prevent further issues",
+                        id_,
+                    )
+                    continue
 
             if end_time is not None:
-                after = (
-                    datetime.fromisoformat(end_time.group(1)).replace(tzinfo=timezone.utc) - now
-                ).total_seconds()
                 if after <= 0:
                     # No longer blocked
                     self.bot.blocked_users.pop(str(id_))
@@ -1862,12 +1889,13 @@ async def block(
         if after is not None:
             if "%" in reason:
                 raise commands.BadArgument('The reason contains illegal character "%".')
-            unixtime = int(after.dt.replace(tzinfo=timezone.utc).timestamp())
 
             if after.arg:
-                reason += f" until: <t:{unixtime}:R>"
+                fmt_dt = discord.utils.format_dt(after.dt, "R")
             if after.dt > after.now:
-                reason += f" until <t:{unixtime}:f>"
+                fmt_dt = discord.utils.format_dt(after.dt, "f")
+
+            reason += f" until {fmt_dt}"
 
         reason += "."
 

core/thread.py

@@ -322,10 +322,10 @@ def _format_info_embed(self, user, log_url, log_count, color):
 
             role_names = separator.join(roles)
 
-        created = str((time - user.created_at).days)
         user_info = []
         if self.bot.config["thread_show_account_age"]:
-            user_info.append(f" was created {days(created)}")
+            created = discord.utils.format_dt(user.created_at, "R")
+            user_info.append(f" was created {created}")
 
         embed = discord.Embed(color=color, description=user.mention, timestamp=time)
 
@@ -337,10 +337,9 @@ def _format_info_embed(self, user, log_url, log_count, color):
         if member is not None:
             embed.set_author(name=str(user), icon_url=member.display_avatar.url, url=log_url)
 
-            joined = str((time - member.joined_at).days)
-            # embed.add_field(name='Joined', value=joined + days(joined))
             if self.bot.config["thread_show_join_age"]:
-                user_info.append(f"joined {days(joined)}")
+                joined = discord.utils.format_dt(member.joined_at, "R")
+                user_info.append(f"joined {joined}")
 
             if member.nick:
                 embed.add_field(name="Nickname", value=member.nick, inline=True)

core/time.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import datetime
+import discord
 from typing import TYPE_CHECKING, Any, Optional, Union
 import parsedatetime as pdt
 from dateutil.relativedelta import relativedelta
@@ -39,16 +40,6 @@ def __format__(self, format_spec: str) -> str:
         return f"{v} {singular}"
 
 
-def format_dt(dt: datetime.datetime, style: Optional[str] = None) -> str:
-    """https://github.com/Rapptz/RoboDanny/blob/bf7d4226350dff26df4981dd53134eeb2aceeb87/cogs/utils/formats.py#L89-L95"""
-    if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=datetime.timezone.utc)
-
-    if style is None:
-        return f"<t:{int(dt.timestamp())}>"
-    return f"<t:{int(dt.timestamp())}:{style}>"
-
-
 class ShortTime:
     compiled = re.compile(
         """
@@ -365,4 +356,4 @@ def human_timedelta(
 
 
 def format_relative(dt: datetime.datetime) -> str:
-    return format_dt(dt, "R")
+    return discord.utils.format_dt(dt, "R")

pyproject.toml

@@ -21,7 +21,7 @@ extend-exclude = '''
 
 [tool.poetry]
 name = 'Modmail'
-version = '4.0.0-dev20'
+version = '4.0.0'
 description = "Modmail is similar to Reddit's Modmail, both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way."
 license = 'AGPL-3.0-only'
 authors = [