diff options
author | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
commit | b92983fb0cab2a284301b930d2b15ec0109dd93e (patch) | |
tree | f7fb1b900b3fa5ced46de392a47756c3ca5cc398 /server/src/routes/ui/admin/mod.rs | |
parent | 9a52852f736692e5319da49478e16bfba30fbd39 (diff) | |
parent | 826c61c9612e855b19c3adb0e93d80bbfb4dc903 (diff) | |
download | jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.bz2 jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.zst |
Merge branch 'master' of codeberg.org:metamuffin/jellything
Diffstat (limited to 'server/src/routes/ui/admin/mod.rs')
-rw-r--r-- | server/src/routes/ui/admin/mod.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/src/routes/ui/admin/mod.rs b/server/src/routes/ui/admin/mod.rs index 0d1ee0a..b976192 100644 --- a/server/src/routes/ui/admin/mod.rs +++ b/server/src/routes/ui/admin/mod.rs @@ -9,8 +9,6 @@ pub mod user; use super::account::session::AdminSession; use crate::{ database::Database, - federation::Federation, - import::import, routes::ui::{ admin::log::rocket_uri_macro_r_admin_log, error::MyResult, @@ -19,7 +17,8 @@ use crate::{ uri, }; use anyhow::anyhow; -use jellybase::CONF; +use jellybase::{federation::Federation, CONF}; +use jellyimport::import; use rand::Rng; use rocket::{form::Form, get, post, FromForm, State}; use std::time::Instant; |