From 6e5f6d9b9c6fedb4ab80190c156595d321d33bbf Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Thu, 11 Dec 2025 01:20:17 +0100
Subject: refactor import plugins part 3

---
 server/src/ui/admin/mod.rs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'server/src/ui/admin/mod.rs')

diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs
index 02a7605..3bd4771 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/ui/admin/mod.rs
@@ -3,6 +3,7 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
+pub mod import;
 pub mod log;
 pub mod user;
 
@@ -11,15 +12,15 @@ use crate::helper::RequestInfo;
 use jellycommon::routes::u_admin_dashboard;
 use jellyimport::is_importing;
 use jellylogic::admin::{
-    create_invite, delete_invite, do_import, get_import_errors, list_invites, update_search_index,
+    create_invite, delete_invite, get_import_errors, list_invites, update_search_index,
 };
 use jellyui::{admin::AdminDashboardPage, locale::tr, render_page};
 use rocket::{
+    FromForm,
     form::Form,
     get, post,
     request::FlashMessage,
-    response::{content::RawHtml, Flash, Redirect},
-    FromForm,
+    response::{Flash, Redirect, content::RawHtml},
 };
 
 #[get("/admin/dashboard")]
@@ -76,16 +77,6 @@ pub async fn r_admin_remove_invite(
     ))
 }
 
-#[post("/admin/import?<incremental>")]
-pub async fn r_admin_import(ri: RequestInfo, incremental: bool) -> MyResult<Flash<Redirect>> {
-    ri.session.assert_admin()?;
-    do_import(&ri.session, incremental).await?.1?;
-    Ok(Flash::success(
-        Redirect::to(u_admin_dashboard()),
-        tr(ri.lang, "admin.import_success"),
-    ))
-}
-
 #[post("/admin/update_search")]
 pub async fn r_admin_update_search(ri: RequestInfo) -> MyResult<Flash<Redirect>> {
     ri.session.assert_admin()?;
-- 
cgit v1.3