mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-03 04:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge 594cb695c5 into dbdc4fc2a3

Browse source
This commit is contained in:
gongchandang49 2025-04-01 16:34:24 +02:00 • committed by GitHub
commit 7eb1216699
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config.rs
View file

@ -11,7 +11,7 @@ pub static CONFIG: Lazy<Config> = 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()));
}

21
src/post.rs
View file

@ -54,7 +54,7 @@ pub async fn item(req: Request<Body>) -> Result<Response<Body>, 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<Body>) -> Result<Response<Body>, 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<Body>) -> Result<Response<Body>, String> {
// 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> {
fn parse_comments(json: &serde_json::Value, post_link: &str, post_author: &str, highlighted_comment: &str, filters: &HashSet<String>, req: &Request<Body>, post_id: String) -> 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);
@ -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<Comment> = 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<String>,
query: &str,
req: &Request<Body>,
post_id: String,
) -> Vec<Comment> {
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<String>,
req: &Request<Body>,
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!(
"<div class=\"md\"><p>[removed] — <a href=\"https://{}{post_link}{id}\">view removed comment</a></p></div>",
"<div class=\"md\"><p>[removed] — <a href=\"https://{}?comments={post_id}\" target="_blank">view removed comment</a></p></div>",
get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or_else(|| String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)),
)
} else {

4
src/utils.rs
View file

@ -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!(
"<div class=\"md\"><p>[removed] — <a href=\"https://{}{permalink}\">view removed post</a></p></div>",
"<div class=\"md\"><p>[removed] — <a href=\"https://{}?comments={post_id}\" target="_blank">view removed post</a></p></div>",
get_setting("REDLIB_PUSHSHIFT_FRONTEND").unwrap_or_else(|| String::from(crate::config::DEFAULT_PUSHSHIFT_FRONTEND)),
)
} else {