From 212a0f23bc894faf88e159560c113f504349cc05 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 29 Apr 2025 17:06:23 +0200 Subject: comiles again but still many logic holes --- server/src/ui/stats.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'server/src/ui/stats.rs') diff --git a/server/src/ui/stats.rs b/server/src/ui/stats.rs index 8bfecbf..b6a74e5 100644 --- a/server/src/ui/stats.rs +++ b/server/src/ui/stats.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin */ 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::ApiStatsResponse; use jellyimport::is_importing; use jellylogic::{session::Session, stats::stats}; @@ -17,13 +17,13 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State}; #[get("/stats")] pub fn r_stats( - session: Session, + session: A, db: &State, aj: AcceptJson, lang: AcceptLanguage, ) -> Result, Json>, MyError> { let AcceptLanguage(lang) = lang; - let r = stats(db, &session)?; + let r = stats(db, &session.0)?; Ok(if *aj { Either::Right(Json(r)) @@ -32,7 +32,9 @@ pub fn r_stats( &StatsPage { lang: &lang, r }, RenderInfo { importing: is_importing(), - session: Some(SessionInfo { user: session.user }), + session: Some(SessionInfo { + user: session.0.user, + }), }, lang, ))) -- cgit v1.2.3-70-g09d2