From 7aede92a46a5f1337124202f390a4c57177151d7 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 14 Jan 2022 06:15:41 +0200 Subject: [PATCH] bbb --- files/classes/submission.py | 2 +- files/routes/static.py | 12 ++++++++++-- files/templates/login.html | 2 +- files/templates/sidebar_Drama.html | 10 ++++++++++ files/templates/sidebar_PCM.html | 10 ++++++++++ files/templates/sign_up.html | 4 ++-- files/templates/submission.html | 8 ++++---- 7 files changed, 38 insertions(+), 10 deletions(-) diff --git a/files/classes/submission.py b/files/classes/submission.py index 4b5a1e8d3d..6d87b7da7e 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -424,7 +424,7 @@ class Submission(Base): @property @lazy def is_video(self): - return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov'))) + return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov', '#t=0.1'))) @property @lazy diff --git a/files/routes/static.py b/files/routes/static.py index 6dcab151c1..aeb770871e 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -29,13 +29,21 @@ def emojis(v): return render_template("marseys.html", v=v, marseys=marsey_counted) @app.get("/terms") -@auth_required +@app.get("/logged_out/terms") +@auth_desired def terms(v): + if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}") + if v and request.path.startswith('/logged_out'): v = None + return render_template("terms.html", v=v) @app.get('/sidebar') -@auth_required +@app.get('/logged_out/sidebar') +@auth_desired def sidebar(v): + if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}") + if v and request.path.startswith('/logged_out'): v = None + return render_template('sidebar.html', v=v) diff --git a/files/templates/login.html b/files/templates/login.html index 9dfc0f6289..29177bf984 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -92,7 +92,7 @@ {% if g.webview %}
+ href="/logged_out/terms" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>terms of use
{% endif %}
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html index 8d968f80df..86c19001cb 100644 --- a/files/templates/sidebar_Drama.html +++ b/files/templates/sidebar_Drama.html @@ -43,4 +43,14 @@
RULE 5
All rules can and likely will be ignored at admin discretion. Be funny, or at least compelling, and pretty much anything legal is fine.

Okay I think that’s all, thanks for reading! No one cares about your dumb free speech or whatever, go to Gab or something if you want to screech about amendments and stuff. Rules are not hard and fast, and janitorial abuse is inherent to the platform. So is ban evasion. Have fun or log out, both are easy! + 
+
+
+
+
+    
+
+
+    
+
\ No newline at end of file diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html index cd9f8b53a4..a9e4b2fcdb 100644 --- a/files/templates/sidebar_PCM.html +++ b/files/templates/sidebar_PCM.html @@ -4,4 +4,14 @@ STREAM LIST BUGS/SUGGESTIONS MEGATHREAD

Rules: No doxxing, No CP or other clearly illegal shit. Thanks.

+
+
+
+
+
+    
+
+
+    
+
\ No newline at end of file diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 0638e1e02e..57ff95f835 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -113,9 +113,9 @@ diff --git a/files/templates/submission.html b/files/templates/submission.html index 0b8ef9f56b..94a899d1cc 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -143,7 +143,7 @@ -{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov')) %} +{% if p.is_video %} {% endif %} @@ -168,7 +168,7 @@ {% if p.author %}{% endif %} -{% if p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov')) %} +{% if p.url and p.is_video %} {% endif %} @@ -391,7 +391,7 @@
{% if p.realurl(v) %} - {% if not p.embed_url and not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov'))) %} + {% if not p.embed_url and not p.is_image and not p.is_video %}
{{p.domain|truncate(30, True)}} @@ -650,7 +650,7 @@
- {% if not p.is_image and not (p.url and (p.url.lower().endswith('.mp4') or p.url.lower().endswith('.webm') or p.url.lower().endswith('.mov'))) %} + {% if not p.is_image and not p.is_video %}