diff --git a/src/config.rs b/src/config.rs index 7b1c95c..268b757 100644 --- a/src/config.rs +++ b/src/config.rs @@ -11,7 +11,7 @@ pub static CONFIG: Lazy = Lazy::new(Config::load); // This serves as the frontend for an archival API - on removed comments, this URL // will be the base of a link, to display removed content (on another site). -pub const DEFAULT_PUSHSHIFT_FRONTEND: &str = "undelete.pullpush.io"; +pub const DEFAULT_PUSHSHIFT_FRONTEND: &str = "ihsoyct.github.io"; /// Stores the configuration parsed from the environment variables and the /// config file. `Config::Default()` contains None for each setting. @@ -267,8 +267,8 @@ fn test_default_filters() { #[test] #[sealed_test] fn test_pushshift() { - let config_to_write = r#"REDLIB_PUSHSHIFT_FRONTEND = "https://api.pushshift.io""#; + let config_to_write = r#"REDLIB_PUSHSHIFT_FRONTEND = "https://ihsoyct.github.io""#; write("redlib.toml", config_to_write).unwrap(); assert!(get_setting("REDLIB_PUSHSHIFT_FRONTEND").is_some()); - assert_eq!(get_setting("REDLIB_PUSHSHIFT_FRONTEND"), Some("https://api.pushshift.io".into())); + assert_eq!(get_setting("REDLIB_PUSHSHIFT_FRONTEND"), Some("https://ihsoyct.github.io".into())); } diff --git a/src/post.rs b/src/post.rs index 20b917d..3704268 100644 --- a/src/post.rs +++ b/src/post.rs @@ -54,7 +54,7 @@ pub async fn item(req: Request) -> Result, String> { // Log the post ID being fetched in debug mode #[cfg(debug_assertions)] - req.param("id").unwrap_or_default(); + let post_id = req.param("id").unwrap_or_default(); let single_thread = req.param("comment_id").is_some(); let highlighted_comment = &req.param("comment_id").unwrap_or_default(); @@ -84,10 +84,11 @@ pub async fn item(req: Request) -> Result, String> { let query = form.get("q").unwrap().clone().to_string(); 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), + "" => parse_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &req, post_id.clone()), + _ => query_comments(&response[1], &post.permalink, &post.author.name, highlighted_comment, &get_filters(&req), &query, &req, post_id.clone()), }; + // Use the Post and Comment structs to generate a website to show users Ok(template(&PostTemplate { comments, @@ -114,7 +115,7 @@ pub async fn item(req: Request) -> Result, String> { // COMMENTS -fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet, req: &Request) -> Vec { +fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet, req: &Request, post_id: String) -> Vec { // 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); @@ -124,11 +125,11 @@ fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, .map(|comment| { let data = &comment["data"]; let replies: Vec = if data["replies"].is_object() { - parse_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, req) + parse_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, req, post_id.clone()) } else { Vec::new() }; - build_comment(&comment, data, replies, post_link, post_author, highlighted_comment, filters, req) + build_comment(&comment, data, replies, post_link, post_author, highlighted_comment, filters, req, post_id.clone()) }) .collect() } @@ -141,6 +142,7 @@ fn query_comments( filters: &HashSet, query: &str, req: &Request, + post_id: String, ) -> Vec { let comments = json["data"]["children"].as_array().map_or(Vec::new(), std::borrow::ToOwned::to_owned); let mut results = Vec::new(); @@ -150,10 +152,10 @@ fn query_comments( // 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)); + results.append(&mut query_comments(&data["replies"], post_link, post_author, highlighted_comment, filters, query, req, post_id.clone())); } - let c = build_comment(&comment, data, Vec::new(), post_link, post_author, highlighted_comment, filters, req); + let c = build_comment(&comment, data, Vec::new(), post_link, post_author, highlighted_comment, filters, req, post_id.clone()); if c.body.to_lowercase().contains(&query.to_lowercase()) { results.push(c); } @@ -171,12 +173,13 @@ fn build_comment( highlighted_comment: &str, filters: &HashSet, req: &Request, + post_id: String, ) -> Comment { let id = val(comment, "id"); let body = if (val(comment, "author") == "[deleted]" && val(comment, "body") == "[removed]") || val(comment, "body") == "[ Removed by Reddit ]" { format!( - "

[removed] — view removed comment

", + "

[removed] — view removed comment

", get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or_else(|| String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)), ) } else { diff --git a/src/utils.rs b/src/utils.rs index f5046cb..de40bb2 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -804,11 +804,13 @@ pub async fn parse_post(post: &Value) -> Post { let permalink = val(post, "permalink"); + let post_id = val(post, "id"); + let poll = Poll::parse(&post["data"]["poll_data"]); let body = if val(post, "removed_by_category") == "moderator" { format!( - "

[removed] — view removed post

", + "

[removed] — view removed post

", get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or_else(|| String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)), ) } else {