diff --git a/Cargo.lock b/Cargo.lock index df32cb1..3ddc89b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -678,9 +678,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70be434c505aee38639abccb918163b63158a4b4bb791b45b7023044bdc3c9c" +checksum = "309f13e3f4be6d5917178c84db67c0b9a09177ac16d4f9a7313a767a68adaa77" dependencies = [ "futures-channel", "futures-core", @@ -692,9 +692,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f01c61843314e95f96cc9245702248733a3a3d744e43e2e755e3c7af8348a0a9" +checksum = "7a3b03bd32f6ec7885edeb99acd1e47e20e34fd4dfd3c6deed6fcac8a9d28f6a" dependencies = [ "futures-core", "futures-sink", @@ -702,21 +702,21 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8d3b0917ff63a2a96173133c02818fac4a746b0a57569d3baca9ec0e945e08" +checksum = "ed8aeae2b6ab243ebabe6f54cd4cf53054d98883d5d326128af7d57a9ca5cd3d" [[package]] name = "futures-io" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37c1a51b037b80922864b8eed90692c5cd8abd4c71ce49b77146caa47f3253b" +checksum = "d41234e71d5e8ca73d01563974ef6f50e516d71e18f1a2f1184742e31f5d469f" [[package]] name = "futures-macro" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8719ca0e1f3c5e34f3efe4570ef2c0610ca6da85ae7990d472e9cbfba13664" +checksum = "3520e0eb4e704e88d771b92d51273ee212997f0d8282f17f5d8ff1cb39104e42" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -726,24 +726,24 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6adabac1290109cfa089f79192fb6244ad2c3f1cc2281f3e1dd987592b71feb" +checksum = "c72d188479368953c6c8c7140e40d7a4401674ab3b98a41e60e515d6cbdbe5de" [[package]] name = "futures-task" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92a0843a2ff66823a8f7c77bffe9a09be2b64e533562c412d63075643ec0038" +checksum = "08944cea9021170d383287169859c0ca8147d9ec285978393109954448f33cc7" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036a2107cdeb57f6d7322f1b6c363dad67cd63ca3b7d1b925bdf75bd5d96cda9" +checksum = "d3dd206efbe2ca683b2ce138ccdf61e1b0a63f5816dcedc9d8654c500ba0cea6" dependencies = [ "futures-channel", "futures-core", @@ -1268,9 +1268,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" diff --git a/src/main.rs b/src/main.rs index b5520c5..9d078d7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,7 @@ async fn style() -> HttpResponse { async fn robots() -> HttpResponse { HttpResponse::Ok() .header("Cache-Control", "public, max-age=1209600, s-maxage=86400") - .body(include_str!("../static/robots.txt")) + .body("User-agent: *\nAllow: /") } async fn favicon() -> HttpResponse { @@ -36,7 +36,7 @@ async fn main() -> std::io::Result<()> { match arg.split('=').collect::>()[0] { "--address" | "-a" => address = arg.split('=').collect::>()[1].to_string(), // "--redirect-https" | "-r" => https = true, - _ => {} + _ => (), } } @@ -45,54 +45,60 @@ async fn main() -> std::io::Result<()> { HttpServer::new(|| { App::new() - // REDIRECT TO HTTPS - // .wrap(middleware::DefaultHeaders::new().header("Strict-Transport-Security", "max-age=31536000")) - // .wrap_fn(|req, srv| { - // let fut = srv.call(req); - // async { - // let mut res = fut.await?; - // if https { - // res.headers_mut().insert( - // actix_web::http::header::STRICT_TRANSPORT_SECURITY, actix_web::http::HeaderValue::from_static("max-age=31536000;"), - // ); - // } - // Ok(res) - // } - // }) - // TRAILING SLASH MIDDLEWARE + // Redirect to HTTPS + // .wrap_fn(|req, srv| { let fut = srv.call(req); async { let mut res = fut.await?; if https {} Ok(res) } }) + // Append trailing slash and remove double slashes .wrap(middleware::NormalizePath::default()) - // DEFAULT SERVICE - .default_service(web::get().to(|| utils::error("Nothing here".to_string()))) - // GENERAL SERVICES + // Default service in case no routes match + .default_service(web::get().to(|| utils::error("Nothing here"))) + // Read static files .route("/style.css/", web::get().to(style)) .route("/favicon.ico/", web::get().to(favicon)) .route("/robots.txt/", web::get().to(robots)) - // SETTINGS SERVICE - .route("/settings/", web::get().to(settings::get)) - .route("/settings/", web::post().to(settings::set)) - // PROXY SERVICE + // Proxy media through Libreddit .route("/proxy/{url:.*}/", web::get().to(proxy::handler)) - // SEARCH SERVICES - .route("/search/", web::get().to(search::find)) - .route("r/{sub}/search/", web::get().to(search::find)) - // USER SERVICES - .route("/u/{username}/", web::get().to(user::profile)) - .route("/user/{username}/", web::get().to(user::profile)) - // WIKI SERVICES - .route("/wiki/", web::get().to(subreddit::wiki)) - .route("/wiki/{page}/", web::get().to(subreddit::wiki)) - .route("/r/{sub}/wiki/", web::get().to(subreddit::wiki)) - .route("/r/{sub}/wiki/{page}/", web::get().to(subreddit::wiki)) - // SUBREDDIT SERVICES - .route("/r/{sub}/", web::get().to(subreddit::page)) - .route("/r/{sub}/{sort:hot|new|top|rising|controversial}/", web::get().to(subreddit::page)) - // POPULAR SERVICES - .route("/", web::get().to(subreddit::page)) - .route("/{sort:best|hot|new|top|rising|controversial}/", web::get().to(subreddit::page)) - // POST SERVICES + // Browse user profile + .route("/{scope:u|user}/{username}/", web::get().to(user::profile)) + // Short link for post .route("/{id:.{5,6}}/", web::get().to(post::item)) - .route("/r/{sub}/comments/{id}/{title}/", web::get().to(post::item)) - .route("/r/{sub}/comments/{id}/{title}/{comment_id}/", web::get().to(post::item)) + // Configure settings + .service(web::resource("/settings/").route(web::get().to(settings::get)).route(web::post().to(settings::set))) + // Subreddit services + .service( + web::scope("/r/{sub}") + // See posts and info about subreddit + .route("/", web::get().to(subreddit::page)) + .route("/{sort:hot|new|top|rising|controversial}/", web::get().to(subreddit::page)) + // View post on subreddit + .service( + web::scope("/comments/{id}/{title}") + .route("/", web::get().to(post::item)) + .route("/{comment_id}/", web::get().to(post::item)), + ) + // Search inside subreddit + .route("/search/", web::get().to(search::find)) + // View wiki of subreddit + .service( + web::scope("/wiki") + .route("/", web::get().to(subreddit::wiki)) + .route("/{page}/", web::get().to(subreddit::wiki)), + ), + ) + // Universal services + .service( + web::scope("") + // Front page + .route("/", web::get().to(subreddit::page)) + .route("/{sort:best|hot|new|top|rising|controversial}/", web::get().to(subreddit::page)) + // View Reddit wiki + .service( + web::scope("/wiki") + .route("/", web::get().to(subreddit::wiki)) + .route("/{page}/", web::get().to(subreddit::wiki)), + ) + // Search all of Reddit + .route("/search/", web::get().to(search::find)), + ) }) .bind(&address) .unwrap_or_else(|e| panic!("Cannot bind to the address {}: {}", address, e)) diff --git a/src/post.rs b/src/post.rs index 69c27c8..5850fa8 100644 --- a/src/post.rs +++ b/src/post.rs @@ -57,7 +57,7 @@ pub async fn item(req: HttpRequest) -> HttpResponse { HttpResponse::Ok().content_type("text/html").body(s) } // If the Reddit API returns an error, exit and send error page to user - Err(msg) => error(msg.to_string()).await, + Err(msg) => error(msg).await, } } diff --git a/src/proxy.rs b/src/proxy.rs index c874b1e..bca2b0b 100644 --- a/src/proxy.rs +++ b/src/proxy.rs @@ -41,9 +41,9 @@ pub async fn handler(web::Path(b64): web::Path) -> Result Err(error::ErrorForbidden("Resource must be from Reddit")) } } - Err(_) => Err(error::ErrorBadRequest("Can't parse base64 into URL")), + _ => Err(error::ErrorBadRequest("Can't parse base64 into URL")), } } - Err(_) => Err(error::ErrorBadRequest("Can't decode base64")), + _ => Err(error::ErrorBadRequest("Can't decode base64")), } } diff --git a/src/search.rs b/src/search.rs index bf0ae51..d2a2391 100644 --- a/src/search.rs +++ b/src/search.rs @@ -50,6 +50,6 @@ pub async fn find(req: HttpRequest) -> HttpResponse { .render() .unwrap(), ), - Err(msg) => error(msg.to_string()).await, + Err(msg) => error(msg).await, } } diff --git a/src/subreddit.rs b/src/subreddit.rs index cda7404..e9403b7 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -58,28 +58,28 @@ pub async fn page(req: HttpRequest) -> HttpResponse { .unwrap(); HttpResponse::Ok().content_type("text/html").body(s) } - Err(msg) => error(msg.to_string()).await, + Err(msg) => error(msg).await, } } pub async fn wiki(req: HttpRequest) -> HttpResponse { - let sub = req.match_info().get("sub").unwrap_or("reddit.com"); - let page = req.match_info().get("page").unwrap_or("index"); + let sub = req.match_info().get("sub").unwrap_or("reddit.com").to_string(); + let page = req.match_info().get("page").unwrap_or("index").to_string(); let path: String = format!("/r/{}/wiki/{}.json?raw_json=1", sub, page); match request(&path).await { Ok(res) => { let s = WikiTemplate { - sub: sub.to_string(), + sub, wiki: rewrite_url(res["data"]["content_html"].as_str().unwrap_or_default()), - page: page.to_string(), + page, prefs: prefs(req), } .render() .unwrap(); HttpResponse::Ok().content_type("text/html").body(s) } - Err(msg) => error(msg.to_string()).await, + Err(msg) => error(msg).await, } } diff --git a/src/user.rs b/src/user.rs index 4327e2d..d12c54c 100644 --- a/src/user.rs +++ b/src/user.rs @@ -42,7 +42,7 @@ pub async fn profile(req: HttpRequest) -> HttpResponse { HttpResponse::Ok().content_type("text/html").body(s) } // If there is an error show error page - Err(msg) => error(msg.to_string()).await, + Err(msg) => error(msg).await, } } @@ -57,7 +57,7 @@ async fn user(name: &str) -> Result { Ok(res) => { // Grab creation date as unix timestamp let created: i64 = res["data"]["created"].as_f64().unwrap_or(0.0).round() as i64; - + // nested_val function used to parse JSON from Reddit APIs let about = |item| res["data"]["subreddit"][item].as_str().unwrap_or_default().to_string(); diff --git a/src/utils.rs b/src/utils.rs index fb80160..ffcee5b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -202,28 +202,31 @@ pub async fn media(data: &serde_json::Value) -> (String, String) { pub fn parse_rich_flair(flair_type: String, rich_flair: Option<&Vec>, text_flair: Option<&str>) -> Vec { match flair_type.as_str() { - "richtext" => match rich_flair { - Some(rich) => rich.iter().map(|part| { - let value = |name: &str| part[name].as_str().unwrap_or_default(); - FlairPart { - flair_part_type: value("e").to_string(), - value: match value("e") { - "text" => value("t").to_string(), - "emoji" => format_url(value("u")), - _ => String::new() + "richtext" => match rich_flair { + Some(rich) => rich + .iter() + .map(|part| { + let value = |name: &str| part[name].as_str().unwrap_or_default(); + FlairPart { + flair_part_type: value("e").to_string(), + value: match value("e") { + "text" => value("t").to_string(), + "emoji" => format_url(value("u")), + _ => String::new(), + }, } - } - }).collect::>(), - None => Vec::new() + }) + .collect::>(), + None => Vec::new(), }, - "text" => match text_flair { + "text" => match text_flair { Some(text) => vec![FlairPart { flair_part_type: "text".to_string(), value: text.to_string(), }], - None => Vec::new() + None => Vec::new(), }, - _ => Vec::new() + _ => Vec::new(), } } @@ -333,9 +336,9 @@ pub async fn fetch_posts(path: &str, fallback_title: String) -> Result<(Vec HttpResponse { +pub async fn error(msg: &str) -> HttpResponse { let body = ErrorTemplate { - message: msg, + message: msg.to_string(), prefs: Preferences::default(), } .render()