Update to discord.py 2.0.1 and fix time module

Author: fourjr

Pipfile

@@ -12,7 +12,7 @@ typing-extensions = "==4.2.0"
 [packages]
 aiohttp = "==3.8.1"
 colorama = "~=0.4.5"
-"discord.py" = "==2.0.0"
+"discord.py" = "==2.0.1"
 emoji = "==1.7.0"
 isodate = "~=0.6.0"
 motor = "==2.5.1"

Pipfile.lock

@@ -1,4 +1,4 @@
-__version__ = "4.0.0-dev17"
+__version__ = "4.0.0-dev18"
 
 
 import asyncio
@@ -18,6 +18,7 @@
 import discord
 import isodate
 from aiohttp import ClientSession, ClientResponseError
+from discord.utils import MISSING
 from discord.ext import commands, tasks
 from discord.ext.commands.view import StringView
 from emoji import UNICODE_EMOJI
@@ -247,10 +248,10 @@ async def runner():
                 except Exception:
                     logger.critical("Fatal exception", exc_info=True)
                 finally:
-                    if not self.is_closed():
-                        await self.close()
                     if self.session:
                         await self.session.close()
+                    if not self.is_closed():
+                        await self.close()
 
         async def _cancel_tasks():
             async with self:
@@ -282,7 +283,7 @@ async def _cancel_tasks():
                         pass
 
         try:
-            asyncio.run(runner())
+            asyncio.run(runner(), debug=bool(os.getenv("DEBUG_ASYNCIO")))
         except (KeyboardInterrupt, SystemExit):
             logger.info("Received signal to terminate bot and event loop.")
         finally:
@@ -1771,9 +1772,11 @@ def main():
         sys.exit(0)
 
     # check discord version
-    if discord.__version__ != "2.0.0":
+    discord_version = "2.0.1"
+    if discord.__version__ != discord_version:
         logger.error(
-            "Dependencies are not updated, run pipenv install. discord.py version expected 2.0.0, received %s",
+            "Dependencies are not updated, run pipenv install. discord.py version expected %s, received %s",
+            discord_version,
             discord.__version__,
         )
         sys.exit(0)

bot.py

@@ -2,6 +2,7 @@
 import re
 from datetime import datetime, timezone
 from itertools import zip_longest
+import time
 from typing import Optional, Union, List, Tuple
 from types import SimpleNamespace
 
@@ -1848,14 +1849,17 @@ async def block(
             return await ctx.send(embed=embed)
 
         reason = f"by {escape_markdown(ctx.author.name)}#{ctx.author.discriminator}"
+        now = discord.utils.utcnow()
 
         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" for `{after.arg}`"
-            if after.dt > after.now:
-                reason += f" until {after.dt.isoformat()}"
+                reason += f" until: <t:{unixtime}:R>"
+            if after.dt > now:
+                reason += f" until <t:{unixtime}:f>"
 
         reason += "."
 

cogs/modmail.py

@@ -13,7 +13,7 @@
 
 from core._color_data import ALL_COLORS
 from core.models import DMDisabled, InvalidConfigError, Default, getLogger
-from core.time import UserFriendlyTimeSync
+from core.time import UserFriendlyTime
 from core.utils import strtobool
 
 logger = getLogger(__name__)
@@ -400,7 +400,7 @@ def set(self, key: str, item: typing.Any, convert=True) -> None:
                 isodate.parse_duration(item)
             except isodate.ISO8601Error:
                 try:
-                    converter = UserFriendlyTimeSync()
+                    converter = UserFriendlyTime()
                     time = converter.convert(None, item)
                     if time.arg:
                         raise ValueError
@@ -412,7 +412,8 @@ def set(self, key: str, item: typing.Any, convert=True) -> None:
                         "Unrecognized time, please use ISO-8601 duration format "
                         'string or a simpler "human readable" time.'
                     )
-                item = isodate.duration_isoformat(time.dt - converter.now)
+                now = discord.utils.utcnow()
+                item = isodate.duration_isoformat(time.dt - now)
             return self.__setitem__(key, item)
 
         if key in self.booleans: