From 5a359ede50e3e6b2ff7a5cd6811f043917a65569 Mon Sep 17 00:00:00 2001
From: sigaloid <69441971+sigaloid@users.noreply.github.com>
Date: Mon, 16 May 2022 16:38:32 -0400
Subject: [PATCH] Change "any NSFW post" warning to "all NSFW post" warning
---
src/search.rs | 10 +++++-----
src/subreddit.rs | 12 ++++++------
src/user.rs | 10 +++++-----
templates/search.html | 4 ++--
templates/subreddit.html | 4 ++--
templates/user.html | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/search.rs b/src/search.rs
index fd1fbaf..d096bfe 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -42,8 +42,8 @@ struct SearchTemplate {
/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
/// and all fetched posts being filtered).
all_posts_filtered: bool,
- /// Whether any posts were hidden because they are NSFW (and user has disabled show NSFW)
- any_posts_hidden_nsfw: bool,
+ /// Whether all posts were hidden because they are NSFW (and user has disabled show NSFW)
+ all_posts_hidden_nsfw: bool,
}
// SERVICES
@@ -102,13 +102,13 @@ pub async fn find(req: Request
) -> Result, String> {
url,
is_filtered: true,
all_posts_filtered: false,
- any_posts_hidden_nsfw: false,
+ all_posts_hidden_nsfw: false,
})
} else {
match Post::fetch(&path, quarantined).await {
Ok((mut posts, after)) => {
let all_posts_filtered = filter_posts(&mut posts, &filters);
- let any_posts_hidden_nsfw = posts.iter().any(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
+ let all_posts_hidden_nsfw = posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
template(SearchTemplate {
posts,
subreddits,
@@ -126,7 +126,7 @@ pub async fn find(req: Request) -> Result, String> {
url,
is_filtered: false,
all_posts_filtered,
- any_posts_hidden_nsfw,
+ all_posts_hidden_nsfw,
})
}
Err(msg) => {
diff --git a/src/subreddit.rs b/src/subreddit.rs
index 0f3871e..ed4dde4 100644
--- a/src/subreddit.rs
+++ b/src/subreddit.rs
@@ -25,8 +25,8 @@ struct SubredditTemplate {
/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
/// and all fetched posts being filtered).
all_posts_filtered: bool,
- /// Whether any posts were hidden because they are NSFW (and user has disabled show NSFW)
- any_posts_hidden_nsfw: bool,
+ /// Whether all posts were hidden because they are NSFW (and user has disabled show NSFW)
+ all_posts_hidden_nsfw: bool,
}
#[derive(Template)]
@@ -99,7 +99,7 @@ pub async fn community(req: Request) -> Result, String> {
let path = format!("/r/{}/{}.json?{}&raw_json=1", sub_name.clone(), sort, req.uri().query().unwrap_or_default());
let url = String::from(req.uri().path_and_query().map_or("", |val| val.as_str()));
- let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26").replace('+',"%2B");
+ let redirect_url = url[1..].replace('?', "%3F").replace('&', "%26").replace('+', "%2B");
let filters = get_filters(&req);
// If all requested subs are filtered, we don't need to fetch posts.
@@ -114,13 +114,13 @@ pub async fn community(req: Request) -> Result, String> {
redirect_url,
is_filtered: true,
all_posts_filtered: false,
- any_posts_hidden_nsfw: false,
+ all_posts_hidden_nsfw: false,
})
} else {
match Post::fetch(&path, quarantined).await {
Ok((mut posts, after)) => {
let all_posts_filtered = filter_posts(&mut posts, &filters);
- let any_posts_hidden_nsfw = posts.iter().any(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
+ let all_posts_hidden_nsfw = posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
template(SubredditTemplate {
sub,
posts,
@@ -131,7 +131,7 @@ pub async fn community(req: Request) -> Result, String> {
redirect_url,
is_filtered: false,
all_posts_filtered,
- any_posts_hidden_nsfw,
+ all_posts_hidden_nsfw,
})
}
Err(msg) => match msg.as_str() {
diff --git a/src/user.rs b/src/user.rs
index 27c6c06..25d4d86 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -25,8 +25,8 @@ struct UserTemplate {
/// Whether all fetched posts are filtered (to differentiate between no posts fetched in the first place,
/// and all fetched posts being filtered).
all_posts_filtered: bool,
- /// Whether any posts were hidden because they are NSFW (and user has disabled show NSFW)
- any_posts_hidden_nsfw: bool,
+ /// Whether all posts were hidden because they are NSFW (and user has disabled show NSFW)
+ all_posts_hidden_nsfw: bool,
}
// FUNCTIONS
@@ -61,14 +61,14 @@ pub async fn profile(req: Request) -> Result, String> {
redirect_url,
is_filtered: true,
all_posts_filtered: false,
- any_posts_hidden_nsfw: false,
+ all_posts_hidden_nsfw: false,
})
} else {
// Request user posts/comments from Reddit
match Post::fetch(&path, false).await {
Ok((mut posts, after)) => {
let all_posts_filtered = filter_posts(&mut posts, &filters);
- let any_posts_hidden_nsfw = posts.iter().any(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
+ let all_posts_hidden_nsfw = posts.iter().all(|p| p.flags.nsfw) && setting(&req, "show_nsfw") != "on";
template(UserTemplate {
user,
posts,
@@ -80,7 +80,7 @@ pub async fn profile(req: Request) -> Result, String> {
redirect_url,
is_filtered: false,
all_posts_filtered,
- any_posts_hidden_nsfw,
+ all_posts_hidden_nsfw,
})
}
// If there is an error show error page
diff --git a/templates/search.html b/templates/search.html
index f12191d..4b04717 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -57,8 +57,8 @@
{% endif %}
{% endif %}
- {% if any_posts_hidden_nsfw %}
- Some posts were hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
+ {% if all_posts_hidden_nsfw %}
+ All posts are hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
{% endif %}
{% if all_posts_filtered %}
diff --git a/templates/subreddit.html b/templates/subreddit.html
index c626ba8..1a5e43e 100644
--- a/templates/subreddit.html
+++ b/templates/subreddit.html
@@ -46,8 +46,8 @@
{% endif %}
- {% if any_posts_hidden_nsfw %}
- Some posts were hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
+ {% if all_posts_hidden_nsfw %}
+ All posts are hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
{% endif %}
{% if all_posts_filtered %}
diff --git a/templates/user.html b/templates/user.html
index 2a4e9d9..2399c37 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -32,8 +32,8 @@
- {% if any_posts_hidden_nsfw %}
- Some posts were hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
+ {% if all_posts_hidden_nsfw %}
+ All posts are hidden because they are NSFW. Enable "Show NSFW posts" in settings to view.
{% endif %}
{% if all_posts_filtered %}