From 51761cbdefa39107b9e1f931f1aa8df6aebb2a94 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 28 Apr 2025 18:27:03 +0200 Subject: many much more generic refactor --- logic/src/home.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'logic/src/home.rs') diff --git a/logic/src/home.rs b/logic/src/home.rs index f03173e..b774a9f 100644 --- a/logic/src/home.rs +++ b/logic/src/home.rs @@ -4,6 +4,7 @@ Copyright (C) 2025 metamuffin */ +use crate::{node::DatabaseNodeUserDataExt, session::Session}; use anyhow::{Context, Result}; use jellybase::database::Database; use jellycommon::{ @@ -13,14 +14,14 @@ use jellycommon::{ user::WatchedState, }; -pub fn home(db: Database) -> Result { - let mut items = db.list_nodes_with_udata(&sess.user.name)?; +pub fn home(db: &Database, session: &Session) -> Result { + let mut items = db.list_nodes_with_udata(&session.user.name)?; let mut toplevel = db .get_node_children(NodeID::from_slug("library")) .context("root node missing")? .into_iter() - .map(|n| db.get_node_with_userdata(n, &sess)) + .map(|n| db.get_node_with_userdata(n, &session)) .collect::>>()?; toplevel.sort_by_key(|(n, _)| n.index.unwrap_or(usize::MAX)); -- cgit v1.2.3-70-g09d2