From 25e594d673a13cfc49a9c682056533963c4a079e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 1 Jul 2022 20:29:12 +0200 Subject: [PATCH] Revert "no longer stop reposts from being posted" This reverts commit 19e6e7f4d9c4e8b4382eb9885ba0e52f9d0c256c. --- files/routes/posts.py | 29 +++++++++++++++++++++++++++++ files/templates/submit.html | 4 +--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 7e8ce8204..9cccdabdd 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -764,6 +764,35 @@ def submit_post(v, sub=None): parsed_url = urlparse(url) domain = parsed_url.netloc + if domain in ('old.reddit.com','twitter.com','instagram.com','tiktok.com') and '/search' not in url: + new_url = ParseResult(scheme="https", + netloc=parsed_url.netloc, + path=parsed_url.path, + params=parsed_url.params, + query=None, + fragment=parsed_url.fragment) + else: + qd = parse_qs(parsed_url.query) + filtered = {k: val for k, val in qd.items() if not k.startswith('utm_') and not k.startswith('ref_')} + + new_url = ParseResult(scheme="https", + netloc=parsed_url.netloc, + path=parsed_url.path, + params=parsed_url.params, + query=urlencode(filtered, doseq=True), + fragment=parsed_url.fragment) + + url = urlunparse(new_url) + + if url.endswith('/'): url = url[:-1] + + search_url = url.replace('%', '').replace('\\', '').replace('_', '\_').strip() + repost = g.db.query(Submission).filter( + Submission.url.ilike(search_url), + Submission.deleted_utc == 0, + Submission.is_banned == False + ).first() + if repost and SITE != 'localhost': return redirect(repost.permalink) domain_obj = get_domain(domain) if not domain_obj: domain_obj = get_domain(domain+parsed_url.path) diff --git a/files/templates/submit.html b/files/templates/submit.html index a7e1b0e4c..6c7029113 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -107,9 +107,7 @@
-

- To post an image, use a direct image link such as i.imgur.com -

+ To post an image, use a direct image link such as i.imgur.com