aboutsummaryrefslogtreecommitdiff
path: root/server/src/main.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-12-21 23:57:42 +0100
committermetamuffin <metamuffin@disroot.org>2023-12-21 23:57:42 +0100
commit3a29113e965a94bdef06655f1583cc6e86edd606 (patch)
treea0910fa9687a9935ba1ca85a9cb5def1a0bc9069 /server/src/main.rs
parenta8b2480e898e269e7e0d41dbd46d9a18c7d1e4ba (diff)
downloadjellything-3a29113e965a94bdef06655f1583cc6e86edd606.tar
jellything-3a29113e965a94bdef06655f1583cc6e86edd606.tar.bz2
jellything-3a29113e965a94bdef06655f1583cc6e86edd606.tar.zst
rework import system pt. 1
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 6e732bd..d9ddf8b 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -8,16 +8,13 @@
use crate::routes::ui::{account::hash_password, admin::log::enable_logging};
use database::Database;
-use federation::Federation;
-use jellybase::CONF;
+use jellybase::{CONF, federation::Federation};
use jellycommon::user::{PermissionSet, Theme, User};
use log::{error, warn};
use routes::build_rocket;
use tokio::fs::create_dir_all;
pub use jellybase::database;
-pub mod federation;
-pub mod import;
pub mod routes;
#[rocket::main]