Merge branch 'staging' into feature-timer

bot/constants.py

@@ -1,2 +1,2 @@
 CONFIG_FILE = "config/bot.conf"
-DATA_VERSION = 6
+DATA_VERSION = 7

bot/modules/guild_admin/reaction_roles/expiry.py

@@ -126,7 +126,7 @@ async def _expiry_tracker(client):
     while True:
         try:
             key = _next()
-            diff = utc_now().timestamp() - _expiring[key] if key else None
+            diff = _expiring[key] - utc_now().timestamp() if key else None
             await asyncio.wait_for(_wakeup_event.wait(), timeout=diff)
         except asyncio.TimeoutError:
             # Timeout means next doesn't exist or is ready to expire

bot/utils/ctx_addons.py

@@ -20,7 +20,7 @@ async def embed_reply(ctx, desc, colour=discord.Colour.orange(), **kwargs):
     try:
         return await ctx.reply(embed=embed, reference=ctx.msg.to_reference(fail_if_not_exists=False))
     except discord.Forbidden:
-        if not ctx.guild or ctx.ch.permissions_for(ctx.guild.me).send_mssages:
+        if not ctx.guild or ctx.ch.permissions_for(ctx.guild.me).send_messages:
             await ctx.reply("Command failed, I don't have permission to send embeds in this channel!")
         raise SafeCancellation