aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes/mod.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-02-19 16:17:13 +0100
committermetamuffin <metamuffin@disroot.org>2023-02-19 16:17:13 +0100
commit3edddb0aea423a6f41da7597aec1836b015bc6bb (patch)
treef1df038aae2a89037f71ae8fc4342b88df3d210d /server/src/routes/mod.rs
parent5a1ff49fe38451451a55266e86a9e9aedecfb44d (diff)
downloadjellything-3edddb0aea423a6f41da7597aec1836b015bc6bb.tar
jellything-3edddb0aea423a6f41da7597aec1836b015bc6bb.tar.bz2
jellything-3edddb0aea423a6f41da7597aec1836b015bc6bb.tar.zst
api errors in json
Diffstat (limited to 'server/src/routes/mod.rs')
-rw-r--r--server/src/routes/mod.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs
index 421907b..54d4ae0 100644
--- a/server/src/routes/mod.rs
+++ b/server/src/routes/mod.rs
@@ -4,7 +4,7 @@
Copyright (C) 2023 metamuffin <metamuffin.org>
*/
use crate::{database::Database, library::Library, routes::ui::error::MyResult, CONF};
-use api::{r_api_account_login, r_api_version, r_api_library_node};
+use api::{error::r_api_catch, r_api_account_login, r_api_library_node, r_api_root, r_api_version};
use jellyremuxer::RemuxerContext;
use rocket::{
catchers, config::SecretKey, fairing::AdHoc, fs::FileServer, get, http::Header, routes, Build,
@@ -55,6 +55,7 @@ pub fn build_rocket(
Box::pin(async {})
}))
.register("/", catchers![r_catch])
+ .register("/api", catchers![r_api_catch])
.mount("/assets", FileServer::from(&CONF.asset_path))
.mount(
"/",
@@ -83,6 +84,7 @@ pub fn build_rocket(
r_api_version,
r_api_account_login,
r_api_library_node,
+ r_api_root,
],
)
}