From 3f534d3ee7dff70bd44e875c3871a77c73b211fa Mon Sep 17 00:00:00 2001 From: Matthew Esposito Date: Tue, 9 Apr 2024 09:11:50 -0400 Subject: [PATCH] Add RSS feeds --- Cargo.lock | 111 ++++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 1 + src/main.rs | 4 ++ src/subreddit.rs | 46 ++++++++++++++++++++ src/user.rs | 48 +++++++++++++++++++- 5 files changed, 208 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b357a1..96e0f2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,6 +121,19 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "atom_syndication" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "571832dcff775e26562e8e6930cd483de5587301d40d3a3b85d532b6383e15a7" +dependencies = [ + "chrono", + "derive_builder", + "diligent-date-parser", + "never", + "quick-xml", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -260,6 +273,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +dependencies = [ + "num-traits", +] + [[package]] name = "clap" version = "4.5.1" @@ -398,6 +420,37 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + [[package]] name = "digest" version = "0.10.7" @@ -408,12 +461,30 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "diligent-date-parser" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6cf7fe294274a222363f84bcb63cdea762979a0443b4cf1f4f8fd17c86b1182" +dependencies = [ + "chrono", +] + [[package]] name = "dotenvy" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.10.2" @@ -871,6 +942,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "never" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" + [[package]] name = "nom" version = "7.1.3" @@ -887,6 +964,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.16.0" @@ -1011,6 +1097,16 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "encoding_rs", + "memchr", +] + [[package]] name = "quote" version = "1.0.35" @@ -1047,7 +1143,7 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redlib" -version = "0.31.0" +version = "0.31.2" dependencies = [ "askama", "base64", @@ -1069,6 +1165,7 @@ dependencies = [ "pretty_env_logger", "regex", "route-recognizer", + "rss", "rust-embed", "sealed_test", "serde", @@ -1146,6 +1243,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" +[[package]] +name = "rss" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b2c77eb4450d7d5f98df52c381cd6c4e19b75dad9209a9530b85a44510219a" +dependencies = [ + "atom_syndication", + "derive_builder", + "never", + "quick-xml", +] + [[package]] name = "rust-embed" version = "8.3.0" diff --git a/Cargo.toml b/Cargo.toml index ef7ffa1..2b753e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,6 +42,7 @@ fastrand = "2.0.1" log = "0.4.20" pretty_env_logger = "0.5.0" dotenvy = "0.15.7" +rss = "2.0.7" [dev-dependencies] lipsum = "0.9.0" diff --git a/src/main.rs b/src/main.rs index ee2da5a..24115b7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -254,6 +254,7 @@ async fn main() { app.at("/u/:name/comments/:id/:title/:comment_id").get(|r| post::item(r).boxed()); app.at("/user/[deleted]").get(|req| error(req, "User has deleted their account").boxed()); + app.at("/user/:name.rss").get(|r| user::rss(r).boxed()); app.at("/user/:name").get(|r| user::profile(r).boxed()); app.at("/user/:name/:listing").get(|r| user::profile(r).boxed()); app.at("/user/:name/comments/:id").get(|r| post::item(r).boxed()); @@ -265,6 +266,9 @@ async fn main() { app.at("/settings/restore").get(|r| settings::restore(r).boxed()); app.at("/settings/update").get(|r| settings::update(r).boxed()); + // RSS Subscriptions + app.at("/r/:sub.rss").get(|r| subreddit::rss(r).boxed()); + // Subreddit services app .at("/r/:sub") diff --git a/src/subreddit.rs b/src/subreddit.rs index 569f84c..4f897dc 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -5,6 +5,7 @@ use crate::utils::{ use crate::{client::json, server::ResponseExt, RequestExt}; use askama::Template; use cookie::Cookie; +use hyper::header::CONTENT_TYPE; use hyper::{Body, Request, Response}; use time::{Duration, OffsetDateTime}; @@ -446,6 +447,51 @@ async fn subreddit(sub: &str, quarantined: bool) -> Result { }) } +use rss::{ChannelBuilder, Item}; + +pub async fn rss(req: Request) -> Result, String> { + // Get subreddit + let sub = req.param("sub").unwrap_or_default(); + let post_sort = req.cookie("post_sort").map_or_else(|| "hot".to_string(), |c| c.value().to_string()); + let sort = req.param("sort").unwrap_or_else(|| req.param("id").unwrap_or(post_sort)); + + // Get path + let path = format!("/r/{sub}/{sort}.json?{}", req.uri().query().unwrap_or_default()); + + // Get subreddit data + let subreddit = subreddit(&sub, false).await?; + + // Get posts + let (posts, _) = Post::fetch(&path, false).await?; + + // Build the RSS feed + let channel = ChannelBuilder::default() + .title(&subreddit.title) + .description(&subreddit.description) + .items( + posts + .into_iter() + .map(|post| Item { + title: Some(post.title), + link: Some(post.permalink), + author: Some(post.author.name), + content: Some(rewrite_urls(&post.body)), + ..Default::default() + }) + .collect::>(), + ) + .build(); + + // Serialize the feed to RSS + let body = channel.to_string().into_bytes(); + + // Create the HTTP response + let mut res = Response::new(Body::from(body)); + res.headers_mut().insert(CONTENT_TYPE, hyper::header::HeaderValue::from_static("application/rss+xml")); + + Ok(res) +} + #[tokio::test(flavor = "multi_thread")] async fn test_fetching_subreddit() { let subreddit = subreddit("rust", false).await; diff --git a/src/user.rs b/src/user.rs index 9cf607b..6bd4c13 100644 --- a/src/user.rs +++ b/src/user.rs @@ -1,8 +1,9 @@ // CRATES use crate::client::json; use crate::server::RequestExt; -use crate::utils::{error, filter_posts, format_url, get_filters, nsfw_landing, param, setting, template, Post, Preferences, User}; +use crate::utils::{error, filter_posts, format_url, get_filters, nsfw_landing, param, rewrite_urls, setting, template, Post, Preferences, User}; use askama::Template; +use hyper::header::CONTENT_TYPE; use hyper::{Body, Request, Response}; use time::{macros::format_description, OffsetDateTime}; @@ -129,6 +130,51 @@ async fn user(name: &str) -> Result { }) } +use rss::{ChannelBuilder, Item}; + +pub async fn rss(req: Request) -> Result, String> { + // Get user + let user_str = req.param("name").unwrap_or_default(); + + let listing = req.param("listing").unwrap_or_else(|| "overview".to_string()); + + // Get path + let path = format!("/user/{user_str}/{listing}.json?{}&raw_json=1", req.uri().query().unwrap_or_default(),); + + // Get user + let user_obj = user(&user_str).await.unwrap_or_default(); + + // Get posts + let (posts, _) = Post::fetch(&path, false).await?; + + // Build the RSS feed + let channel = ChannelBuilder::default() + .title(user_str) + .description(user_obj.description) + .items( + posts + .into_iter() + .map(|post| Item { + title: Some(post.title), + link: Some(post.permalink), + author: Some(post.author.name), + content: Some(rewrite_urls(&post.body)), + ..Default::default() + }) + .collect::>(), + ) + .build(); + + // Serialize the feed to RSS + let body = channel.to_string().into_bytes(); + + // Create the HTTP response + let mut res = Response::new(Body::from(body)); + res.headers_mut().insert(CONTENT_TYPE, hyper::header::HeaderValue::from_static("application/rss+xml")); + + Ok(res) +} + #[tokio::test(flavor = "multi_thread")] async fn test_fetching_user() { let user = user("spez").await;