person_mention_view::PersonMentionQuery,
structs::{CommentReplyView, PersonMentionView},
};
-use lemmy_utils::{claims::Claims, error::LemmyError, utils::markdown_to_html};
+use lemmy_utils::{claims::Claims, error::LemmyError, utils::markdown::markdown_to_html};
use once_cell::sync::Lazy;
use rss::{
extension::dublincore::DublinCoreExtensionBuilder,
};
use serde::Deserialize;
use std::{collections::BTreeMap, str::FromStr};
-use strum::ParseError;
const RSS_FETCH_LIMIT: i64 = 20;
#[derive(Deserialize)]
struct Params {
sort: Option<String>,
+ limit: Option<i64>,
+ page: Option<i64>,
+}
+
+impl Params {
+ fn sort_type(&self) -> Result<SortType, Error> {
+ 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 {
info: web::Query<Params>,
context: web::Data<LemmyContext>,
) -> Result<HttpResponse, Error> {
- 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)]
info: web::Query<Params>,
context: web::Data<LemmyContext>,
) -> Result<HttpResponse, Error> {
- 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)]
context: &LemmyContext,
listing_type: ListingType,
sort_type: SortType,
+ limit: i64,
+ page: i64,
) -> Result<HttpResponse, LemmyError> {
- let site_view = SiteView::read_local(context.pool()).await?;
+ let site_view = SiteView::read_local(&mut context.pool()).await?;
let posts = PostQuery::builder()
- .pool(context.pool())
+ .pool(&mut context.pool())
.listing_type(Some(listing_type))
.sort(Some(sort_type))
- .limit(Some(RSS_FETCH_LIMIT))
+ .limit(Some(limit))
+ .page(Some(page))
.build()
.list()
.await?;
info: web::Query<Params>,
context: web::Data<LemmyContext>,
) -> Result<HttpResponse, Error> {
- 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 builder = match request_type {
RequestType::User => {
- get_feed_user(context.pool(), &sort_type, ¶m, &protocol_and_hostname).await
+ 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(context.pool(), &sort_type, ¶m, &protocol_and_hostname).await
+ 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(
- context.pool(),
+ &mut context.pool(),
&jwt_secret,
- &sort_type,
+ &info.sort_type()?,
+ &info.get_limit(),
+ &info.get_page(),
¶m,
&protocol_and_hostname,
)
.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)?;
)
}
-fn get_sort_type(info: web::Query<Params>) -> Result<SortType, ParseError> {
- let sort_query = info
- .sort
- .clone()
- .unwrap_or_else(|| SortType::Hot.to_string());
- SortType::from_str(&sort_query)
-}
-
#[tracing::instrument(skip_all)]
async fn get_feed_user(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
sort_type: &SortType,
+ limit: &i64,
+ page: &i64,
user_name: &str,
protocol_and_hostname: &str,
) -> Result<ChannelBuilder, LemmyError> {
.listing_type(Some(ListingType::All))
.sort(Some(*sort_type))
.creator_id(Some(person.id))
- .limit(Some(RSS_FETCH_LIMIT))
+ .limit(Some(*limit))
+ .page(Some(*page))
.build()
.list()
.await?;
#[tracing::instrument(skip_all)]
async fn get_feed_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
sort_type: &SortType,
+ limit: &i64,
+ page: &i64,
community_name: &str,
protocol_and_hostname: &str,
) -> Result<ChannelBuilder, LemmyError> {
.pool(pool)
.sort(Some(*sort_type))
.community_id(Some(community.id))
- .limit(Some(RSS_FETCH_LIMIT))
+ .limit(Some(*limit))
+ .page(Some(*page))
.build()
.list()
.await?;
#[tracing::instrument(skip_all)]
async fn get_feed_front(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
jwt_secret: &str,
sort_type: &SortType,
+ limit: &i64,
+ page: &i64,
jwt: &str,
protocol_and_hostname: &str,
) -> Result<ChannelBuilder, LemmyError> {
.listing_type(Some(ListingType::Subscribed))
.local_user(Some(&local_user))
.sort(Some(*sort_type))
- .limit(Some(RSS_FETCH_LIMIT))
+ .limit(Some(*limit))
+ .page(Some(*page))
.build()
.list()
.await?;
#[tracing::instrument(skip_all)]
async fn get_feed_inbox(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
jwt_secret: &str,
jwt: &str,
protocol_and_hostname: &str,
let mut reply_items: Vec<Item> = replies
.iter()
.map(|r| {
- let reply_url = format!(
- "{}/post/{}/comment/{}",
- 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,
let mut mention_items: Vec<Item> = mentions
.iter()
.map(|m| {
- let mention_url = format!(
- "{}/post/{}/comment/{}",
- 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,
i.pub_date(dt.to_rfc2822());
let post_url = format!("{}/post/{}", protocol_and_hostname, p.post.id);
- i.link(post_url.clone());
i.comments(post_url.clone());
let guid = GuidBuilder::default()
.permalink(true)
if let Some(url) = p.post.url {
let link_html = format!("<br><a href=\"{url}\">{url}</a>");
description.push_str(&link_html);
+ i.link(url.to_string());
+ } else {
+ i.link(post_url.clone());
}
if let Some(body) = p.post.body {