From debbc619e47239b268171d7599b363dc8b18c727 Mon Sep 17 00:00:00 2001
From: Jeremiah Boby <mail@jeremiahboby.me>
Date: Wed, 11 Mar 2020 23:57:09 +0000
Subject: Escape markdown in voice updates

---
 bot/cogs/moderation/modlog.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bot/cogs/moderation/modlog.py b/bot/cogs/moderation/modlog.py
index f9dd10e75..d42a1ae66 100644
--- a/bot/cogs/moderation/modlog.py
+++ b/bot/cogs/moderation/modlog.py
@@ -387,7 +387,8 @@ class ModLog(Cog, name="ModLog"):
         if member.guild.id != GuildConstant.id:
             return
 
-        message = f"{member} (`{member.id}`)"
+        member_str = escape_markdown(str(member))
+        message = f"{member_str} (`{member.id}`)"
         now = datetime.utcnow()
         difference = abs(relativedelta(now, member.created_at))
 
@@ -413,9 +414,10 @@ class ModLog(Cog, name="ModLog"):
             self._ignored[Event.member_remove].remove(member.id)
             return
 
+        member_str = escape_markdown(str(member))
         await self.send_log_message(
             Icons.sign_out, Colours.soft_red,
-            "User left", f"{member} (`{member.id}`)",
+            "User left", f"{member_str} (`{member.id}`)",
             thumbnail=member.avatar_url_as(static_format="png"),
             channel_id=Channels.user_log
         )
@@ -430,9 +432,10 @@ class ModLog(Cog, name="ModLog"):
             self._ignored[Event.member_unban].remove(member.id)
             return
 
+        member_str = escape_markdown(str(member))
         await self.send_log_message(
             Icons.user_unban, Colour.blurple(),
-            "User unbanned", f"{member} (`{member.id}`)",
+            "User unbanned", f"{member_str} (`{member.id}`)",
             thumbnail=member.avatar_url_as(static_format="png"),
             channel_id=Channels.mod_log
         )
@@ -552,16 +555,17 @@ class ModLog(Cog, name="ModLog"):
         if author.bot:
             return
 
+        author_str = escape_markdown(str(author))
         if channel.category:
             response = (
-                f"**Author:** {author} (`{author.id}`)\n"
+                f"**Author:** {author_str} (`{author.id}`)\n"
                 f"**Channel:** {channel.category}/#{channel.name} (`{channel.id}`)\n"
                 f"**Message ID:** `{message.id}`\n"
                 "\n"
             )
         else:
             response = (
-                f"**Author:** {author} (`{author.id}`)\n"
+                f"**Author:** {author_str} (`{author.id}`)\n"
                 f"**Channel:** #{channel.name} (`{channel.id}`)\n"
                 f"**Message ID:** `{message.id}`\n"
                 "\n"
@@ -648,6 +652,8 @@ class ModLog(Cog, name="ModLog"):
             return
 
         author = msg_before.author
+        author_str = escape_markdown(str(author))
+
         channel = msg_before.channel
         channel_name = f"{channel.category}/#{channel.name}" if channel.category else f"#{channel.name}"
 
@@ -679,7 +685,7 @@ class ModLog(Cog, name="ModLog"):
                 content_after.append(sub)
 
         response = (
-            f"**Author:** {author} (`{author.id}`)\n"
+            f"**Author:** {author_str} (`{author.id}`)\n"
             f"**Channel:** {channel_name} (`{channel.id}`)\n"
             f"**Message ID:** `{msg_before.id}`\n"
             "\n"
@@ -822,8 +828,9 @@ class ModLog(Cog, name="ModLog"):
         if not changes:
             return
 
+        member_str = escape_markdown(str(member))
         message = "\n".join(f"{Emojis.bullet} {item}" for item in sorted(changes))
-        message = f"**{member}** (`{member.id}`)\n{message}"
+        message = f"**{member_str}** (`{member.id}`)\n{message}"
 
         await self.send_log_message(
             icon_url=icon,
-- 
cgit v1.2.3