1 files changed, 16 insertions, 16 deletions

diff --git a/server/src/ui/assets.rs b/server/src/ui/assets.rs
index ecab3d3..3b9319e 100644
--- a/server/src/ui/assets.rs
+++ b/server/src/ui/assets.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyResult;
-use crate::helper::cache::CacheControlFile;
+use crate::helper::{cache::CacheControlFile, A};
 use anyhow::{anyhow, bail, Context};
 use base64::Engine;
 use jellybase::{assetfed::AssetInner, database::Database, federation::Federation, CONF};
@@ -20,7 +20,7 @@ pub const AVIF_SPEED: u8 = 5;
 
 #[get("/asset/<token>?<width>")]
 pub async fn r_asset(
-    _session: Session,
+    _session: A<Session>,
     fed: &State<Federation>,
     token: &str,
     width: Option<usize>,
@@ -63,13 +63,13 @@ pub async fn resolve_asset(asset: AssetInner) -> anyhow::Result<PathBuf> {
 
 #[get("/n/<id>/poster?<width>")]
 pub async fn r_item_poster(
-    _session: Session,
+    _session: A<Session>,
     db: &State<Database>,
-    id: NodeID,
+    id: A<NodeID>,
     width: Option<usize>,
 ) -> MyResult<Redirect> {
     // TODO perm
-    let node = db.get_node(id)?.ok_or(anyhow!("node does not exist"))?;
+    let node = db.get_node(id.0)?.ok_or(anyhow!("node does not exist"))?;
 
     let mut asset = node.poster.clone();
     if asset.is_none() {
@@ -86,13 +86,13 @@ pub async fn r_item_poster(
 
 #[get("/n/<id>/backdrop?<width>")]
 pub async fn r_item_backdrop(
-    _session: Session,
+    _session: A<Session>,
     db: &State<Database>,
-    id: NodeID,
+    id: A<NodeID>,
     width: Option<usize>,
 ) -> MyResult<Redirect> {
     // TODO perm
-    let node = db.get_node(id)?.ok_or(anyhow!("node does not exist"))?;
+    let node = db.get_node(id.0)?.ok_or(anyhow!("node does not exist"))?;
 
     let mut asset = node.backdrop.clone();
     if asset.is_none() {
@@ -109,16 +109,16 @@ pub async fn r_item_backdrop(
 
 #[get("/n/<id>/person/<index>/asset?<group>&<width>")]
 pub async fn r_person_asset(
-    _session: Session,
+    _session: A<Session>,
     db: &State<Database>,
-    id: NodeID,
+    id: A<NodeID>,
     index: usize,
     group: String,
     width: Option<usize>,
 ) -> MyResult<Redirect> {
     // TODO perm
 
-    let node = db.get_node(id)?.ok_or(anyhow!("node does not exist"))?;
+    let node = db.get_node(id.0)?.ok_or(anyhow!("node does not exist"))?;
     let app = node
         .people
         .get(&PeopleGroup::from_str_opt(&group).ok_or(anyhow!("unknown people group"))?)
@@ -136,14 +136,14 @@ pub async fn r_person_asset(
 
 #[get("/n/<id>/thumbnail?<t>&<width>")]
 pub async fn r_node_thumbnail(
-    _session: Session,
+    _session: A<Session>,
     db: &State<Database>,
     fed: &State<Federation>,
-    id: NodeID,
+    id: A<NodeID>,
     t: f64,
     width: Option<usize>,
 ) -> MyResult<Redirect> {
-    let node = db.get_node(id)?.ok_or(anyhow!("node does not exist"))?;
+    let node = db.get_node(id.0)?.ok_or(anyhow!("node does not exist"))?;
 
     let media = node.media.as_ref().ok_or(anyhow!("no media"))?;
     let (thumb_track_index, thumb_track) = media
@@ -184,8 +184,8 @@ pub async fn r_node_thumbnail(
                 )
                 .await?;
 
-            async_cache_file("fed-thumb", (id, t as i64), |out| {
-                session.node_thumbnail(out, id.into(), 2048, t)
+            async_cache_file("fed-thumb", (id.0, t as i64), |out| {
+                session.node_thumbnail(out, id.0.into(), 2048, t)
             })
             .await?
         }