From d6a039a10ac3c81d410beb9b648d29524ca1e278 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Wed, 30 Apr 2025 11:24:14 +0200
Subject: smaller fixes and remove useless deps

---
 server/src/config.rs             |  2 ++
 server/src/helper/filter_sort.rs |  5 +++--
 server/src/helper/mod.rs         |  2 +-
 server/src/ui/error.rs           | 23 +++++++++++------------
 server/src/ui/node.rs            |  3 ++-
 5 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'server/src')

diff --git a/server/src/config.rs b/server/src/config.rs
index 27074b4..68148dd 100644
--- a/server/src/config.rs
+++ b/server/src/config.rs
@@ -18,6 +18,7 @@ struct Config {
     server: crate::Config,
     base: jellybase::Config,
     logic: jellylogic::Config,
+    import: jellyimport::Config,
 }
 
 pub async fn load_config() -> Result<()> {
@@ -36,6 +37,7 @@ pub async fn load_config() -> Result<()> {
     *jellycache::CONF_PRELOAD.lock().unwrap() = Some(config.cache);
     *jellylogic::CONF_PRELOAD.lock().unwrap() = Some(config.logic);
     *jellybase::CONF_PRELOAD.lock().unwrap() = Some(config.base);
+    *jellyimport::CONF_PRELOAD.lock().unwrap() = Some(config.import);
     *crate::CONF_PRELOAD.lock().unwrap() = Some(config.server);
     *jellyui::CONF_PRELOAD.lock().unwrap() = Some(config.ui);
 
diff --git a/server/src/helper/filter_sort.rs b/server/src/helper/filter_sort.rs
index 186aa86..b30ff18 100644
--- a/server/src/helper/filter_sort.rs
+++ b/server/src/helper/filter_sort.rs
@@ -17,10 +17,11 @@ use rocket::{
 #[async_trait]
 impl<'v> FromFormField<'v> for A<NodeFilterSort> {
     fn from_value(field: ValueField<'v>) -> Result<'v, Self> {
-        Err(field.unexpected())?
+        // TODO
+        Ok(A(NodeFilterSort::default()))
     }
     async fn from_data(field: DataField<'v, '_>) -> Result<'v, Self> {
-        Err(field.unexpected())?
+        Ok(A(NodeFilterSort::default()))
     }
 }
 
diff --git a/server/src/helper/mod.rs b/server/src/helper/mod.rs
index 7164175..f068cbc 100644
--- a/server/src/helper/mod.rs
+++ b/server/src/helper/mod.rs
@@ -9,5 +9,5 @@ pub mod filter_sort;
 pub mod node_id;
 pub mod session;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
 pub struct A<T>(pub T);
diff --git a/server/src/ui/error.rs b/server/src/ui/error.rs
index 05249af..d9716f5 100644
--- a/server/src/ui/error.rs
+++ b/server/src/ui/error.rs
@@ -4,6 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use crate::CONF;
+use jellyui::{error::ErrorPage, locale::Language, render_page, scaffold::RenderInfo};
 use log::info;
 use rocket::{
     catch,
@@ -25,18 +26,16 @@ static ERROR_IMAGE: LazyLock<Vec<u8>> = LazyLock::new(|| {
 
 #[catch(default)]
 pub fn r_catch<'a>(status: Status, _request: &Request) -> RawHtml<String> {
-    // LayoutPage {
-    //     title: "Not found".to_string(),
-    //     content: markup::new! {
-    //         h2 { "Error" }
-    //         p { @format!("{status}") }
-    //         @if status == Status::NotFound {
-    //             p { "You might need to " a[href=uri!(r_account_login())] { "log in" } ", to see this page" }
-    //         }
-    //     },
-    //     ..Default::default()
-    // }
-    RawHtml("as".to_string())
+    RawHtml(render_page(
+        &ErrorPage {
+            status: format!("{status}"),
+        },
+        RenderInfo {
+            importing: false,
+            session: None,
+        },
+        Language::English,
+    ))
 }
 
 #[catch(default)]
diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs
index 6241f4f..1441cfc 100644
--- a/server/src/ui/node.rs
+++ b/server/src/ui/node.rs
@@ -24,12 +24,13 @@ pub async fn r_node<'a>(
     id: A<NodeID>,
     db: &'a State<Database>,
     aj: AcceptJson,
-    filter: A<NodeFilterSort>,
+    filter: Option<A<NodeFilterSort>>,
     lang: AcceptLanguage,
     parents: bool,
     children: bool,
 ) -> MyResult<Either<RawHtml<String>, Json<ApiNodeResponse>>> {
     let AcceptLanguage(lang) = lang;
+    let filter = filter.unwrap_or_default();
 
     let r = get_node(
         &db,
-- 
cgit v1.2.3-70-g09d2