diff options
Diffstat (limited to 'server/src/ui/node.rs')
| -rw-r--r-- | server/src/ui/node.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs index 7085a5a..5004b7b 100644 --- a/server/src/ui/node.rs +++ b/server/src/ui/node.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin <metamuffin.org> */ use super::error::MyResult; -use crate::helper::{RequestInfo, A}; +use crate::helper::{filter_sort::ANodeFilterSort, RequestInfo, A}; use jellycommon::{ api::{ApiNodeResponse, NodeFilterSort}, NodeID, @@ -17,10 +17,11 @@ use rocket::{get, response::content::RawHtml, serde::json::Json, Either}; pub async fn r_node<'a>( ri: RequestInfo, id: A<NodeID>, - filter: Option<A<NodeFilterSort>>, + filter: Option<ANodeFilterSort>, parents: bool, children: bool, ) -> MyResult<Either<RawHtml<String>, Json<ApiNodeResponse>>> { + let filter: Option<NodeFilterSort> = filter.map(Into::into); let filter = filter.unwrap_or_default(); let r = get_node( @@ -28,7 +29,7 @@ pub async fn r_node<'a>( id.0, !ri.accept.is_json() || children, !ri.accept.is_json() || parents, - filter.0.clone(), + filter.clone(), )?; Ok(if ri.accept.is_json() { @@ -41,7 +42,7 @@ pub async fn r_node<'a>( children: &r.children, parents: &r.parents, similar: &[], - filter: &filter.0, + filter: &filter, lang: &ri.lang, player: false, }, |