refactor ui responder; add admin import pages

6 files changed, 91 insertions, 169 deletions

diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs
index 765b6aa..8c60a2d 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/ui/account/mod.rs
@@ -6,40 +6,29 @@
 // pub mod settings;
 
 use super::error::MyError;
-use crate::{auth::login, request_info::RequestInfo, ui::error::MyResult};
+use crate::{
+    auth::login, request_info::RequestInfo, ui::error::MyResult, ui_responder::UiResponse,
+};
 use anyhow::anyhow;
 use jellycommon::{VIEW_ACCOUNT_LOGIN, VIEW_ACCOUNT_LOGOUT, jellyobject::Object, routes::u_home};
-use jellyui::render_view;
 use rocket::{
     FromForm,
     form::{Contextual, Form},
     get,
     http::{Cookie, CookieJar},
     post,
-    response::{Flash, Redirect, content::RawHtml},
+    response::{Flash, Redirect},
 };
 use serde::{Deserialize, Serialize};
 
-#[derive(FromForm)]
-pub struct RegisterForm {
-    #[field(validate = len(8..128))]
-    pub invitation: String,
-    #[field(validate = len(4..32))]
-    pub username: String,
-    #[field(validate = len(4..64))]
-    pub password: String,
-}
-
 #[get("/account/login")]
