From d2cdea3db6b33cc0f56cb8fe86eeea184979a609 Mon Sep 17 00:00:00 2001 From: Klemek Date: Thu, 22 Apr 2021 16:12:13 +0200 Subject: [PATCH] escape text in find scanner --- src/scanners/find_scanner.py | 6 ++++-- src/utils/utils.py | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/scanners/find_scanner.py b/src/scanners/find_scanner.py index 34a5397..1cfe60f 100644 --- a/src/scanners/find_scanner.py +++ b/src/scanners/find_scanner.py @@ -1,7 +1,6 @@ from typing import Dict, List from collections import defaultdict import discord -import re # Custom libs @@ -13,6 +12,7 @@ from utils import ( plural, precise, mention, + escape_text, ) @@ -64,7 +64,9 @@ class FindScanner(Scanner): res += [ self.matches[match].to_string( matches.index(match), - f"`{match}`", + f'"{escape_text(match)}"' + if not match.startswith("<:") + else escape_text(match), total_usage=self.msg_count, ranking=False, transform=lambda id: f" by {mention(id)}", diff --git a/src/utils/utils.py b/src/utils/utils.py index 7e5e9b6..4457326 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -1,4 +1,3 @@ -from calendar import month from typing import Callable, List, Dict, Union, Optional, Any import os import logging @@ -81,6 +80,10 @@ def message_link(message: discord.Message) -> str: return f"https://discord.com/channels/{message.channel.guild.id}/{message.channel.id}/{message.id}" +def escape_text(text: str) -> str: + return discord.utils.escape_markdown(discord.utils.escape_mentions(text)) + + class FakeMessage: def __init__(self, id: int): self.id = id