From 5e179953d5c717fa152b96d92961c3d4e6170e97 Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 3 Aug 2023 11:28:52 +0300 Subject: [PATCH] fix the 2nd bug reported in this comment https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4714508#context --- files/helpers/regex.py | 4 ++-- files/helpers/sanitize.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/helpers/regex.py b/files/helpers/regex.py index 144de1a49..30a5c7dca 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -43,8 +43,8 @@ title_regex = re.compile("[^\w ]", flags=re.A) controversial_regex = re.compile('["> ](https:\/\/old\.reddit\.com/r/\w{3,20}\/comments\/[\w\-.#&/=\?@%+]{5,250})["< ]', flags=re.A) spoiler_regex = re.compile('\|\|(.+?)\|\|' + NOT_IN_CODE_OR_LINKS, flags=re.A) -reddit_regex = re.compile('(^|\s|

|\()\/?(([ruRU])\/(\w|-){3,25})' + NOT_IN_CODE_OR_LINKS, flags=re.A) -sub_regex = re.compile('(^|\s|

|\()\/?([hH]\/(\w|-){3,25})' + NOT_IN_CODE_OR_LINKS, flags=re.A) +reddit_regex = re.compile('(?|")~{1,2}([^~]+)~{1,2}' + NOT_IN_CODE_OR_LINKS, flags=re.A) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index d1d829bf3..eb41e2faf 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -385,8 +385,8 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis # replacing zero width characters, overlines, fake colons sanitized = sanitized.replace('\u200e','').replace('\u200b','').replace("\ufeff", "").replace("\u033f","").replace("\u0589", ":") - sanitized = reddit_regex.sub(r'\1/\2', sanitized) - sanitized = sub_regex.sub(r'\1/\2', sanitized) + sanitized = reddit_regex.sub(r'/\1', sanitized) + sanitized = sub_regex.sub(r'/\1', sanitized) v = getattr(g, 'v', None)