comiles again but still many logic holes

1 files changed, 11 insertions, 9 deletions

diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs
index 1a0ff16..6241f4f 100644
--- a/server/src/ui/node.rs
+++ b/server/src/ui/node.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyResult;
-use crate::{api::AcceptJson, database::Database, locale::AcceptLanguage};
+use crate::{api::AcceptJson, database::Database, helper::A, locale::AcceptLanguage};
 use jellycommon::{
     api::{ApiNodeResponse, NodeFilterSort},
     NodeID,
@@ -20,11 +20,11 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State};
 
 #[get("/n/<id>?<parents>&<children>&<filter..>")]
 pub async fn r_node<'a>(
-    session: Session,
-    id: NodeID,
+    session: A<Session>,
+    id: A<NodeID>,
     db: &'a State<Database>,
     aj: AcceptJson,
-    filter: NodeFilterSort,
+    filter: A<NodeFilterSort>,
     lang: AcceptLanguage,
     parents: bool,
     children: bool,
@@ -33,11 +33,11 @@ pub async fn r_node<'a>(
 
     let r = get_node(
         &db,
-        id,
-        &session,
+        id.0,
+        &session.0,
         !*aj || children,
         !*aj || parents,
-        filter.clone(),
+        filter.0.clone(),
     )?;
 
     Ok(if *aj {
@@ -50,13 +50,15 @@ pub async fn r_node<'a>(
                 children: &r.children,
                 parents: &r.parents,
                 similar: &[],
-                filter: &filter,
+                filter: &filter.0,
                 lang: &lang,
                 player: false,
             },
             RenderInfo {
                 importing: is_importing(),
-                session: Some(SessionInfo { user: session.user }),
+                session: Some(SessionInfo {
+                    user: session.0.user,
+                }),
             },
             lang,
         )))