aboutsummaryrefslogtreecommitdiff
path: root/server/src/routes
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-07-31 16:52:46 +0200
committermetamuffin <metamuffin@disroot.org>2023-07-31 16:52:46 +0200
commit0c651f11920350a4aa96aa24f8fe15b28390aed2 (patch)
tree724e5e79d6c6000077cd0c33c669c32475ed069f /server/src/routes
parente6e424833315a6c0d04c7706d539f57e1b1df0f7 (diff)
downloadjellything-0c651f11920350a4aa96aa24f8fe15b28390aed2.tar
jellything-0c651f11920350a4aa96aa24f8fe15b28390aed2.tar.bz2
jellything-0c651f11920350a4aa96aa24f8fe15b28390aed2.tar.zst
update remuxer for new schema
Diffstat (limited to 'server/src/routes')
-rw-r--r--server/src/routes/mod.rs5
-rw-r--r--server/src/routes/ui/account/settings.rs10
2 files changed, 9 insertions, 6 deletions
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs
index 6f8109b..8d50c2e 100644
--- a/server/src/routes/mod.rs
+++ b/server/src/routes/mod.rs
@@ -4,7 +4,10 @@
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_node, r_api_assets_node, r_api_root, r_api_version};
+use api::{
+ error::r_api_catch, r_api_account_login, r_api_assets_node, r_api_node, r_api_root,
+ r_api_version,
+};
use jellyremuxer::RemuxerContext;
use rocket::{
catchers, config::SecretKey, fairing::AdHoc, fs::FileServer, get, http::Header, routes, Build,
diff --git a/server/src/routes/ui/account/settings.rs b/server/src/routes/ui/account/settings.rs
index e196b35..59b10b7 100644
--- a/server/src/routes/ui/account/settings.rs
+++ b/server/src/routes/ui/account/settings.rs
@@ -3,11 +3,6 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2023 metamuffin <metamuffin.org>
*/
-use std::ops::Range;
-use rocket::{
- form::{self, validate::len, Contextual, Form},
- get, post, FromForm, State,
-};
use super::{format_form_error, hash_password};
use crate::{
database::Database,
@@ -18,6 +13,11 @@ use crate::{
},
uri,
};
+use rocket::{
+ form::{self, validate::len, Contextual, Form},
+ get, post, FromForm, State,
+};
+use std::ops::Range;
#[derive(FromForm)]
pub struct SettingsForm {