add: "all" timeline
add: only show most popular posts from the past week
This commit is contained in:
parent
fc9c0f294e
commit
24f67221ca
13 changed files with 143 additions and 27 deletions
|
@ -62,6 +62,35 @@ pub async fn index_request(
|
|||
Html(data.1.render("timelines/home.html", &context).unwrap())
|
||||
}
|
||||
|
||||
/// `/popular`
|
||||
pub async fn popular_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Query(req): Query<PaginatedQuery>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
let user = get_user_from_token!(jar, data.0);
|
||||
|
||||
let list = match data.0.get_popular_posts(12, req.page, 604_800_000).await {
|
||||
Ok(l) => match data
|
||||
.0
|
||||
.fill_posts_with_community(l, if let Some(ref ua) = user { ua.id } else { 0 })
|
||||
.await
|
||||
{
|
||||
Ok(l) => l,
|
||||
Err(e) => return Html(render_error(e, &jar, &data, &user).await),
|
||||
},
|
||||
Err(e) => return Html(render_error(e, &jar, &data, &user).await),
|
||||
};
|
||||
|
||||
let lang = get_lang!(jar, data.0);
|
||||
let mut context = initial_context(&data.0.0, lang, &user).await;
|
||||
|
||||
context.insert("list", &list);
|
||||
context.insert("page", &req.page);
|
||||
Html(data.1.render("timelines/popular.html", &context).unwrap())
|
||||
}
|
||||
|
||||
/// `/following`
|
||||
pub async fn following_request(
|
||||
jar: CookieJar,
|
||||
|
@ -100,8 +129,8 @@ pub async fn following_request(
|
|||
))
|
||||
}
|
||||
|
||||
/// `/popular`
|
||||
pub async fn popular_request(
|
||||
/// `/all`
|
||||
pub async fn all_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Query(req): Query<PaginatedQuery>,
|
||||
|
@ -109,7 +138,7 @@ pub async fn popular_request(
|
|||
let data = data.read().await;
|
||||
let user = get_user_from_token!(jar, data.0);
|
||||
|
||||
let list = match data.0.get_popular_posts(12, req.page).await {
|
||||
let list = match data.0.get_latest_posts(12, req.page).await {
|
||||
Ok(l) => match data
|
||||
.0
|
||||
.fill_posts_with_community(l, if let Some(ref ua) = user { ua.id } else { 0 })
|
||||
|
@ -126,7 +155,7 @@ pub async fn popular_request(
|
|||
|
||||
context.insert("list", &list);
|
||||
context.insert("page", &req.page);
|
||||
Html(data.1.render("timelines/popular.html", &context).unwrap())
|
||||
Html(data.1.render("timelines/all.html", &context).unwrap())
|
||||
}
|
||||
|
||||
/// `/notifs`
|
||||
|
|
|
@ -18,8 +18,9 @@ pub fn routes() -> Router {
|
|||
Router::new()
|
||||
// misc
|
||||
.route("/", get(misc::index_request))
|
||||
.route("/following", get(misc::following_request))
|
||||
.route("/popular", get(misc::popular_request))
|
||||
.route("/following", get(misc::following_request))
|
||||
.route("/all", get(misc::all_request))
|
||||
.route("/notifs", get(misc::notifications_request))
|
||||
.route("/doc/{*file_name}", get(misc::markdown_document_request))
|
||||
.fallback_service(get(misc::not_found))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue