From 212a0f23bc894faf88e159560c113f504349cc05 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 29 Apr 2025 17:06:23 +0200
Subject: comiles again but still many logic holes

---
 server/src/ui/items.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'server/src/ui/items.rs')

diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs
index c7d062d..e5aa050 100644
--- a/server/src/ui/items.rs
+++ b/server/src/ui/items.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use super::error::MyError;
-use crate::{api::AcceptJson, database::Database, locale::AcceptLanguage};
+use crate::{api::AcceptJson, database::Database, helper::A, locale::AcceptLanguage};
 use jellycommon::api::{ApiItemsResponse, NodeFilterSort};
 use jellyimport::is_importing;
 use jellylogic::{items::all_items, session::Session};
@@ -17,16 +17,16 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State};
 
 #[get("/items?<page>&<filter..>")]
 pub fn r_items(
-    session: Session,
+    session: A<Session>,
     db: &State<Database>,
     aj: AcceptJson,
     page: Option<usize>,
-    filter: NodeFilterSort,
+    filter: A<NodeFilterSort>,
     lang: AcceptLanguage,
 ) -> Result<Either<RawHtml<String>, Json<ApiItemsResponse>>, MyError> {
     let AcceptLanguage(lang) = lang;
 
-    let r = all_items(db, &session, page, filter.clone())?;
+    let r = all_items(db, &session.0, page, filter.0.clone())?;
 
     Ok(if *aj {
         Either::Right(Json(r))
@@ -35,12 +35,14 @@ pub fn r_items(
             &ItemsPage {
                 lang: &lang,
                 r,
-                filter: &filter,
+                filter: &filter.0,
                 page: page.unwrap_or(0),
             },
             RenderInfo {
                 importing: is_importing(),
-                session: Some(SessionInfo { user: session.user }),
+                session: Some(SessionInfo {
+                    user: session.0.user,
+                }),
             },
             lang,
         )))
-- 
cgit v1.2.3-70-g09d2