update server to new schema

1 files changed, 5 insertions, 14 deletions

diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs
index 8d50c2e..52918d9 100644
--- a/server/src/routes/mod.rs
+++ b/server/src/routes/mod.rs
@@ -3,11 +3,8 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-use crate::{database::Database, library::Library, routes::ui::error::MyResult, CONF};
-use api::{
-    error::r_api_catch, r_api_account_login, r_api_assets_node, r_api_node, r_api_root,
-    r_api_version,
-};
+use crate::{database::Database, routes::ui::error::MyResult, CONF};
+use api::{error::r_api_catch, r_api_account_login, r_api_root, r_api_version};
 use jellyremuxer::RemuxerContext;
 use rocket::{
     catchers, config::SecretKey, fairing::AdHoc, fs::FileServer, get, http::Header, routes, Build,
@@ -25,10 +22,11 @@ use ui::{
         r_account_register, r_account_register_post,
         settings::{r_account_settings, r_account_settings_post},
     },
+    assets::r_item_assets,
     browser::r_all_items,
     error::r_catch,
     home::{r_home, r_home_unpriv},
-    node::{r_item_assets, r_library_node},
+    node::r_library_node,
     player::r_player,
     style::{r_assets_font, r_assets_js, r_assets_style},
 };
@@ -44,18 +42,13 @@ macro_rules! uri {
     };
 }
 
-pub fn build_rocket(
-    remuxer: RemuxerContext,
-    library: Library,
-    database: Database,
-) -> Rocket<Build> {
+pub fn build_rocket(remuxer: RemuxerContext, database: Database) -> Rocket<Build> {
     rocket::build()
         .configure(Config {
             secret_key: SecretKey::derive_from(CONF.cookie_key.as_bytes()),
             ..Default::default()
         })
         .manage(remuxer)
-        .manage(library)
         .manage(database)
         .attach(AdHoc::on_response("set server header", |_req, res| {
             res.set_header(Header::new("server", "jellything"));
@@ -92,8 +85,6 @@ pub fn build_rocket(
                 r_account_settings_post,
                 r_api_version,
                 r_api_account_login,
-                r_api_node,
-                r_api_assets_node,
                 r_api_root,
             ],
         )