From 399d32eaf5cd00e6daebac2b9e69811d34e02d03 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Wed, 8 Feb 2023 08:22:11 +0200
Subject: [PATCH] extend usage of features['NSFW_MARKING']

---
 files/assets/js/submit.js   |  9 +++++++--
 files/routes/posts.py       |  2 +-
 files/templates/search.html | 10 ++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js
index 92b4eab07..d1db4538c 100644
--- a/files/assets/js/submit.js
+++ b/files/assets/js/submit.js
@@ -6,7 +6,10 @@ document.getElementById('post-url').value = localStorage.getItem("post-url")
 
 document.getElementById('post-notify').checked = localStorage.getItem("post-notify") == 'true'
 document.getElementById('post-new').checked = localStorage.getItem("post-new") == 'true'
-document.getElementById('post-nsfw').checked = localStorage.getItem("post-nsfw") == 'true'
+const postnsfw = document.getElementById('post-nsfw')
+if (postnsfw) {
+    postnsfw.checked = localStorage.getItem("post-nsfw") == 'true'
+}
 document.getElementById('post-private').checked = localStorage.getItem("post-private") == 'true'
 document.getElementById('post-ghost').checked = localStorage.getItem("post-ghost") == 'true'
 
@@ -120,7 +123,9 @@ function savetext() {
 
 	localStorage.setItem("post-notify", document.getElementById('post-notify').checked)
 	localStorage.setItem("post-new", document.getElementById('post-new').checked)
-	localStorage.setItem("post-nsfw", document.getElementById('post-nsfw').checked)
+    if (postnsfw) {
+        localStorage.setItem("post-nsfw", document.getElementById('post-nsfw').checked)
+    }
 	localStorage.setItem("post-private", document.getElementById('post-private').checked)
 	localStorage.setItem("post-ghost", document.getElementById('post-ghost').checked)
 }
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 222546b11..84af0c3ad 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -674,7 +674,7 @@ def submit_post(v:User, sub=None):
 
 	flag_notify = (request.values.get("notify", "on") == "on")
 	flag_new = request.values.get("new", False, bool) or 'megathread' in title.lower()
-	flag_over_18 = request.values.get("over_18", False, bool)
+	flag_over_18 = FEATURES['NSFW_MARKING'] and request.values.get("over_18", False, bool)
 	flag_private = request.values.get("private", False, bool)
 	flag_ghost = request.values.get("ghost", False, bool) and v.can_post_in_ghost_threads
 
diff --git a/files/templates/search.html b/files/templates/search.html
index 57e7671ad..34b8bcc7e 100644
--- a/files/templates/search.html
+++ b/files/templates/search.html
@@ -41,10 +41,12 @@
 									<div style="display: inline-block; width: 150px; text-align: center;">Domain:</div>
 									<button type="button" data-nonce="{{g.nonce}}" data-onclick="addParam()" class="searchparam mb-1">domain:reddit.com</button>
 								</div>
-								<div>
-									<div style="display: inline-block; width: 150px; text-align: center;">NSFW:</div>
-									<button type="button" data-nonce="{{g.nonce}}" data-onclick="addParam()" class="searchparam mb-1">over18:true</button>
-								</div>
+								{% if FEATURES['NSFW_MARKING'] %}
+									<div>
+										<div style="display: inline-block; width: 150px; text-align: center;">NSFW:</div>
+										<button type="button" data-nonce="{{g.nonce}}" data-onclick="addParam()" class="searchparam mb-1">over18:true</button>
+									</div>
+								{% endif %}
 								<div>
 									<div style="display: inline-block; width: 150px; text-align: center;">{{HOLE_NAME | capitalize }}:</div>
 									<button type="button" data-nonce="{{g.nonce}}" data-onclick="addParam()" class="searchparam mb-1">{{HOLE_NAME}}:music</button>