X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Froutes%2Fsrc%2Ffeeds.rs;h=96e718631b392b80f6abeb2ae9bde9f1dcb7c0e4;hb=c8063f3267cf2b3622f1fdc69128c6b55feefbbc;hp=9181a129bb65c579979a8a270deba8e23f924731;hpb=4c8f2e976effe381d4ea1914462c43242a8c64fd;p=lemmy.git diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs index 9181a129..96e71863 100644 --- a/crates/routes/src/feeds.rs +++ b/crates/routes/src/feeds.rs @@ -1,31 +1,32 @@ -use actix_web::{error::ErrorBadRequest, *}; +use actix_web::{error::ErrorBadRequest, web, Error, HttpRequest, HttpResponse, Result}; use anyhow::anyhow; use chrono::{DateTime, NaiveDateTime, Utc}; -use diesel::PgConnection; -use lemmy_api_common::blocking; -use lemmy_db_queries::{ - source::{community::Community_, person::Person_}, - Crud, - ListingType, - SortType, -}; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ + newtypes::LocalUserId, source::{community::Community, local_user::LocalUser, person::Person}, - LocalUserId, + traits::{ApubActor, Crud}, + utils::DbPool, + CommentSortType, + ListingType, + SortType, }; use lemmy_db_views::{ - comment_view::{CommentQueryBuilder, CommentView}, - post_view::{PostQueryBuilder, PostView}, - site_view::SiteView, + post_view::PostQuery, + structs::{LocalUserView, PostView, SiteView}, +}; +use lemmy_db_views_actor::{ + comment_reply_view::CommentReplyQuery, + person_mention_view::PersonMentionQuery, + structs::{CommentReplyView, PersonMentionView}, }; -use lemmy_db_views_actor::person_mention_view::{PersonMentionQueryBuilder, PersonMentionView}; use lemmy_utils::{ + cache_header::cache_1hour, claims::Claims, - settings::structs::Settings, - utils::markdown_to_html, - LemmyError, + error::LemmyError, + utils::markdown::markdown_to_html, }; -use lemmy_websocket::LemmyContext; +use once_cell::sync::Lazy; use rss::{ extension::dublincore::DublinCoreExtensionBuilder, ChannelBuilder, @@ -34,12 +35,31 @@ use rss::{ ItemBuilder, }; use serde::Deserialize; -use std::{collections::HashMap, str::FromStr}; -use strum::ParseError; +use std::{collections::BTreeMap, str::FromStr}; + +const RSS_FETCH_LIMIT: i64 = 20; #[derive(Deserialize)] struct Params { sort: Option, + limit: Option, + page: Option, +} + +impl Params { + fn sort_type(&self) -> Result { + let sort_query = self + .sort + .clone() + .unwrap_or_else(|| SortType::Hot.to_string()); + SortType::from_str(&sort_query).map_err(ErrorBadRequest) + } + fn get_limit(&self) -> i64 { + self.limit.unwrap_or(RSS_FETCH_LIMIT) + } + fn get_page(&self) -> i64 { + self.page.unwrap_or(1) + } } enum RequestType { @@ -50,73 +70,94 @@ enum RequestType { } pub fn config(cfg: &mut web::ServiceConfig) { - cfg - .route("/feeds/{type}/{name}.xml", web::get().to(get_feed)) - .route("/feeds/all.xml", web::get().to(get_all_feed)) - .route("/feeds/local.xml", web::get().to(get_local_feed)); + cfg.service( + web::scope("/feeds") + .route("/{type}/{name}.xml", web::get().to(get_feed)) + .route("/all.xml", web::get().to(get_all_feed).wrap(cache_1hour())) + .route( + "/local.xml", + web::get().to(get_local_feed).wrap(cache_1hour()), + ), + ); } -lazy_static! { - static ref RSS_NAMESPACE: HashMap = { - let mut h = HashMap::new(); - h.insert( - "dc".to_string(), - rss::extension::dublincore::NAMESPACE.to_string(), - ); - h - }; -} +static RSS_NAMESPACE: Lazy> = Lazy::new(|| { + let mut h = BTreeMap::new(); + h.insert( + "dc".to_string(), + rss::extension::dublincore::NAMESPACE.to_string(), + ); + h +}); +#[tracing::instrument(skip_all)] async fn get_all_feed( info: web::Query, context: web::Data, ) -> Result { - let sort_type = get_sort_type(info).map_err(ErrorBadRequest)?; - Ok(get_feed_data(&context, ListingType::All, sort_type).await?) + Ok( + get_feed_data( + &context, + ListingType::All, + info.sort_type()?, + info.get_limit(), + info.get_page(), + ) + .await?, + ) } +#[tracing::instrument(skip_all)] async fn get_local_feed( info: web::Query, context: web::Data, ) -> Result { - let sort_type = get_sort_type(info).map_err(ErrorBadRequest)?; - Ok(get_feed_data(&context, ListingType::Local, sort_type).await?) + Ok( + get_feed_data( + &context, + ListingType::Local, + info.sort_type()?, + info.get_limit(), + info.get_page(), + ) + .await?, + ) } +#[tracing::instrument(skip_all)] async fn get_feed_data( context: &LemmyContext, listing_type: ListingType, sort_type: SortType, + limit: i64, + page: i64, ) -> Result { - let site_view = blocking(context.pool(), move |conn| SiteView::read(&conn)).await??; - - let listing_type_ = listing_type.clone(); - let posts = blocking(context.pool(), move |conn| { - PostQueryBuilder::create(&conn) - .listing_type(&listing_type_) - .sort(&sort_type) - .list() - }) - .await??; + let site_view = SiteView::read_local(&mut context.pool()).await?; + + let posts = PostQuery { + listing_type: (Some(listing_type)), + sort: (Some(sort_type)), + limit: (Some(limit)), + page: (Some(page)), + ..Default::default() + } + .list(&mut context.pool()) + .await?; - let items = create_post_items(posts)?; + let items = create_post_items(posts, &context.settings().get_protocol_and_hostname())?; let mut channel_builder = ChannelBuilder::default(); channel_builder - .namespaces(RSS_NAMESPACE.to_owned()) - .title(&format!( - "{} - {}", - site_view.site.name, - listing_type.to_string() - )) - .link(Settings::get().get_protocol_and_hostname()) + .namespaces(RSS_NAMESPACE.clone()) + .title(&format!("{} - {}", site_view.site.name, listing_type)) + .link(context.settings().get_protocol_and_hostname()) .items(items); if let Some(site_desc) = site_view.site.description { channel_builder.description(&site_desc); } - let rss = channel_builder.build().map_err(|e| anyhow!(e))?.to_string(); + let rss = channel_builder.build().to_string(); Ok( HttpResponse::Ok() .content_type("application/rss+xml") @@ -124,12 +165,14 @@ async fn get_feed_data( ) } +#[tracing::instrument(skip_all)] async fn get_feed( - web::Path((req_type, param)): web::Path<(String, String)>, + req: HttpRequest, info: web::Query, context: web::Data, ) -> Result { - let sort_type = get_sort_type(info).map_err(ErrorBadRequest)?; + let req_type: String = req.match_info().get("type").unwrap_or("none").parse()?; + let param: String = req.match_info().get("name").unwrap_or("none").parse()?; let request_type = match req_type.as_str() { "u" => RequestType::User, @@ -139,16 +182,57 @@ async fn get_feed( _ => return Err(ErrorBadRequest(LemmyError::from(anyhow!("wrong_type")))), }; - let builder = blocking(context.pool(), move |conn| match request_type { - RequestType::User => get_feed_user(conn, &sort_type, param), - RequestType::Community => get_feed_community(conn, &sort_type, param), - RequestType::Front => get_feed_front(conn, &sort_type, param), - RequestType::Inbox => get_feed_inbox(conn, param), - }) - .await? + let jwt_secret = context.secret().jwt_secret.clone(); + let protocol_and_hostname = context.settings().get_protocol_and_hostname(); + + let builder = match request_type { + RequestType::User => { + get_feed_user( + &mut context.pool(), + &info.sort_type()?, + &info.get_limit(), + &info.get_page(), + ¶m, + &protocol_and_hostname, + ) + .await + } + RequestType::Community => { + get_feed_community( + &mut context.pool(), + &info.sort_type()?, + &info.get_limit(), + &info.get_page(), + ¶m, + &protocol_and_hostname, + ) + .await + } + RequestType::Front => { + get_feed_front( + &mut context.pool(), + &jwt_secret, + &info.sort_type()?, + &info.get_limit(), + &info.get_page(), + ¶m, + &protocol_and_hostname, + ) + .await + } + RequestType::Inbox => { + get_feed_inbox( + &mut context.pool(), + &jwt_secret, + ¶m, + &protocol_and_hostname, + ) + .await + } + } .map_err(ErrorBadRequest)?; - let rss = builder.build().map_err(ErrorBadRequest)?.to_string(); + let rss = builder.build().to_string(); Ok( HttpResponse::Ok() @@ -157,33 +241,34 @@ async fn get_feed( ) } -fn get_sort_type(info: web::Query) -> Result { - let sort_query = info - .sort - .to_owned() - .unwrap_or_else(|| SortType::Hot.to_string()); - SortType::from_str(&sort_query) -} - -fn get_feed_user( - conn: &PgConnection, +#[tracing::instrument(skip_all)] +async fn get_feed_user( + pool: &mut DbPool<'_>, sort_type: &SortType, - user_name: String, + limit: &i64, + page: &i64, + user_name: &str, + protocol_and_hostname: &str, ) -> Result { - let site_view = SiteView::read(&conn)?; - let person = Person::find_by_name(&conn, &user_name)?; - - let posts = PostQueryBuilder::create(&conn) - .listing_type(&ListingType::All) - .sort(sort_type) - .creator_id(person.id) - .list()?; + let site_view = SiteView::read_local(pool).await?; + let person = Person::read_from_name(pool, user_name, false).await?; + + let posts = PostQuery { + listing_type: (Some(ListingType::All)), + sort: (Some(*sort_type)), + creator_id: (Some(person.id)), + limit: (Some(*limit)), + page: (Some(*page)), + ..Default::default() + } + .list(pool) + .await?; - let items = create_post_items(posts)?; + let items = create_post_items(posts, protocol_and_hostname)?; let mut channel_builder = ChannelBuilder::default(); channel_builder - .namespaces(RSS_NAMESPACE.to_owned()) + .namespaces(RSS_NAMESPACE.clone()) .title(&format!("{} - {}", site_view.site.name, person.name)) .link(person.actor_id.to_string()) .items(items); @@ -191,25 +276,33 @@ fn get_feed_user( Ok(channel_builder) } -fn get_feed_community( - conn: &PgConnection, +#[tracing::instrument(skip_all)] +async fn get_feed_community( + pool: &mut DbPool<'_>, sort_type: &SortType, - community_name: String, + limit: &i64, + page: &i64, + community_name: &str, + protocol_and_hostname: &str, ) -> Result { - let site_view = SiteView::read(&conn)?; - let community = Community::read_from_name(&conn, &community_name)?; - - let posts = PostQueryBuilder::create(&conn) - .listing_type(&ListingType::All) - .sort(sort_type) - .community_id(community.id) - .list()?; + let site_view = SiteView::read_local(pool).await?; + let community = Community::read_from_name(pool, community_name, false).await?; + + let posts = PostQuery { + sort: (Some(*sort_type)), + community_id: (Some(community.id)), + limit: (Some(*limit)), + page: (Some(*page)), + ..Default::default() + } + .list(pool) + .await?; - let items = create_post_items(posts)?; + let items = create_post_items(posts, protocol_and_hostname)?; let mut channel_builder = ChannelBuilder::default(); channel_builder - .namespaces(RSS_NAMESPACE.to_owned()) + .namespaces(RSS_NAMESPACE.clone()) .title(&format!("{} - {}", site_view.site.name, community.name)) .link(community.actor_id.to_string()) .items(items); @@ -221,28 +314,38 @@ fn get_feed_community( Ok(channel_builder) } -fn get_feed_front( - conn: &PgConnection, +#[tracing::instrument(skip_all)] +async fn get_feed_front( + pool: &mut DbPool<'_>, + jwt_secret: &str, sort_type: &SortType, - jwt: String, + limit: &i64, + page: &i64, + jwt: &str, + protocol_and_hostname: &str, ) -> Result { - let site_view = SiteView::read(&conn)?; - let local_user_id = LocalUserId(Claims::decode(&jwt)?.claims.sub); - let person_id = LocalUser::read(&conn, local_user_id)?.person_id; - - let posts = PostQueryBuilder::create(&conn) - .listing_type(&ListingType::Subscribed) - .my_person_id(person_id) - .sort(sort_type) - .list()?; + let site_view = SiteView::read_local(pool).await?; + let local_user_id = LocalUserId(Claims::decode(jwt, jwt_secret)?.claims.sub); + let local_user = LocalUserView::read(pool, local_user_id).await?; + + let posts = PostQuery { + listing_type: (Some(ListingType::Subscribed)), + local_user: (Some(&local_user)), + sort: (Some(*sort_type)), + limit: (Some(*limit)), + page: (Some(*page)), + ..Default::default() + } + .list(pool) + .await?; - let items = create_post_items(posts)?; + let items = create_post_items(posts, protocol_and_hostname)?; let mut channel_builder = ChannelBuilder::default(); channel_builder - .namespaces(RSS_NAMESPACE.to_owned()) + .namespaces(RSS_NAMESPACE.clone()) .title(&format!("{} - Subscribed", site_view.site.name)) - .link(Settings::get().get_protocol_and_hostname()) + .link(protocol_and_hostname) .items(items); if let Some(site_desc) = site_view.site.description { @@ -252,35 +355,50 @@ fn get_feed_front( Ok(channel_builder) } -fn get_feed_inbox(conn: &PgConnection, jwt: String) -> Result { - let site_view = SiteView::read(&conn)?; - let local_user_id = LocalUserId(Claims::decode(&jwt)?.claims.sub); - let person_id = LocalUser::read(&conn, local_user_id)?.person_id; - - let sort = SortType::New; - - let replies = CommentQueryBuilder::create(&conn) - .recipient_id(person_id) - .my_person_id(person_id) - .sort(&sort) - .list()?; - - let mentions = PersonMentionQueryBuilder::create(&conn) - .recipient_id(person_id) - .my_person_id(person_id) - .sort(&sort) - .list()?; +#[tracing::instrument(skip_all)] +async fn get_feed_inbox( + pool: &mut DbPool<'_>, + jwt_secret: &str, + jwt: &str, + protocol_and_hostname: &str, +) -> Result { + let site_view = SiteView::read_local(pool).await?; + let local_user_id = LocalUserId(Claims::decode(jwt, jwt_secret)?.claims.sub); + let local_user = LocalUser::read(pool, local_user_id).await?; + let person_id = local_user.person_id; + let show_bot_accounts = local_user.show_bot_accounts; + + let sort = CommentSortType::New; + + let replies = CommentReplyQuery { + recipient_id: (Some(person_id)), + my_person_id: (Some(person_id)), + show_bot_accounts: (show_bot_accounts), + sort: (Some(sort)), + limit: (Some(RSS_FETCH_LIMIT)), + ..Default::default() + } + .list(pool) + .await?; + + let mentions = PersonMentionQuery { + recipient_id: (Some(person_id)), + my_person_id: (Some(person_id)), + show_bot_accounts: (show_bot_accounts), + sort: (Some(sort)), + limit: (Some(RSS_FETCH_LIMIT)), + ..Default::default() + } + .list(pool) + .await?; - let items = create_reply_and_mention_items(replies, mentions)?; + let items = create_reply_and_mention_items(replies, mentions, protocol_and_hostname)?; let mut channel_builder = ChannelBuilder::default(); channel_builder - .namespaces(RSS_NAMESPACE.to_owned()) + .namespaces(RSS_NAMESPACE.clone()) .title(&format!("{} - Inbox", site_view.site.name)) - .link(format!( - "{}/inbox", - Settings::get().get_protocol_and_hostname() - )) + .link(format!("{protocol_and_hostname}/inbox",)) .items(items); if let Some(site_desc) = site_view.site.description { @@ -290,24 +408,22 @@ fn get_feed_inbox(conn: &PgConnection, jwt: String) -> Result, + replies: Vec, mentions: Vec, + protocol_and_hostname: &str, ) -> Result, LemmyError> { let mut reply_items: Vec = replies .iter() .map(|r| { - let reply_url = format!( - "{}/post/{}/comment/{}", - Settings::get().get_protocol_and_hostname(), - r.post.id, - r.comment.id - ); + let reply_url = format!("{}/comment/{}", protocol_and_hostname, r.comment.id); build_item( &r.creator.name, &r.comment.published, &reply_url, &r.comment.content, + protocol_and_hostname, ) }) .collect::, LemmyError>>()?; @@ -315,17 +431,13 @@ fn create_reply_and_mention_items( let mut mention_items: Vec = mentions .iter() .map(|m| { - let mention_url = format!( - "{}/post/{}/comment/{}", - Settings::get().get_protocol_and_hostname(), - m.post.id, - m.comment.id - ); + let mention_url = format!("{}/comment/{}", protocol_and_hostname, m.comment.id); build_item( &m.creator.name, &m.comment.published, &mention_url, &m.comment.content, + protocol_and_hostname, ) }) .collect::, LemmyError>>()?; @@ -334,40 +446,37 @@ fn create_reply_and_mention_items( Ok(reply_items) } +#[tracing::instrument(skip_all)] fn build_item( creator_name: &str, published: &NaiveDateTime, url: &str, content: &str, + protocol_and_hostname: &str, ) -> Result { let mut i = ItemBuilder::default(); - i.title(format!("Reply from {}", creator_name)); - let author_url = format!( - "{}/u/{}", - Settings::get().get_protocol_and_hostname(), - creator_name - ); + i.title(format!("Reply from {creator_name}")); + let author_url = format!("{protocol_and_hostname}/u/{creator_name}"); i.author(format!( - "/u/{} (link)", - creator_name, author_url + "/u/{creator_name} (link)" )); let dt = DateTime::::from_utc(*published, Utc); i.pub_date(dt.to_rfc2822()); i.comments(url.to_owned()); - let guid = GuidBuilder::default() - .permalink(true) - .value(url) - .build() - .map_err(|e| anyhow!(e))?; + let guid = GuidBuilder::default().permalink(true).value(url).build(); i.guid(guid); i.link(url.to_owned()); // TODO add images - let html = markdown_to_html(&content.to_string()); + let html = markdown_to_html(content); i.description(html); - Ok(i.build().map_err(|e| anyhow!(e))?) + Ok(i.build()) } -fn create_post_items(posts: Vec) -> Result, LemmyError> { +#[tracing::instrument(skip_all)] +fn create_post_items( + posts: Vec, + protocol_and_hostname: &str, +) -> Result, LemmyError> { let mut items: Vec = Vec::new(); for p in posts { @@ -381,25 +490,15 @@ fn create_post_items(posts: Vec) -> Result, LemmyError> { let dt = DateTime::::from_utc(p.post.published, Utc); i.pub_date(dt.to_rfc2822()); - let post_url = format!( - "{}/post/{}", - Settings::get().get_protocol_and_hostname(), - p.post.id - ); - i.link(post_url.to_owned()); - i.comments(post_url.to_owned()); + let post_url = format!("{}/post/{}", protocol_and_hostname, p.post.id); + i.comments(post_url.clone()); let guid = GuidBuilder::default() .permalink(true) .value(&post_url) - .build() - .map_err(|e| anyhow!(e))?; + .build(); i.guid(guid); - let community_url = format!( - "{}/c/{}", - Settings::get().get_protocol_and_hostname(), - p.community.name - ); + let community_url = format!("{}/c/{}", protocol_and_hostname, p.community.name); // TODO add images let mut description = format!("submitted by {} to {}
{} points | {} comments", @@ -413,8 +512,11 @@ fn create_post_items(posts: Vec) -> Result, LemmyError> { // If its a url post, add it to the description if let Some(url) = p.post.url { - let link_html = format!("
{url}", url = url); + let link_html = format!("
{url}"); description.push_str(&link_html); + i.link(url.to_string()); + } else { + i.link(post_url.clone()); } if let Some(body) = p.post.body { @@ -424,8 +526,8 @@ fn create_post_items(posts: Vec) -> Result, LemmyError> { i.description(description); - i.dublin_core_ext(dc_extension.build().map_err(|e| anyhow!(e))?); - items.push(i.build().map_err(|e| anyhow!(e))?); + i.dublin_core_ext(dc_extension.build()); + items.push(i.build()); } Ok(items)