iridium/redsunlib
iridium/redsunlib
2
2
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Merge pull request #787 from libreddit/clippy_refactor

Browse Source
This commit is contained in:
Matthew Esposito 2023-04-19 13:08:44 -04:00 committed by GitHub
commit ac58bb532a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/post.rs
View File

@ -72,7 +72,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
} }
let query = match COMMENT_SEARCH_CAPTURE.captures(&url) { let query = match COMMENT_SEARCH_CAPTURE.captures(&url) {
Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace("+", " "), Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace('+', " "),
None => String::new(), None => String::new(),
}; };
@ -154,7 +154,7 @@ fn query_comments(
results results
} }
#[allow(clippy::too_many_arguments)]
fn build_comment( fn build_comment(
comment: &serde_json::Value, comment: &serde_json::Value,
data: &serde_json::Value, data: &serde_json::Value,
@ -165,15 +165,15 @@ fn build_comment(
filters: &HashSet<String>, filters: &HashSet<String>,
req: &Request<Body>, req: &Request<Body>,
) -> Comment { ) -> Comment {
let id = val(&comment, "id"); let id = val(comment, "id");
let body = if (val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]") || val(&comment, "body") == "[ Removed by Reddit ]" { let body = if (val(comment, "author") == "[deleted]" && val(comment, "body") == "[removed]") || val(comment, "body") == "[ Removed by Reddit ]" {
format!( format!(
"<div class=\"md\"><p>[removed] — <a href=\"https://www.unddit.com{}{}\">view removed comment</a></p></div>", "<div class=\"md\"><p>[removed] — <a href=\"https://www.unddit.com{}{}\">view removed comment</a></p></div>",
post_link, id post_link, id
) )
} else { } else {
rewrite_urls(&val(&comment, "body_html")) rewrite_urls(&val(comment, "body_html"))
}; };
let kind = comment["kind"].as_str().unwrap_or_default().to_string(); let kind = comment["kind"].as_str().unwrap_or_default().to_string();
@ -193,24 +193,24 @@ fn build_comment(
let awards: Awards = Awards::parse(&data["all_awardings"]); let awards: Awards = Awards::parse(&data["all_awardings"]);
let parent_kind_and_id = val(&comment, "parent_id"); let parent_kind_and_id = val(comment, "parent_id");
let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>(); let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
let highlighted = id == highlighted_comment; let highlighted = id == highlighted_comment;
let author = Author { let author = Author {
name: val(&comment, "author"), name: val(comment, "author"),
flair: Flair { flair: Flair {
flair_parts: FlairPart::parse( flair_parts: FlairPart::parse(
data["author_flair_type"].as_str().unwrap_or_default(), data["author_flair_type"].as_str().unwrap_or_default(),
data["author_flair_richtext"].as_array(), data["author_flair_richtext"].as_array(),
data["author_flair_text"].as_str(), data["author_flair_text"].as_str(),
), ),
text: val(&comment, "link_flair_text"), text: val(comment, "link_flair_text"),
background_color: val(&comment, "author_flair_background_color"), background_color: val(comment, "author_flair_background_color"),
foreground_color: val(&comment, "author_flair_text_color"), foreground_color: val(comment, "author_flair_text_color"),
}, },
distinguished: val(&comment, "distinguished"), distinguished: val(comment, "distinguished"),
}; };
let is_filtered = filters.contains(&["u_", author.name.as_str()].concat()); let is_filtered = filters.contains(&["u_", author.name.as_str()].concat());
@ -222,7 +222,7 @@ fn build_comment(
let is_stickied = data["stickied"].as_bool().unwrap_or_default(); let is_stickied = data["stickied"].as_bool().unwrap_or_default();
let collapsed = (is_moderator_comment && is_stickied) || is_filtered; let collapsed = (is_moderator_comment && is_stickied) || is_filtered;
return Comment { Comment {
id, id,
kind, kind,
parent_id: parent_info[1].to_string(), parent_id: parent_info[1].to_string(),
@ -245,6 +245,6 @@ fn build_comment(
collapsed, collapsed,
is_filtered, is_filtered,
more_count, more_count,
prefs: Preferences::new(&req), prefs: Preferences::new(req),
}; }
} }

4
src/utils.rs
View File

@ -965,9 +965,9 @@ pub fn sfw_only() -> bool {
} }
// Determines if a request shoud redirect to a nsfw landing gate. // Determines if a request shoud redirect to a nsfw landing gate.
pub fn should_be_nsfw_gated(req: &Request<Body>, req_url: &String) -> bool { pub fn should_be_nsfw_gated(req: &Request<Body>, req_url: &str) -> bool {
let sfw_instance = sfw_only(); let sfw_instance = sfw_only();
let gate_nsfw = (setting(&req, "show_nsfw") != "on") || sfw_instance; let gate_nsfw = (setting(req, "show_nsfw") != "on") || sfw_instance;
// Nsfw landing gate should not be bypassed on a sfw only instance, // Nsfw landing gate should not be bypassed on a sfw only instance,
let bypass_gate = !sfw_instance && req_url.contains("&bypass_nsfw_landing"); let bypass_gate = !sfw_instance && req_url.contains("&bypass_nsfw_landing");