Fix block

Author: Taaku18

CHANGELOG.md

@@ -9,6 +9,11 @@ however, insignificant breaking changes does not guarantee a major version bump,
 
 # v3.3.0-dev2
 
+
+### Important
+
+- Recommend all users to unblock and re-block all blocked users upon updating to this release.
+
 ### Added
 
 - Three new config vars:
@@ -39,6 +44,7 @@ however, insignificant breaking changes does not guarantee a major version bump,
 - Add travis checks for 3.6 in Linux and 3.7 for MacOS and Windows.
 - Eval commands are logged in debug logs.
 - Presence updates 30 minutes instead of 45 now.
+- Fixed an assortment of problems to do with block.
 
 ### Internal
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.3.0-dev2"
+__version__ = "3.3.0-dev3"
 
 import asyncio
 import logging
@@ -676,16 +676,26 @@ async def _process_blocked(self, message: discord.Message) -> bool:
                 self.blocked_users.pop(str(message.author.id))
             else:
                 reaction = blocked_emoji
-                end_time = re.search(r"%(.+?)%", reason)
+                # 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.",
+                                       message.author)
+
                 if end_time is not None:
-                    logger.debug("No longer blocked, user %s.", message.author.name)
                     after = (
                         datetime.fromisoformat(end_time.group(1)) - now
                     ).total_seconds()
                     if after <= 0:
                         # No longer blocked
                         reaction = sent_emoji
                         self.blocked_users.pop(str(message.author.id))
+                        logger.debug("No longer blocked, user %s.", message.author.name)
+                    else:
+                        logger.debug("User blocked, user %s.", message.author.name)
                 else:
                     logger.debug("User blocked, user %s.", message.author.name)
         else:

cogs/modmail.py

@@ -953,15 +953,15 @@ async def blocked(self, ctx):
             else:
                 try:
                     user = await self.bot.fetch_user(id_)
-                    users.append((str(user), reason))
+                    users.append((user.mention, reason))
                 except discord.NotFound:
-                    pass
+                    users.append((id_, reason))
 
         if users:
             embed = embeds[0]
 
             for mention, reason in users:
-                line = mention + f" - `{reason or 'No reason provided'}`\n"
+                line = mention + f" - {reason or 'No Reason Provided'}\n"
                 if len(embed.description) + len(line) > 2048:
                     embed = discord.Embed(
                         title="Blocked Users (Continued)",
@@ -1008,20 +1008,18 @@ async def blocked_whitelist(self, ctx, *, user: User = None):
         self.bot.blocked_whitelisted_users.append(str(user.id))
 
         if str(user.id) in self.bot.blocked_users:
-            msg = self.bot.blocked_users.get(str(user.id))
-            if msg is None:
-                msg = ""
+            msg = self.bot.blocked_users.get(str(user.id)) or ""
             self.bot.blocked_users.pop(str(user.id))
 
         await self.bot.config.update()
 
         if msg.startswith("System Message: "):
             # If the user is blocked internally (for example: below minimum account age)
             # Show an extended message stating the original internal message
-            reason = msg[16:].strip().rstrip(".") or "no reason"
+            reason = msg[16:].strip().rstrip(".")
             embed = discord.Embed(
                 title="Success",
-                description=f"{mention} was previously blocked internally due to "
+                description=f"{mention} was previously blocked internally for "
                 f'"{reason}". {mention} is now whitelisted.',
                 color=self.bot.main_color,
             )
@@ -1051,8 +1049,6 @@ async def block(
         `duration` may be a simple "human-readable" time text. See `{prefix}help close` for examples.
         """
 
-        reason = ""
-
         if user is None:
             thread = ctx.thread
             if thread:
@@ -1064,8 +1060,6 @@ async def block(
 
         mention = getattr(user, "mention", f"`{user.id}`")
 
-        moderator = ctx.author.name
-
         if str(user.id) in self.bot.blocked_whitelisted_users:
             embed = discord.Embed(
                 title="Error",
@@ -1074,53 +1068,38 @@ async def block(
             )
             return await ctx.send(embed=embed)
 
+        reason = f"by {escape_markdown(ctx.author.name)}#{ctx.author.discriminator}"
+
         if after is not None:
-            reason = f"{after.arg} by {moderator}"
-            if reason.startswith("System Message: "):
-                raise commands.BadArgument(
-                    "The reason cannot start with `System Message:`."
-                )
             if "%" in reason:
                 raise commands.BadArgument('The reason contains illegal character "%".')
+            if after.arg:
+                reason += f" for `{after.arg}`"
             if after.dt > after.now:
-                reason = f"{reason} %{after.dt.isoformat()}% by {moderator}"
+                reason += f" until {after.dt.isoformat()}"
 
-        if not reason:
-            reason = f"Blocked by {moderator}"
+        reason += "."
 
-        extend = f" for `{reason}`" if reason is not None else ""
         msg = self.bot.blocked_users.get(str(user.id))
         if msg is None:
             msg = ""
 
-        if (
-            str(user.id) not in self.bot.blocked_users
-            or reason is not None
-            or msg.startswith("System Message: ")
-        ):
-            if str(user.id) in self.bot.blocked_users:
-
-                old_reason = msg.strip().rstrip(".") or f"Blocked by {moderator}"
-                embed = discord.Embed(
-                    title="Success",
-                    description=f"{mention} was previously blocked for "
-                    f'"{old_reason}". {mention} is now blocked{extend}.',
-                    color=self.bot.main_color,
-                )
-            else:
-                embed = discord.Embed(
-                    title="Success",
-                    color=self.bot.main_color,
-                    description=f"{mention} is now blocked{extend}.",
-                )
-            self.bot.blocked_users[str(user.id)] = reason
-            await self.bot.config.update()
+        if str(user.id) in self.bot.blocked_users and msg:
+            old_reason = msg.strip().rstrip(".")
+            embed = discord.Embed(
+                title="Success",
+                description=f"{mention} was previously blocked "
+                f'{old_reason}.\n{mention} is now blocked {reason}',
+                color=self.bot.main_color,
+            )
         else:
             embed = discord.Embed(
-                title="Error",
-                color=self.bot.error_color,
-                description=f"{mention} is already blocked.",
+                title="Success",
+                color=self.bot.main_color,
+                description=f"{mention} is now blocked {reason}",
             )
+        self.bot.blocked_users[str(user.id)] = reason
+        await self.bot.config.update()
 
         return await ctx.send(embed=embed)
 
@@ -1156,12 +1135,12 @@ async def unblock(self, ctx, *, user: User = None):
                 reason = msg[16:].strip().rstrip(".") or "no reason"
                 embed = discord.Embed(
                     title="Success",
-                    description=f"{mention} was previously blocked internally due to "
-                    f'"{reason}". {mention} is no longer blocked.',
+                    description=f"{mention} was previously blocked internally "
+                    f'{reason}.\n{mention} is no longer blocked.',
                     color=self.bot.main_color,
                 )
                 embed.set_footer(
-                    text="However, if the original system block reason still apply, "
+                    text="However, if the original system block reason still applies, "
                     f"{name} will be automatically blocked again. Use "
                     f'"{self.bot.prefix}blocked whitelist {user.id}" to whitelist the user.'
                 )