comiles again but still many logic holes

1 files changed, 7 insertions, 7 deletions

diff --git a/server/src/ui/home.rs b/server/src/ui/home.rs
index 6127e8c..9c9c1ca 100644
--- a/server/src/ui/home.rs
+++ b/server/src/ui/home.rs
@@ -5,7 +5,7 @@
 */
 
 use super::error::MyResult;
-use crate::{api::AcceptJson, locale::AcceptLanguage};
+use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage};
 use jellybase::database::Database;
 use jellycommon::api::ApiHomeResponse;
 use jellyimport::is_importing;
@@ -15,20 +15,18 @@ use jellyui::{
     render_page,
     scaffold::{RenderInfo, SessionInfo},
 };
-use rocket::{
-    figment::value::magic::Either, get, response::content::RawHtml, serde::json::Json, State,
-};
+use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State};
 
 #[get("/home")]
 pub fn r_home(
-    session: Session,
+    session: A<Session>,
     db: &State<Database>,
     aj: AcceptJson,
     lang: AcceptLanguage,
 ) -> MyResult<Either<RawHtml<String>, Json<ApiHomeResponse>>> {
     let AcceptLanguage(lang) = lang;
 
-    let r = jellylogic::home::home(&db, &session)?;
+    let r = jellylogic::home::home(&db, &session.0)?;
 
     Ok(if *aj {
         Either::Right(Json(r))
@@ -37,7 +35,9 @@ pub fn r_home(
             &HomePage { lang: &lang, r },
             RenderInfo {
                 importing: is_importing(),
-                session: Some(SessionInfo { user: session.user }),
+                session: Some(SessionInfo {
+                    user: session.0.user,
+                }),
             },
             lang,
         )))