From 20f925afb72ea4475c337f6a50270c34f39bec43 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 28 Apr 2022 01:09:39 +0200
Subject: [PATCH] fds

---
 files/routes/posts.py                    |  7 +------
 files/templates/post_actions.html        |  6 ++----
 files/templates/post_actions_mobile.html |  6 ++----
 files/templates/settings_profile.html    |  2 +-
 files/templates/submit.html              | 10 ++++------
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index fed793592..857059662 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -42,9 +42,7 @@ titleheaders = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWe
 @auth_required
 def toggle_club(pid, v):
 
-	if v.club_allowed == False: abort(403)
 	post = get_post(pid)
-	if v.admin_level < 2: abort(403)
 
 	post.club = not post.club
 	g.db.add(post)
@@ -1096,10 +1094,7 @@ def submit_post(v, sub=None):
 
 	if len(body_html) > 40000: return error("Submission body_html too long! (max 40k characters)")
 
-
-
-	if request.host == 'rdrama.net' and v.admin_level < 2: club = False
-	else: club = bool(request.values.get("club",""))
+	club = bool(request.values.get("club",""))
 	
 	if embed and len(embed) > 1500: embed = None
 
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index 25f50ca81..b45b6649a 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -50,10 +50,8 @@
 				<a id="unpin-{{p.id}}" class="dropdown-item {% if not p.stickied %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast2(this,'/unsticky/{{p.id}}','pin-{{p.id}}','unpin-{{p.id}}')"><i class="fas fa-thumbtack fa-rotate--45"></i>Unpin</a>
 			{% endif %}
 
-			{% if v.admin_level > 1 or v.id == p.author.id and request.host != 'rdrama.net' %}
-				<a id="club-{{p.id}}" class="dropdown-item {% if p.club %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye-slash"></i>Mark club</a>
-				<a id="unclub-{{p.id}}" class="dropdown-item {% if not p.club %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
-			{% endif %}
+			<a id="club-{{p.id}}" class="dropdown-item {% if p.club %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye-slash"></i>Mark club</a>
+			<a id="unclub-{{p.id}}" class="dropdown-item {% if not p.club %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
 
 			{% if v.admin_level > 1 %}
 				{% if "/reported/" in request.path %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index c461c9a9d..782a591b6 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -38,10 +38,8 @@
 	<button id="delete-{{p.id}}" class="{% if p.deleted_utc %}d-none{% endif %}  nobackground btn btn-link btn-block btn-lg text-left text-danger" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#deletePostModal" onclick="delete_postModal('{{p.id}}')"><i class="far fa-trash-alt mr-3"></i>Delete</button>
 
 
-	{% if request.host != 'rdrama.net' or v.admin_level > 1 %}
-		<button id="club3-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club3-{{p.id}}','unclub3-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-3"></i>Mark club</button>
-		<button id="unclub3-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club3-{{p.id}}','unclub3-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye mr-3"></i>Unmark club</button>
-	{% endif %}
+	<button id="club3-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club3-{{p.id}}','unclub3-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-3"></i>Mark club</button>
+	<button id="unclub3-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-success text-left" role="button" onclick="post_toast2(this,'/toggle_club/{{p.id}}','club3-{{p.id}}','unclub3-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye mr-3"></i>Unmark club</button>
 
 	<button id="mark3-{{p.id}}" class="{% if p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2(this,'/toggle_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center mr-3"></i>Mark +18</button>
 	<button id="unmark3-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" onclick="post_toast2(this,'/toggle_post_nsfw/{{p.id}}','mark3-{{p.id}}','unmark3-{{p.id}}')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center mr-3"></i>Unmark +18</button>
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 927c75440..2397cc864 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -709,7 +709,7 @@
 </div>
 
 
-<script src="/assets/js/settings_profile.js?v=250"></script>
+<script src="/assets/js/settings_profile.js?v=251"></script>
 
 {% include "emoji_modal.html" %}
 {% include "gif_modal.html" %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 1084cec71..3ae5b075c 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -179,12 +179,10 @@
 														<label class="custom-control-label" for="private">Draft</label>
 												</div>
 
-												{% if request.host != 'rdrama.net' or v.admin_level > 1 %}
-													<div class="custom-control custom-checkbox">
-														<input autocomplete="off" type="checkbox" class="custom-control-input" id="club" name="club">
-														<label class="custom-control-label" for="club">{{CC_TITLE}} thread</label>
-													</div>
-												{% endif %}
+												<div class="custom-control custom-checkbox">
+													<input autocomplete="off" type="checkbox" class="custom-control-input" id="club" name="club">
+													<label class="custom-control-label" for="club">{{CC_TITLE}} thread</label>
+												</div>
 
 												<div class="custom-control custom-checkbox">
 														<input onchange='draft(this);' autocomplete="off" type="checkbox" class="custom-control-input" id="ghost" name="ghost" {% if v.coins < 100 %}disabled{% endif %}>