From 2c1d1aceff5d42a4bbc83d6079f870e0eba0345a Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 23 Jun 2022 21:43:49 +0200
Subject: [PATCH] fix this
 https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2178607?context=8#context

---
 files/helpers/const.py    | 4 +++-
 files/helpers/sanitize.py | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index ccdb421193..3055d85865 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -1004,7 +1004,7 @@ image_check_regex = re.compile(f'!\[\]\(((?!(https:\/\/([a-z0-9-]+\.)*({hosts})\
 video_sub_regex = re.compile(f'(<p>[^<]*)(https:\/\/([a-z0-9-]+\.)*({hosts})\/[\w:~,()\-.#&\/=?@%;+]*?\.(mp4|webm|mov))', flags=re.A)
 audio_sub_regex = re.compile(f'(<p>[^<]*)(https:\/\/([a-z0-9-]+\.)*({hosts})\/[\w:~,()\-.#&\/=?@%;+]*?\.(mp3|wav|ogg|aac|m4a|flac))', flags=re.A)
 
-imgur_regex = re.compile('(https:\/\/i\.imgur\.com\/[a-z0-9]+)\.(jpg|png|jpeg|webp)(?!<\/(code|pre|a)>)', flags=re.I|re.A)
+imgur_regex = re.compile('(https:\/\/i\.imgur\.com\/[a-z0-9]+)\.(jpg|png|jpeg|webp)', flags=re.I|re.A)
 giphy_regex = re.compile('(https:\/\/media\.giphy\.com\/media\/[a-z0-9]+\/giphy)\.gif', flags=re.I|re.A)
 
 youtube_regex = re.compile('(<p>[^<]*)(https:\/\/youtube\.com\/watch\?v\=([a-z0-9-_]{5,20})[\w\-.#&/=\?@%+]*)', flags=re.I|re.A)
@@ -1027,4 +1027,6 @@ ascii_only_regex = re.compile("[ -~]+", flags=re.A)
 
 twitter_to_nitter_regex = re.compile("https:\/\/twitter.com\/(\w{4,15}(\/status\/\d+[^/]*)?)", flags=re.A)
 
+reddit_domain_regex = re.compile("(^|\s)https:\/\/(reddit\.com|new\.reddit.com|www\.reddit.com|redd\.it|libredd\.it|teddit\.net)\/r\/", flags=re.A)
+
 def make_name(*args, **kwargs): return request.base_url
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 8ab9a2c231..a9cff03c0f 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -171,6 +171,8 @@ def sanitize(sanitized, edit=False):
 
 	sanitized = sanitized.strip()
 
+	sanitized = normalize_url(sanitized)
+
 	if '```' not in sanitized and '<pre>' not in sanitized:
 		sanitized = linefeeds_regex.sub(r'\1\n\n\2', sanitized)
 
@@ -203,9 +205,6 @@ def sanitize(sanitized, edit=False):
 			if not (v and v.any_block_exists(u)) or (v and v.admin_level >= 2):
 				sanitized = sanitized.replace(i.group(0), f'''{i.group(1)}<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>''', 1)
 
-
-	sanitized = normalize_url(sanitized)
-
 	soup = BeautifulSoup(sanitized, 'lxml')
 
 	for tag in soup.find_all("img"):
@@ -384,8 +383,7 @@ def filter_emojis_only(title, edit=False, graceful=False):
 	else: return title
 
 def normalize_url(url):
-	for x in ["reddit.com", "new.reddit.com", "www.reddit.com", "redd.it", "ibredd.it", "teddit.net"]:
-		url = url.replace(f'https://{x}/r/', "https://old.reddit.com/r/")
+	url = reddit_domain_regex.sub(r'\1https://old.reddit.com/r/', url)
 
 	url = url.replace("https://youtu.be/", "https://youtube.com/watch?v=") \
 			 .replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=") \