};
use lemmy_db_views::{
post_view::PostQuery,
- structs::{PostView, SiteView},
+ structs::{LocalUserView, PostView, SiteView},
};
use lemmy_db_views_actor::{
comment_reply_view::CommentReplyQuery,
person_mention_view::PersonMentionQuery,
structs::{CommentReplyView, PersonMentionView},
};
-use lemmy_utils::{claims::Claims, error::LemmyError, utils::markdown::markdown_to_html};
+use lemmy_utils::{
+ cache_header::cache_1hour,
+ claims::Claims,
+ error::LemmyError,
+ utils::markdown::markdown_to_html,
+};
use once_cell::sync::Lazy;
use rss::{
extension::dublincore::DublinCoreExtensionBuilder,
}
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()),
+ ),
+ );
}
static RSS_NAMESPACE: Lazy<BTreeMap<String, String>> = Lazy::new(|| {
limit: i64,
page: i64,
) -> Result<HttpResponse, LemmyError> {
- let site_view = SiteView::read_local(context.pool()).await?;
-
- let posts = PostQuery::builder()
- .pool(context.pool())
- .listing_type(Some(listing_type))
- .sort(Some(sort_type))
- .limit(Some(limit))
- .page(Some(page))
- .build()
- .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, &context.settings().get_protocol_and_hostname())?;
let builder = match request_type {
RequestType::User => {
get_feed_user(
- context.pool(),
+ &mut context.pool(),
&info.sort_type()?,
&info.get_limit(),
&info.get_page(),
}
RequestType::Community => {
get_feed_community(
- context.pool(),
+ &mut context.pool(),
&info.sort_type()?,
&info.get_limit(),
&info.get_page(),
}
RequestType::Front => {
get_feed_front(
- context.pool(),
+ &mut context.pool(),
&jwt_secret,
&info.sort_type()?,
&info.get_limit(),
.await
}
RequestType::Inbox => {
- get_feed_inbox(context.pool(), &jwt_secret, ¶m, &protocol_and_hostname).await
+ get_feed_inbox(
+ &mut context.pool(),
+ &jwt_secret,
+ ¶m,
+ &protocol_and_hostname,
+ )
+ .await
}
}
.map_err(ErrorBadRequest)?;
#[tracing::instrument(skip_all)]
async fn get_feed_user(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
sort_type: &SortType,
limit: &i64,
page: &i64,
let site_view = SiteView::read_local(pool).await?;
let person = Person::read_from_name(pool, user_name, false).await?;
- let posts = PostQuery::builder()
- .pool(pool)
- .listing_type(Some(ListingType::All))
- .sort(Some(*sort_type))
- .creator_id(Some(person.id))
- .limit(Some(*limit))
- .page(Some(*page))
- .build()
- .list()
- .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, protocol_and_hostname)?;
#[tracing::instrument(skip_all)]
async fn get_feed_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
sort_type: &SortType,
limit: &i64,
page: &i64,
let site_view = SiteView::read_local(pool).await?;
let community = Community::read_from_name(pool, community_name, false).await?;
- let posts = PostQuery::builder()
- .pool(pool)
- .sort(Some(*sort_type))
- .community_id(Some(community.id))
- .limit(Some(*limit))
- .page(Some(*page))
- .build()
- .list()
- .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, protocol_and_hostname)?;
#[tracing::instrument(skip_all)]
async fn get_feed_front(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
jwt_secret: &str,
sort_type: &SortType,
limit: &i64,
) -> Result<ChannelBuilder, LemmyError> {
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 posts = PostQuery::builder()
- .pool(pool)
- .listing_type(Some(ListingType::Subscribed))
- .local_user(Some(&local_user))
- .sort(Some(*sort_type))
- .limit(Some(*limit))
- .page(Some(*page))
- .build()
- .list()
- .await?;
+ 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, protocol_and_hostname)?;
#[tracing::instrument(skip_all)]
async fn get_feed_inbox(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
jwt_secret: &str,
jwt: &str,
protocol_and_hostname: &str,
let sort = CommentSortType::New;
- let replies = CommentReplyQuery::builder()
- .pool(pool)
- .recipient_id(Some(person_id))
- .my_person_id(Some(person_id))
- .show_bot_accounts(Some(show_bot_accounts))
- .sort(Some(sort))
- .limit(Some(RSS_FETCH_LIMIT))
- .build()
- .list()
- .await?;
-
- let mentions = PersonMentionQuery::builder()
- .pool(pool)
- .recipient_id(Some(person_id))
- .my_person_id(Some(person_id))
- .show_bot_accounts(Some(show_bot_accounts))
- .sort(Some(sort))
- .limit(Some(RSS_FETCH_LIMIT))
- .build()
- .list()
- .await?;
+ 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, protocol_and_hostname)?;