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(limit))
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,
#[tracing::instrument(skip_all)]
async fn get_feed_community(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
sort_type: &SortType,
limit: &i64,
page: &i64,
#[tracing::instrument(skip_all)]
async fn get_feed_front(
- pool: &DbPool,
+ pool: &mut DbPool<'_>,
jwt_secret: &str,
sort_type: &SortType,
limit: &i64,
#[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 mention_items: Vec<Item> = mentions
.iter()
.map(|m| {
- let mention_url = format!(
- "/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 {