diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-05-26 18:24:16 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-05-26 18:24:16 +0200 |
| commit | 3b15caade07e8fbe351fed9aceb3f435bf58368e (patch) | |
| tree | cce91c229b78061ad36f29d76a76d67c3c737c59 /server/src/ui/node.rs | |
| parent | 1eeff5c03e8985d16d4f2b6283741dd82b369bd3 (diff) | |
| download | jellything-3b15caade07e8fbe351fed9aceb3f435bf58368e.tar jellything-3b15caade07e8fbe351fed9aceb3f435bf58368e.tar.bz2 jellything-3b15caade07e8fbe351fed9aceb3f435bf58368e.tar.zst | |
move all direct database access to logic crate
Diffstat (limited to 'server/src/ui/node.rs')
| -rw-r--r-- | server/src/ui/node.rs | 8 |
1 files changed, 3 insertions, 5 deletions
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/<id>?<parents>&<children>&<filter..>")] pub async fn r_node<'a>( session: A<Session>, id: A<NodeID>, - db: &'a State<Database>, aj: AcceptJson, filter: Option<A<NodeFilterSort>>, 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(), |