-pub async fn r_account_login(ri: RequestInfo<'_>) -> RawHtml<String> {
-    let ob = Object::EMPTY.insert(VIEW_ACCOUNT_LOGIN, ());
-    RawHtml(render_view(ri.render_info(), ob.as_object()))
+pub async fn r_account_login(ri: RequestInfo<'_>) -> UiResponse {
+    ri.respond_ui(Object::EMPTY.insert(VIEW_ACCOUNT_LOGIN, ()))
 }
 
 #[get("/account/logout")]
-pub fn r_account_logout(ri: RequestInfo<'_>) -> RawHtml<String> {
-    let ob = Object::EMPTY.insert(VIEW_ACCOUNT_LOGOUT, ());
-    RawHtml(render_view(ri.render_info(), ob.as_object()))
+pub fn r_account_logout(ri: RequestInfo<'_>) -> UiResponse {
+    ri.respond_ui(Object::EMPTY.insert(VIEW_ACCOUNT_LOGOUT, ()))
 }
 
 #[derive(FromForm, Serialize, Deserialize)]
diff --git a/server/src/ui/admin/import.rs b/server/src/ui/admin/import.rs
index 79b8374..984966b 100644
--- a/server/src/ui/admin/import.rs
+++ b/server/src/ui/admin/import.rs
@@ -4,44 +4,62 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{request_info::RequestInfo, ui::error::MyResult};
-use jellycommon::routes::u_admin_import;
+use crate::{request_info::RequestInfo, ui::error::MyResult, ui_responder::UiResponse};
+use jellycommon::{
+    ADMIN_IMPORT_BUSY, ADMIN_IMPORT_ERROR, VIEW_ADMIN_IMPORT,
+    jellyobject::{Object, ObjectBuffer},
+    routes::u_admin_import,
+};
 use jellyimport::{
-    is_importing,
+    ImportConfig, import_wrap, is_importing,
     reporting::{IMPORT_ERRORS, IMPORT_PROGRESS},
 };
+use jellyui::tr;
 use rocket::{
     get, post,
-    request::FlashMessage,
-    response::{Flash, Redirect, content::RawHtml},
+    response::{Flash, Redirect},
 };
 use rocket_ws::{Message, Stream, WebSocket};
 use std::time::Duration;
-use tokio::time::sleep;
+use tokio::{spawn, time::sleep};
 
 #[get("/admin/import", rank = 2)]
-pub async fn r_admin_import(
-    ri: RequestInfo,
-    flash: Option<FlashMessage<'_>>,
-) -> MyResult<RawHtml<String>> {
-    ri.session.assert_admin()?;
+pub async fn r_admin_import(ri: RequestInfo<'_>) -> MyResult<UiResponse> {
+    ri.require_admin()?;
 
     let last_import_err = IMPORT_ERRORS.read().await.clone();
-    Ok(RawHtml(render_page(
-        &AdminImportPage {
-            busy: is_importing(),
-            flash: &flash.map(FlashMessage::into_inner),
-            lang: &ri.lang,
-            last_import_err: &last_import_err,
-        },
-        ri.render_info(),
-    )))
+    let last_import_err = last_import_err
+        .iter()
+        .map(|e| e.as_str())
+        .collect::<Vec<_>>();
+    let mut data = ObjectBuffer::empty();
+
+    if is_importing() {
+        data = data.as_object().insert(ADMIN_IMPORT_BUSY, ());
+    }
+    data = data
+        .as_object()
+        .insert_multi(ADMIN_IMPORT_ERROR, &last_import_err);
+
+    Ok(ri.respond_ui(Object::EMPTY.insert(VIEW_ADMIN_IMPORT, data.as_object())))
 }
 
 #[post("/admin/import?<incremental>")]
-pub async fn r_admin_import_post(ri: RequestInfo, incremental: bool) -> MyResult<Flash<Redirect>> {
-    ri.session.assert_admin()?;
-    do_import(&ri.session, incremental).await?;
+pub async fn r_admin_import_post(
+    ri: RequestInfo<'_>,
+    incremental: bool,
+) -> MyResult<Flash<Redirect>> {
+    ri.require_admin()?;
+    spawn(async move {
+        let _ = import_wrap(
+            ImportConfig {
+                cache: ri.state.cache.clone(),
+                db: ri.state.database.clone(),
+            },
+            incremental,
+        )
+        .await;
+    });
     Ok(Flash::success(
         Redirect::to(u_admin_import()),
         tr(ri.lang, "admin.import_success"),
@@ -49,16 +67,19 @@ pub async fn r_admin_import_post(ri: RequestInfo, incremental: bool) -> MyResult
 }
 
 #[get("/admin/import", rank = 1)]
-pub fn r_admin_import_stream(_session: A<Session>, ws: WebSocket) -> Stream!['static] {
-    Stream! { ws =>
-        loop {
-            let Some(p) = IMPORT_PROGRESS.read().await.clone() else {
-                break;
-            };
-            yield Message::Text(serde_json::to_string(&p).unwrap());
-            sleep(Duration::from_secs_f32(0.05)).await;
+pub fn r_admin_import_stream(ri: RequestInfo<'_>, ws: WebSocket) -> MyResult<Stream!['static]> {
+    ri.require_admin()?;
+    Ok({
+        Stream! { ws =>
+            loop {
+                let Some(p) = IMPORT_PROGRESS.read().await.clone() else {
+                    break;
+                };
+                yield Message::Text(serde_json::to_string(&p).unwrap());
+                sleep(Duration::from_secs_f32(0.05)).await;
+            }
+            yield Message::Text("done".to_string());
+            let _ = ws;
         }
-        yield Message::Text("done".to_string());
-        let _ = ws;
-    }
+    })
 }
diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 5ee05b7..61e62a4 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -3,80 +3,16 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
+
 pub mod import;
-pub mod log;
-pub mod user;
 
 use super::error::MyResult;
-use crate::request_info::RequestInfo;
-use jellycommon::routes::u_admin_dashboard;
-use jellyimport::is_importing;
-use rocket::{
-    FromForm,
-    form::Form,
-    get, post,
-    request::FlashMessage,
-    response::{Flash, Redirect, content::RawHtml},
-};
+use crate::{request_info::RequestInfo, ui_responder::UiResponse};
+use jellycommon::{VIEW_ADMIN_DASHBOARD, jellyobject::ObjectBuffer};
+use rocket::get;
 
 #[get("/admin/dashboard")]
-pub async fn r_admin_dashboard(
-    ri: RequestInfo,
-    flash: Option<FlashMessage<'_>>,
-) -> MyResult<RawHtml<String>> {
-    ri.session.assert_admin()?;
-    let invites = list_invites(&ri.session)?;
-
-    let busy = if is_importing() {
-        Some("An import is currently running.")
-    } else {
-        None
-    };
-
-    Ok(RawHtml(render_page(
-        &AdminDashboardPage {
-            busy,
-            invites: &invites,
-            flash: &flash.map(FlashMessage::into_inner),
-            lang: &ri.lang,
-        },
-        ri.render_info(),
-    )))
-}
-
-#[post("/admin/generate_invite")]
-pub async fn r_admin_invite(ri: RequestInfo) -> MyResult<Flash<Redirect>> {
-    let i = create_invite(&ri.session)?;
-    Ok(Flash::success(
-        Redirect::to(u_admin_dashboard()),
-        tr(ri.lang, "admin.invite_create_success").replace("{invite}", &i),
-    ))
-}
-
-#[derive(FromForm)]
-pub struct DeleteInvite {
-    invite: String,
-}
-
-#[post("/admin/remove_invite", data = "<form>")]
-pub async fn r_admin_remove_invite(
-    ri: RequestInfo,
-    form: Form<DeleteInvite>,
-) -> MyResult<Flash<Redirect>> {
-    ri.session.assert_admin()?;
-    delete_invite(&ri.session, &form.invite)?;
-    Ok(Flash::success(
-        Redirect::to(u_admin_dashboard()),
-        tr(ri.lang, "admin.invite_delete_success"),
-    ))
-}
-
-#[post("/admin/update_search")]
-pub async fn r_admin_update_search(ri: RequestInfo) -> MyResult<Flash<Redirect>> {
-    ri.session.assert_admin()?;
-    update_search_index(&ri.session).await?;
-    Ok(Flash::success(
-        Redirect::to(u_admin_dashboard()),
-        tr(ri.lang, "admin.update_search_success"),
-    ))
+pub async fn r_admin_dashboard(ri: RequestInfo<'_>) -> MyResult<UiResponse> {
+    ri.require_admin()?;
+    Ok(ri.respond_ui(ObjectBuffer::new(&mut [(VIEW_ADMIN_DASHBOARD.0, &())])))
 }
diff --git a/server/src/ui/home.rs b/server/src/ui/home.rs
index e9136ec..2fb4903 100644
--- a/server/src/ui/home.rs
+++ b/server/src/ui/home.rs
@@ -5,15 +5,11 @@
 */
 
 use super::error::MyResult;
-use crate::request_info::RequestInfo;
+use crate::{request_info::RequestInfo, ui_responder::UiResponse};
 use jellycommon::jellyobject::ObjectBuffer;
-use jellyui::render_view;
-use rocket::{Either, get, response::content::RawHtml, serde::json::Json};
+use rocket::get;
 
 #[get("/home")]
-pub fn r_home(ri: RequestInfo<'_>) -> MyResult<RawHtml<String>> {
-    Ok(RawHtml(render_view(
-        ri.render_info(),
-        ObjectBuffer::new(&mut []).as_object(),
-    )))
+pub fn r_home(ri: RequestInfo<'_>) -> MyResult<UiResponse> {
+    Ok(ri.respond_ui(ObjectBuffer::new(&mut [])))
 }
diff --git a/server/src/ui/mod.rs b/server/src/ui/mod.rs
index 112bb6b..855b25f 100644
--- a/server/src/ui/mod.rs
+++ b/server/src/ui/mod.rs
@@ -3,48 +3,29 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
+use crate::{State, request_info::RequestInfo};
 use error::MyResult;
-use rocket::{futures::FutureExt, get};
+use jellycommon::routes::{u_account_login, u_home};
+use rocket::{futures::FutureExt, get, response::Redirect};
 use std::{future::Future, pin::Pin, sync::Arc};
 use tokio::{fs::File, io::AsyncRead};
 
-use crate::State;
-
 pub mod account;
-// pub mod admin;
+pub mod admin;
 pub mod assets;
 pub mod error;
 pub mod home;
-// pub mod items;
 pub mod node;
-// pub mod player;
-// pub mod search;
-// pub mod stats;
 pub mod style;
 
-// #[get("/")]
-// pub async fn r_index(
-//     lang: AcceptLanguage,
-//     sess: Option<A<Session>>,
-// ) -> MyResult<Either<Redirect, RawHtml<String>>> {
-//     let AcceptLanguage(lang) = lang;
-//     if sess.is_some() {
-//         Ok(Either::Left(Redirect::temporary(rocket::uri!(r_home()))))
-//     } else {
-//         let front = read_to_string(CONF.asset_path.join("front.htm")).await?;
-//         Ok(Either::Right(RawHtml(render_page(
-//             &CustomPage {
-//                 title: "Jellything".to_string(),
-//                 body: front,
-//             },
-//             RenderInfo {
-//                 importing: false,
-//                 session: None,
-//                 lang,
-//             },
-//         ))))
-//     }
-// }
+#[get("/")]
+pub async fn r_index(ri: RequestInfo<'_>) -> MyResult<Redirect> {
+    if ri.user.is_some() {
+        Ok(Redirect::temporary(u_home()))
+    } else {
+        Ok(Redirect::temporary(u_account_login()))
+    }
+}
 
 #[get("/favicon.ico")]
 pub async fn r_favicon(s: &rocket::State<Arc<State>>) -> MyResult<File> {
diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs
index cf5c793..0473a94 100644
--- a/server/src/ui/node.rs
+++ b/server/src/ui/node.rs
@@ -4,13 +4,12 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 use super::error::MyResult;
-use crate::request_info::RequestInfo;
-use jellycommon::jellyobject::Object;
-use jellyui::render_view;
-use rocket::{get, response::content::RawHtml};
+use crate::{request_info::RequestInfo, ui_responder::UiResponse};
+use jellycommon::jellyobject::ObjectBuffer;
+use rocket::get;
 
 #[get("/n/<slug>")]
-pub fn r_node(ri: RequestInfo<'_>, slug: &str) -> MyResult<RawHtml<String>> {
+pub fn r_node(ri: RequestInfo<'_>, slug: &str) -> MyResult<UiResponse> {
     ri.require_user()?;
-    Ok(RawHtml(render_view(ri.render_info(), Object::EMPTY)))
+    Ok(ri.respond_ui(ObjectBuffer::empty()))
 }