|
|
@@ -8,6 +8,8 @@ use crate::utils::{
|
|
|
use hyper::{Body, Request, Response};
|
|
|
|
|
|
use askama::Template;
|
|
|
+use once_cell::sync::Lazy;
|
|
|
+use regex::Regex;
|
|
|
use std::collections::HashSet;
|
|
|
|
|
|
// STRUCTS
|
|
|
@@ -20,13 +22,18 @@ struct PostTemplate {
|
|
|
prefs: Preferences,
|
|
|
single_thread: bool,
|
|
|
url: String,
|
|
|
+ url_without_query: String,
|
|
|
+ comment_query: String,
|
|
|
}
|
|
|
|
|
|
+static COMMENT_SEARCH_CAPTURE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\?q=(.*)&type=comment"#).unwrap());
|
|
|
+
|
|
|
pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
|
|
|
// Build Reddit API path
|
|
|
let mut path: String = format!("{}.json?{}&raw_json=1", req.uri().path(), req.uri().query().unwrap_or_default());
|
|
|
let sub = req.param("sub").unwrap_or_default();
|
|
|
let quarantined = can_access_quarantine(&req, &sub);
|
|
|
+ let url = req.uri().to_string();
|
|
|
|
|
|
// Set sort to sort query parameter
|
|
|
let sort = param(&path, "sort").unwrap_or_else(|| {
|
|
|
@@ -63,17 +70,26 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
|
|
|
return Ok(nsfw_landing(req).await.unwrap_or_default());
|
|
|
}
|
|
|
|
|
|
- let comments = parse_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &req);
|
|
|
- let url = req.uri().to_string();
|
|
|
+ let query = match COMMENT_SEARCH_CAPTURE.captures(&url) {
|
|
|
+ Some(captures) => captures.get(1).unwrap().as_str().replace("%20", " ").replace("+", " "),
|
|
|
+ None => String::new(),
|
|
|
+ };
|
|
|
+
|
|
|
+ let comments = match query.as_str() {
|
|
|
+ "" => parse_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &req),
|
|
|
+ _ => query_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &query, &req),
|
|
|
+ };
|
|
|
|
|
|
// Use the Post and Comment structs to generate a website to show users
|
|
|
template(PostTemplate {
|
|
|
comments,
|
|
|
post,
|
|
|
+ url_without_query: url.clone().trim_end_matches(&format!("?q={query}&type=comment")).to_string(),
|
|
|
sort,
|
|
|
prefs: Preferences::new(&req),
|
|
|
single_thread,
|
|
|
url,
|
|
|
+ comment_query: query,
|
|
|
})
|
|
|
}
|
|
|
// If the Reddit API returns an error, exit and send error page to user
|
|
|
@@ -88,7 +104,8 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, String> {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// COMMENTS
|
|
|
+/* COMMENTS */
|
|
|
+
|
|
|
fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet<String>, req: &Request<Body>) -> Vec<Comment> {
|
|
|
// Parse the comment JSON into a Vector of Comments
|
|
|
let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned);
|
|
|
@@ -97,96 +114,136 @@ fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str,
|
|
|
comments
|
|
|
.into_iter()
|
|
|
.map(|comment| {
|
|
|
- let kind = comment["kind"].as_str().unwrap_or_default().to_string();
|
|
|
let data = &comment["data"];
|
|
|
-
|
|
|
- let unix_time = data["created_utc"].as_f64().unwrap_or_default();
|
|
|
- let (rel_time, created) = time(unix_time);
|
|
|
-
|
|
|
- let edited = data["edited"].as_f64().map_or((String::new(), String::new()), time);
|
|
|
-
|
|
|
- let score = data["score"].as_i64().unwrap_or(0);
|
|
|
-
|
|
|
- // The JSON API only provides comments up to some threshold.
|
|
|
- // Further comments have to be loaded by subsequent requests.
|
|
|
- // The "kind" value will be "more" and the "count"
|
|
|
- // shows how many more (sub-)comments exist in the respective nesting level.
|
|
|
- // Note that in certain (seemingly random) cases, the count is simply wrong.
|
|
|
- let more_count = data["count"].as_i64().unwrap_or_default();
|
|
|
-
|
|
|
- // If this comment contains replies, handle those too
|
|
|
let replies: Vec<Comment> = if data["replies"].is_object() {
|
|
|
parse_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, req)
|
|
|
} else {
|
|
|
- Vec::new()
|
|
|
+ Vec::with_capacity(0)
|
|
|
};
|
|
|
+ build_comment(&comment, data, replies, post_link, post_author, highlighted_comment, filters, req)
|
|
|
+ })
|
|
|
+ .collect()
|
|
|
+}
|
|
|
|
|
|
- let awards: Awards = Awards::parse(&data["all_awardings"]);
|
|
|
+fn query_comments(
|
|
|
+ json: &serde_json::Value,
|
|
|
+ post_link: &str,
|
|
|
+ post_author: &str,
|
|
|
+ highlighted_comment: &str,
|
|
|
+ filters: &HashSet<String>,
|
|
|
+ query: &str,
|
|
|
+ req: &Request<Body>,
|
|
|
+) -> Vec<Comment> {
|
|
|
+ let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned);
|
|
|
+ let mut results = Vec::new();
|
|
|
|
|
|
- let parent_kind_and_id = val(&comment, "parent_id");
|
|
|
- let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
|
|
|
+ comments.into_iter().for_each(|comment| {
|
|
|
+ let data = &comment["data"];
|
|
|
|
|
|
- let id = val(&comment, "id");
|
|
|
- let highlighted = id == highlighted_comment;
|
|
|
+ // If this comment contains replies, handle those too
|
|
|
+ if data["replies"].is_object() {
|
|
|
+ results.append(&mut query_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, query, req))
|
|
|
+ }
|
|
|
|
|
|
- let body = if (val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]") || val(&comment, "body") == "[ Removed by Reddit ]" {
|
|
|
- format!(
|
|
|
- "<div class=\"md\"><p>[removed] — <a href=\"https://www.unddit.com{}{}\">view removed comment</a></p></div>",
|
|
|
- post_link, id
|
|
|
- )
|
|
|
- } else {
|
|
|
- rewrite_urls(&val(&comment, "body_html"))
|
|
|
- };
|
|
|
+ let c = build_comment(&comment, data, Vec::with_capacity(0), post_link, post_author, highlighted_comment, filters, req);
|
|
|
+ if c.body.to_lowercase().contains(&query.to_lowercase()) {
|
|
|
+ results.push(c);
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
- let author = Author {
|
|
|
- name: val(&comment, "author"),
|
|
|
- flair: Flair {
|
|
|
- flair_parts: FlairPart::parse(
|
|
|
- data["author_flair_type"].as_str().unwrap_or_default(),
|
|
|
- data["author_flair_richtext"].as_array(),
|
|
|
- data["author_flair_text"].as_str(),
|
|
|
- ),
|
|
|
- text: val(&comment, "link_flair_text"),
|
|
|
- background_color: val(&comment, "author_flair_background_color"),
|
|
|
- foreground_color: val(&comment, "author_flair_text_color"),
|
|
|
- },
|
|
|
- distinguished: val(&comment, "distinguished"),
|
|
|
- };
|
|
|
- let is_filtered = filters.contains(&["u_", author.name.as_str()].concat());
|
|
|
-
|
|
|
- // Many subreddits have a default comment posted about the sub's rules etc.
|
|
|
- // Many libreddit users do not wish to see this kind of comment by default.
|
|
|
- // Reddit does not tell us which users are "bots", so a good heuristic is to
|
|
|
- // collapse stickied moderator comments.
|
|
|
- let is_moderator_comment = data["distinguished"].as_str().unwrap_or_default() == "moderator";
|
|
|
- let is_stickied = data["stickied"].as_bool().unwrap_or_default();
|
|
|
- let collapsed = (is_moderator_comment && is_stickied) || is_filtered;
|
|
|
-
|
|
|
- Comment {
|
|
|
- id,
|
|
|
- kind,
|
|
|
- parent_id: parent_info[1].to_string(),
|
|
|
- parent_kind: parent_info[0].to_string(),
|
|
|
- post_link: post_link.to_string(),
|
|
|
- post_author: post_author.to_string(),
|
|
|
- body,
|
|
|
- author,
|
|
|
- score: if data["score_hidden"].as_bool().unwrap_or_default() {
|
|
|
- ("\u{2022}".to_string(), "Hidden".to_string())
|
|
|
- } else {
|
|
|
- format_num(score)
|
|
|
- },
|
|
|
- rel_time,
|
|
|
- created,
|
|
|
- edited,
|
|
|
- replies,
|
|
|
- highlighted,
|
|
|
- awards,
|
|
|
- collapsed,
|
|
|
- is_filtered,
|
|
|
- more_count,
|
|
|
- prefs: Preferences::new(req),
|
|
|
- }
|
|
|
- })
|
|
|
- .collect()
|
|
|
+ results
|
|
|
+}
|
|
|
+
|
|
|
+fn build_comment(
|
|
|
+ comment: &serde_json::Value,
|
|
|
+ data: &serde_json::Value,
|
|
|
+ replies: Vec<Comment>,
|
|
|
+ post_link: &str,
|
|
|
+ post_author: &str,
|
|
|
+ highlighted_comment: &str,
|
|
|
+ filters: &HashSet<String>,
|
|
|
+ req: &Request<Body>,
|
|
|
+) -> Comment {
|
|
|
+ let id = val(&comment, "id");
|
|
|
+
|
|
|
+ let body = if (val(&comment, "author") == "[deleted]" && val(&comment, "body") == "[removed]") || val(&comment, "body") == "[ Removed by Reddit ]" {
|
|
|
+ format!(
|
|
|
+ "<div class=\"md\"><p>[removed] — <a href=\"https://www.unddit.com{}{}\">view removed comment</a></p></div>",
|
|
|
+ post_link, id
|
|
|
+ )
|
|
|
+ } else {
|
|
|
+ rewrite_urls(&val(&comment, "body_html"))
|
|
|
+ };
|
|
|
+ let kind = comment["kind"].as_str().unwrap_or_default().to_string();
|
|
|
+
|
|
|
+ let unix_time = data["created_utc"].as_f64().unwrap_or_default();
|
|
|
+ let (rel_time, created) = time(unix_time);
|
|
|
+
|
|
|
+ let edited = data["edited"].as_f64().map_or((String::new(), String::new()), time);
|
|
|
+
|
|
|
+ let score = data["score"].as_i64().unwrap_or(0);
|
|
|
+
|
|
|
+ // The JSON API only provides comments up to some threshold.
|
|
|
+ // Further comments have to be loaded by subsequent requests.
|
|
|
+ // The "kind" value will be "more" and the "count"
|
|
|
+ // shows how many more (sub-)comments exist in the respective nesting level.
|
|
|
+ // Note that in certain (seemingly random) cases, the count is simply wrong.
|
|
|
+ let more_count = data["count"].as_i64().unwrap_or_default();
|
|
|
+
|
|
|
+ let awards: Awards = Awards::parse(&data["all_awardings"]);
|
|
|
+
|
|
|
+ let parent_kind_and_id = val(&comment, "parent_id");
|
|
|
+ let parent_info = parent_kind_and_id.split('_').collect::<Vec<&str>>();
|
|
|
+
|
|
|
+ let highlighted = id == highlighted_comment;
|
|
|
+
|
|
|
+ let author = Author {
|
|
|
+ name: val(&comment, "author"),
|
|
|
+ flair: Flair {
|
|
|
+ flair_parts: FlairPart::parse(
|
|
|
+ data["author_flair_type"].as_str().unwrap_or_default(),
|
|
|
+ data["author_flair_richtext"].as_array(),
|
|
|
+ data["author_flair_text"].as_str(),
|
|
|
+ ),
|
|
|
+ text: val(&comment, "link_flair_text"),
|
|
|
+ background_color: val(&comment, "author_flair_background_color"),
|
|
|
+ foreground_color: val(&comment, "author_flair_text_color"),
|
|
|
+ },
|
|
|
+ distinguished: val(&comment, "distinguished"),
|
|
|
+ };
|
|
|
+ let is_filtered = filters.contains(&["u_", author.name.as_str()].concat());
|
|
|
+
|
|
|
+ // Many subreddits have a default comment posted about the sub's rules etc.
|
|
|
+ // Many libreddit users do not wish to see this kind of comment by default.
|
|
|
+ // Reddit does not tell us which users are "bots", so a good heuristic is to
|
|
|
+ // collapse stickied moderator comments.
|
|
|
+ let is_moderator_comment = data["distinguished"].as_str().unwrap_or_default() == "moderator";
|
|
|
+ let is_stickied = data["stickied"].as_bool().unwrap_or_default();
|
|
|
+ let collapsed = (is_moderator_comment && is_stickied) || is_filtered;
|
|
|
+
|
|
|
+ return Comment {
|
|
|
+ id,
|
|
|
+ kind,
|
|
|
+ parent_id: parent_info[1].to_string(),
|
|
|
+ parent_kind: parent_info[0].to_string(),
|
|
|
+ post_link: post_link.to_string(),
|
|
|
+ post_author: post_author.to_string(),
|
|
|
+ body,
|
|
|
+ author,
|
|
|
+ score: if data["score_hidden"].as_bool().unwrap_or_default() {
|
|
|
+ ("\u{2022}".to_string(), "Hidden".to_string())
|
|
|
+ } else {
|
|
|
+ format_num(score)
|
|
|
+ },
|
|
|
+ rel_time,
|
|
|
+ created,
|
|
|
+ edited,
|
|
|
+ replies,
|
|
|
+ highlighted,
|
|
|
+ awards,
|
|
|
+ collapsed,
|
|
|
+ is_filtered,
|
|
|
+ more_count,
|
|
|
+ prefs: Preferences::new(&req),
|
|
|
+ };
|
|
|
}
|
gmnsii