From 7debf6766ca970287fde8690a471fcba28874a43 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 1 Dec 2021 19:25:28 +0200 Subject: [PATCH] sfdds --- files/classes/submission.py | 2 +- files/helpers/sanitize.py | 8 ++++---- files/routes/posts.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index 7702c7a5d..678110408 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -216,7 +216,7 @@ class Submission(Base): if self.over_18: return f"http://{site}/assets/images/nsfw.webp" elif not self.url: return f"http://{site}/assets/images/{site_name}/default_text.webp" elif self.thumburl: return self.thumburl - elif "youtu.be" in self.domain or "youtube.com" in self.domain: return f"http://{site}/assets/images/default_thumb_yt.webp" + elif "youtu.be" in self.domain or "youtube.com" == self.domain: return f"http://{site}/assets/images/default_thumb_yt.webp" else: return f"http://{site}/assets/images/default_thumb_link.webp" @property diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 5224e0e20..fd1fb1132 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -95,7 +95,7 @@ def sanitize(sanitized, noimages=False): sanitized = sanitized.replace("\ufeff", "").replace("𒐪","") - for i in re.finditer('https://i.imgur.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized): + for i in re.finditer('https://i\.imgur\.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized): sanitized = sanitized.replace(i.group(1), i.group(2) + "_d." + i.group(3) + "?maxwidth=9999") if noimages: @@ -208,7 +208,7 @@ def sanitize(sanitized, noimages=False): sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/watch?v=").replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?v=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("https://m.wikipedia", "https://wikipedia").replace("https://m.youtube", "https://youtube") - for i in re.finditer('" target="_blank">(https://youtube.com/watch\?v\=.*?)', sanitized): + for i in re.finditer('" target="_blank">(https://youtube\.com/watch\?v\=.*?)', sanitized): url = i.group(1) replacing = f'{url}' url = url.replace("watch?v=", "embed/").replace("&t", "?start").replace("?t", "?start") @@ -216,7 +216,7 @@ def sanitize(sanitized, noimages=False): htmlsource = f'' sanitized = sanitized.replace(replacing, htmlsource) - for i in re.finditer('{url}' htmlsource = f'' @@ -225,7 +225,7 @@ def sanitize(sanitized, noimages=False): for i in re.finditer('

(https:.*?\.mp4)

', sanitized): sanitized = sanitized.replace(i.group(0), f'

') - for i in re.finditer('{url}' htmlsource = f'' diff --git a/files/routes/posts.py b/files/routes/posts.py index 9bda08cde..d3321a8df 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -622,7 +622,7 @@ def submit_post(v): if domain_obj: if request.headers.get("Authorization"): return {"error":domain_obj.reason}, 400 else: return render_template("submit.html", v=v, error=domain_obj.reason, title=title, url=url, body=request.values.get("body", "")), 400 - elif "twitter.com" in domain: + elif "twitter.com" == domain: try: embed = requests.get("https://publish.twitter.com/oembed", timeout=5, params={"url":url, "omit_script":"t"}).json()["html"] except: embed = None elif "youtu" in domain: