Hide NSFW content by default

src/search.rs

@@ -33,7 +33,7 @@ struct SearchTemplate {
 
 // SERVICES
 pub async fn find(req: HttpRequest) -> HttpResponse {
-	let nsfw_results = if cookie(&req, "hide_nsfw") != "on" { "&include_over_18=on" } else { "" };
+	let nsfw_results = if cookie(&req, "show_nsfw") == "on" { "&include_over_18=on" } else { "" };
 	let path = format!("{}.json?{}{}", req.path(), req.query_string(), nsfw_results);
 	let sub = req.match_info().get("sub").unwrap_or("").to_string();
 

src/settings.rs

@@ -18,7 +18,7 @@ pub struct SettingsForm {
 	layout: Option<String>,
 	wide: Option<String>,
 	comment_sort: Option<String>,
-	hide_nsfw: Option<String>,
+	show_nsfw: Option<String>,
 }
 
 // FUNCTIONS
@@ -33,8 +33,8 @@ pub async fn get(req: HttpRequest) -> HttpResponse {
 pub async fn set(_req: HttpRequest, form: Form<SettingsForm>) -> HttpResponse {
 	let mut res = HttpResponse::Found();
 
-	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "hide_nsfw"];
+	let names = vec!["theme", "front_page", "layout", "wide", "comment_sort", "show_nsfw"];
-	let values = vec![&form.theme, &form.front_page, &form.layout, &form.wide, &form.comment_sort, &form.hide_nsfw];
+	let values = vec![&form.theme, &form.front_page, &form.layout, &form.wide, &form.comment_sort, &form.show_nsfw];
 
 	for (i, name) in names.iter().enumerate() {
 		match values[i] {

src/utils.rs

@@ -127,7 +127,7 @@ pub struct Preferences {
 	pub front_page: String,
 	pub layout: String,
 	pub wide: String,
-	pub hide_nsfw: String,
+	pub show_nsfw: String,
 	pub comment_sort: String,
 	pub subs: Vec<String>,
 }
@@ -143,7 +143,7 @@ pub fn prefs(req: HttpRequest) -> Preferences {
 		front_page: cookie(&req, "front_page"),
 		layout: cookie(&req, "layout"),
 		wide: cookie(&req, "wide"),
-		hide_nsfw: cookie(&req, "hide_nsfw"),
+		show_nsfw: cookie(&req, "show_nsfw"),
 		comment_sort: cookie(&req, "comment_sort"),
 		subs: cookie(&req, "subscriptions").split('+').map(String::from).filter(|s| s != "").collect(),
 	}

templates/search.html

@@ -46,7 +46,7 @@
 		{%  endif %}
 		{% for post in posts %}
 
-		{% if post.flags.nsfw && prefs.hide_nsfw == "on" %}
+		{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
 		{% else if post.title != "Comment" %}
 		<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
 			<p class="post_header">

templates/settings.html

@@ -42,9 +42,9 @@
 					{% call utils::options(prefs.comment_sort, ["confidence", "top", "new", "controversial", "old"], "confidence") %}
 				</select>
 			</div>
-			<div id="hide_nsfw">
+			<div id="show_nsfw">
-				<label for="hide_nsfw">Hide NSFW posts:</label>
+				<label for="show_nsfw">Show NSFW posts:</label>
-				<input type="checkbox" name="hide_nsfw" {% if prefs.hide_nsfw == "on" %}checked{% endif %}>
+				<input type="checkbox" name="show_nsfw" {% if prefs.show_nsfw == "on" %}checked{% endif %}>
 			</div>
 		</div>
 		<p id="settings_note"><b>Note:</b> settings are saved in browser cookies. Clearing your cookie data will reset them.</p>

templates/subreddit.html

@@ -41,7 +41,7 @@
 
 			<div id="posts">
 			{% for post in posts %}
-			{% if !(post.flags.nsfw && prefs.hide_nsfw == "on") %}
+			{% if !(post.flags.nsfw && prefs.show_nsfw != "on") %}
 			<hr class="sep" />
 			<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
 				<p class="post_header">

templates/user.html

@@ -31,7 +31,7 @@
 			<div id="posts">
 			{% for post in posts %}
 
-			{% if post.flags.nsfw && prefs.hide_nsfw == "on" %}
+			{% if post.flags.nsfw && prefs.show_nsfw != "on" %}
 			{% else if post.title != "Comment" %}
 			<div class="post {% if post.flags.stickied %}stickied{% endif %}">	
 				<p class="post_header">