From 7de98572070571d1dbfee0d84abc29ead1abfd78 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 17 Dec 2021 07:28:04 +0200
Subject: [PATCH] fdfsd

---
 files/routes/posts.py                                         | 4 ++--
 files/templates/CHRISTMAS/modals/ModalSubmissionActions.html  | 2 +-
 .../CHRISTMAS/modals/ModalSubmissionListingActions.html       | 2 +-
 files/templates/CHRISTMAS/submission/SubmissionActions.html   | 2 +-
 .../CHRISTMAS/submission/SubmissionListingActions.html        | 2 +-
 files/templates/CHRISTMAS/submit.html                         | 2 +-
 files/templates/submission.html                               | 4 ++--
 files/templates/submission_listing.html                       | 4 ++--
 files/templates/submit.html                                   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index ea41430be..70ced6043 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -32,8 +32,8 @@ if path.exists(f'snappy_{site_name}.txt'):
 @auth_required
 def toggle_club(pid, v):
 
+	if v.club_banned: abort(403)
 	post = get_post(pid)
-
 	if post.author_id != v.id and v.admin_level == 0: abort(403)
 
 	post.club = not post.club
@@ -943,7 +943,7 @@ def submit_post(v):
 		if request.headers.get("Authorization"): return {"error": reason}, 403
 		else: return render_template("submit.html", v=v, error=reason, title=title, url=url, body=request.values.get("body", "")), 403
 
-	if v.paid_dues: club = bool(request.values.get("club",""))
+	if not v.club_banned: club = bool(request.values.get("club",""))
 	else: club = False
 
 	if embed and len(embed) > 1500: embed = None
diff --git a/files/templates/CHRISTMAS/modals/ModalSubmissionActions.html b/files/templates/CHRISTMAS/modals/ModalSubmissionActions.html
index a36528e0d..e770dc2c3 100644
--- a/files/templates/CHRISTMAS/modals/ModalSubmissionActions.html
+++ b/files/templates/CHRISTMAS/modals/ModalSubmissionActions.html
@@ -93,7 +93,7 @@
 						</button>
 					</li>
 
-					{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+					{% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %}
 					<li id="club2-{{p.id}}" class="{% if p.club %}hidden{% endif %}">
 						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')">
 							<i class="fas fa-eye-slash fa-fw mr-4"></i>Mark club
diff --git a/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html b/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html
index 3c88e7a17..c2db9c3f6 100644
--- a/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html
+++ b/files/templates/CHRISTMAS/modals/ModalSubmissionListingActions.html
@@ -96,7 +96,7 @@
 						</button>
 					</li>
 
-					{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+					{% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %}
 					<li id="club2-{{p.id}}" class="{% if p.club %}hidden{% endif %}">
 						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')">
 							<i class="fas fa-eye-slash fa-fw mr-4"></i>Mark club
diff --git a/files/templates/CHRISTMAS/submission/SubmissionActions.html b/files/templates/CHRISTMAS/submission/SubmissionActions.html
index c7ddc9114..a10e412cd 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionActions.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionActions.html
@@ -156,7 +156,7 @@
 				{% endif %}
 				{% if v %}
 				<!-- Requires auth and admin and author -->
-				{% if v.admin_level >=3 or v.id == p.author.id and v.paid_dues %}
+				{% if v.admin_level >=3 or v.id == p.author.id and not v.club_banned %}
 				<li>
 					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
 				</li>
diff --git a/files/templates/CHRISTMAS/submission/SubmissionListingActions.html b/files/templates/CHRISTMAS/submission/SubmissionListingActions.html
index c7e2946ab..1a6190688 100644
--- a/files/templates/CHRISTMAS/submission/SubmissionListingActions.html
+++ b/files/templates/CHRISTMAS/submission/SubmissionListingActions.html
@@ -49,7 +49,7 @@
 	{% endif %}
 
 	{% if v %}
-	{% if v.admin_level >=3 or v.id == p.author.id and v.paid_dues %}
+	{% if v.admin_level >=3 or v.id == p.author.id and not v.club_banned %}
 	<a id="club-{{p.id}}" class="{% if p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/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="{% if not p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
 	{% endif %}
diff --git a/files/templates/CHRISTMAS/submit.html b/files/templates/CHRISTMAS/submit.html
index 5c94c0614..4cdc63788 100644
--- a/files/templates/CHRISTMAS/submit.html
+++ b/files/templates/CHRISTMAS/submit.html
@@ -144,7 +144,7 @@
 			<input type="checkbox" id="privateCheck-mobile" name="private" form="submitform">
 			<label class="leading-4 ml-2 inline-blue badge badge-blue select-nonee" for="privateCheck">Draft</label>
 		</li>
-		{% if v.paid_dues %}
+		{% if not v.club_banned %}
 		<li class="flex items-center">
 			<input type="checkbox" id="clubCheck-mobile" name="club" form="submitform">
 			<label class="leading-4 ml-2 inline-block badge badge-yellow select-none" for="clubCheck">Country Club Thread</label>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 4d85a48f3..082b5492f 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -219,7 +219,7 @@
 							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-3"></i>Edit</button>
 						{% endif %}
 
-						{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+						{% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %}
 							<button id="club2-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-3"></i>Mark club</button>
 							<button id="unclub2-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye mr-3"></i>Unmark club</button>
 						{% endif %}
@@ -545,7 +545,7 @@
 						{% endif %}
 
 						{% if v %}
-							{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+							{% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %}
 								<a id="club-{{p.id}}" class="{% if p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/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="{% if not p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
 							{% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index e96098dc3..923396c54 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -250,7 +250,7 @@
 						{% endif %}
 
 						{% if v %}
-							{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+							{% if v.admin_level > 1 or v.id == p.author.id and not v.club_banned %}
 								<a id="club-{{p.id}}" class="{% if p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/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="{% if not p.club %}d-none{% endif %} list-inline-item text-info" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club-{{p.id}}','unclub-{{p.id}}')"><i class="fas fa-eye"></i>Unmark club</a>
 							{% endif %}
@@ -406,7 +406,7 @@
 						<button id="save2-{{p.id}}" class="{% if p.id in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/save_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Save</button>
 						<button id="unsave2-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast2('/unsave_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Unsave</button>
 
-						{% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
+						{% if v.admin_level > 1 or v.id == p.author.id not v.club_banned %}
 							<button id="club2-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-3"></i>Mark club</button>
 							<button id="unclub2-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" href="javascript:void(0)" onclick="post_toast2('/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye mr-3"></i>Unmark club</button>
 						{% endif %}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 272360b26..4fc7f89d6 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -138,7 +138,7 @@
 														<label class="custom-control-label" for="privateCheck">Draft</label>
 												</div>
 
-												{% if v.paid_dues %}
+												{% if not v.club_banned %}
 													<div class="custom-control custom-checkbox">
 														<input type="checkbox" class="custom-control-input" id="clubCheck" name="club">
 														<label class="custom-control-label" for="clubCheck">{{cc}} thread</label>