From c4d9dc8b3e40d3936cac0e35e0d4af818c2b0559 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 10 Dec 2021 19:31:32 +0200 Subject: [PATCH] fdsfds --- files/routes/comments.py | 5 ----- files/routes/posts.py | 8 -------- files/routes/settings.py | 5 +---- files/routes/votes.py | 2 +- files/templates/comments.html | 14 +++++++------- files/templates/default.html | 2 +- files/templates/header.html | 2 +- files/templates/submission.html | 8 ++++---- files/templates/submission_banned.html | 2 +- files/templates/submission_listing.html | 10 +++++----- 10 files changed, 21 insertions(+), 37 deletions(-) diff --git a/files/routes/comments.py b/files/routes/comments.py index aabf4c5eb..36f720810 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -595,11 +595,6 @@ def api_comment(v): g.db.commit() - if v.agendaposter and random.randint(1, 10) < 4: - if request.host == 'rdrama.net': - return redirect(random.choice(['https://secure.actblue.com/donate/ms_blm_homepage_2019','https://rdrama.net/post/19711/a-short-guide-on-how-to','https://secure.transequality.org/site/Donation2?df_id=1480'])) - return redirect('https://secure.actblue.com/donate/ms_blm_homepage_2019') - if request.headers.get("Authorization"): return c.json else: return render_template("comments.html", v=v, comments=[c]) diff --git a/files/routes/posts.py b/files/routes/posts.py index 86f898084..22994c6b3 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -93,10 +93,6 @@ def post_id(pid, anything=None, v=None): if v and request.path.startswith('/logged_out'): v = None - if v and v.agendaposter and random.randint(1, 20) == 1: - if request.host == 'rdrama.net': - return redirect(random.choice(['https://secure.actblue.com/donate/ms_blm_homepage_2019','https://rdrama.net/post/19711/a-short-guide-on-how-to','https://secure.transequality.org/site/Donation2?df_id=1480'])) - return redirect('https://secure.actblue.com/donate/ms_blm_homepage_2019') try: pid = int(pid) except Exception as e: pass @@ -1140,10 +1136,6 @@ def submit_post(v): g.db.commit() - if v.agendaposter and random.randint(1, 10) < 4: - if request.host == 'rdrama.net': - return redirect(random.choice(['https://secure.actblue.com/donate/ms_blm_homepage_2019','https://rdrama.net/post/19711/a-short-guide-on-how-to','https://secure.transequality.org/site/Donation2?df_id=1480'])) - return redirect('https://secure.actblue.com/donate/ms_blm_homepage_2019') if request.headers.get("Authorization"): return new_post.json else: return redirect(new_post.permalink) diff --git a/files/routes/settings.py b/files/routes/settings.py index 94face50c..f40636420 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -816,10 +816,7 @@ def settings_css_get(v): def settings_css(v): css = request.values.get("css").strip().replace('\\', '').strip()[:4000] - if not v.agendaposter: - v.css = css - else: - v.css = 'body *::before, body *::after { content: "Trans rights are human rights!"; }' + v.css = css g.db.add(v) g.db.commit() diff --git a/files/routes/votes.py b/files/routes/votes.py index 32201e980..199f0b5a4 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -101,7 +101,7 @@ def api_vote_post(post_id, new, v): post.author.coins += 1 post.author.truecoins += 1 g.db.add(post.author) - real = bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor and not v.agendaposter and not v.shadowbanned + real = (bool(v.profileurl) or bool(v.customtitle) or v.namecolor != defaultcolor) and not v.agendaposter and not v.shadowbanned vote = Vote(user_id=v.id, vote_type=new, submission_id=post_id, diff --git a/files/templates/comments.html b/files/templates/comments.html index 658b7d802..6b45ccf30 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -67,7 +67,7 @@ coins      - + View @@ -121,11 +121,11 @@ {% endfor %}
- More comments + More comments
{% elif replies %}
- More comments + More comments
{% endif %} {% endif %} @@ -350,7 +350,7 @@ Reply {% endif %} - Context + Context Copy link {% if v %} Report @@ -490,11 +490,11 @@ {% endfor %}
- More comments + More comments
{% elif replies %}
- More comments + More comments
{% endif %} {% endif %} @@ -525,7 +525,7 @@ Copy link - Context + Context Report diff --git a/files/templates/default.html b/files/templates/default.html index 711ac3b03..52c5041c0 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -205,7 +205,7 @@ - + {% endif %} {% endblock %} diff --git a/files/templates/header.html b/files/templates/header.html index 0fb96a491..277031b73 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -7,7 +7,7 @@ diff --git a/files/templates/submission_banned.html b/files/templates/submission_banned.html index 03cc544ac..9b3c87ad4 100644 --- a/files/templates/submission_banned.html +++ b/files/templates/submission_banned.html @@ -86,7 +86,7 @@
-
+
{% if p.club %}{{cc}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}} @@ -208,7 +208,7 @@ {% endif %}
  • - + {{p.comment_count}} @@ -301,7 +301,7 @@