diff options
Diffstat (limited to 'server/src/routes.rs')
| -rw-r--r-- | server/src/routes.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/server/src/routes.rs b/server/src/routes.rs index ef7b067..da3a389 100644 --- a/server/src/routes.rs +++ b/server/src/routes.rs @@ -13,8 +13,8 @@ use crate::ui::{ }, admin::{ log::{r_admin_log, r_admin_log_stream}, - r_admin_dashboard, r_admin_delete_cache, r_admin_import, r_admin_invite, - r_admin_remove_invite, r_admin_transcode_posters, r_admin_update_search, + r_admin_dashboard, r_admin_import, r_admin_invite, r_admin_remove_invite, + r_admin_transcode_posters, r_admin_update_search, user::{r_admin_remove_user, r_admin_user, r_admin_user_permission, r_admin_users}, }, assets::{r_asset, r_item_backdrop, r_item_poster, r_node_thumbnail, r_person_asset}, @@ -28,6 +28,7 @@ use crate::ui::{ stats::r_stats, style::{r_assets_font, r_assets_js, r_assets_js_map, r_assets_style}, }; +use crate::CONF; use crate::{ api::{ r_api_account_login, r_api_asset_token_raw, r_api_nodes_modified_since, r_api_root, @@ -61,7 +62,6 @@ use crate::{ }, }; use base64::Engine; -use jellybase::{federation::Federation, CONF, SECRETS}; use log::warn; use rand::random; use rocket::{ @@ -76,7 +76,7 @@ macro_rules! uri { }; } -pub fn build_rocket(database: Database, federation: Federation) -> Rocket<Build> { +pub fn build_rocket(database: Database) -> Rocket<Build> { rocket::build() .configure(Config { address: std::env::var("BIND_ADDR") @@ -86,8 +86,7 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket<Build> .map(|e| e.parse().unwrap()) .unwrap_or(8000), secret_key: SecretKey::derive_from( - SECRETS - .cookie_key + CONF.cookie_key .clone() .unwrap_or_else(|| { warn!("cookie_key not configured, generating a random one."); @@ -99,7 +98,6 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket<Build> ..Default::default() }) .manage(database) - .manage(federation) .manage(PlayersyncChannels::default()) .attach(AdHoc::on_response("set server header", |_req, res| { res.set_header(Header::new("server", "jellything")); @@ -129,7 +127,6 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket<Build> r_account_settings_post, r_account_settings, r_admin_dashboard, - r_admin_delete_cache, r_admin_import, r_admin_invite, r_admin_log_stream, |