From 3b15caade07e8fbe351fed9aceb3f435bf58368e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 26 May 2025 18:24:16 +0200 Subject: move all direct database access to logic crate --- server/src/ui/node.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'server/src/ui/node.rs') diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs index 00445a9..0b1a92f 100644 --- a/server/src/ui/node.rs +++ b/server/src/ui/node.rs @@ -10,19 +10,18 @@ use jellycommon::{ NodeID, }; use jellyimport::is_importing; -use jellylogic::{node::get_node, session::Session, Database}; +use jellylogic::{node::get_node, session::Session}; use jellyui::{ node_page::NodePage, render_page, scaffold::{RenderInfo, SessionInfo}, }; -use rocket::{get, response::content::RawHtml, serde::json::Json, Either, State}; +use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; #[get("/n/?&&")] pub async fn r_node<'a>( session: A, id: A, - db: &'a State, aj: AcceptJson, filter: Option>, lang: AcceptLanguage, @@ -33,9 +32,8 @@ pub async fn r_node<'a>( let filter = filter.unwrap_or_default(); let r = get_node( - &db, - id.0, &session.0, + id.0, !*aj || children, !*aj || parents, filter.0.clone(), -- cgit v1.2.3-70-g09d2