diff options
Diffstat (limited to 'server/src/ui/search.rs')
| -rw-r--r-- | server/src/ui/search.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server/src/ui/search.rs b/server/src/ui/search.rs index bacaaee..1c2ea70 100644 --- a/server/src/ui/search.rs +++ b/server/src/ui/search.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin <metamuffin.org> */ use super::error::MyResult; -use crate::{api::AcceptJson, locale::AcceptLanguage}; +use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; use anyhow::anyhow; use jellybase::database::Database; use jellycommon::api::ApiSearchResponse; @@ -19,7 +19,7 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State}; #[get("/search?<query>&<page>")] pub async fn r_search<'a>( - session: Session, + session: A<Session>, db: &State<Database>, aj: AcceptJson, query: Option<&str>, @@ -29,7 +29,7 @@ pub async fn r_search<'a>( let AcceptLanguage(lang) = lang; let r = query - .map(|query| search(db, &session, query, page)) + .map(|query| search(db, &session.0, query, page)) .transpose()?; Ok(if *aj { @@ -46,7 +46,9 @@ pub async fn r_search<'a>( }, RenderInfo { importing: is_importing(), - session: Some(SessionInfo { user: session.user }), + session: Some(SessionInfo { + user: session.0.user, + }), }, lang, ))) |