diff options
author | metamuffin <metamuffin@disroot.org> | 2025-04-30 11:46:28 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-04-30 11:46:28 +0200 |
commit | 35ae80f183904466667af73c7921b4ade399569a (patch) | |
tree | 3a7eec95debbd9ba292436ff989742b8a9b1dff4 /server/src/ui/account | |
parent | d6a039a10ac3c81d410beb9b648d29524ca1e278 (diff) | |
download | jellything-35ae80f183904466667af73c7921b4ade399569a.tar jellything-35ae80f183904466667af73c7921b4ade399569a.tar.bz2 jellything-35ae80f183904466667af73c7921b4ade399569a.tar.zst |
split base into asset_token and db
Diffstat (limited to 'server/src/ui/account')
-rw-r--r-- | server/src/ui/account/mod.rs | 2 | ||||
-rw-r--r-- | server/src/ui/account/settings.rs | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs index a9c28ea..f3cd450 100644 --- a/server/src/ui/account/mod.rs +++ b/server/src/ui/account/mod.rs @@ -7,7 +7,6 @@ pub mod settings; use super::error::MyError; use crate::{ - database::Database, helper::A, locale::AcceptLanguage, ui::{error::MyResult, home::rocket_uri_macro_r_home}, @@ -18,6 +17,7 @@ use jellyimport::is_importing; use jellylogic::{ login::{hash_password, login_logic}, session::Session, + Database, }; use jellyui::{ account::{AccountLogin, AccountLogout, AccountRegister, AccountRegisterSuccess}, diff --git a/server/src/ui/account/settings.rs b/server/src/ui/account/settings.rs index 5355321..93f442c 100644 --- a/server/src/ui/account/settings.rs +++ b/server/src/ui/account/settings.rs @@ -4,11 +4,10 @@ Copyright (C) 2025 metamuffin <metamuffin.org> */ use super::{format_form_error, hash_password}; -use crate::{database::Database, helper::A, locale::AcceptLanguage, ui::error::MyResult}; -use jellybase::permission::PermissionSetExt; -use jellycommon::user::{PlayerKind, Theme, UserPermission}; +use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult}; +use jellycommon::user::{PlayerKind, Theme}; use jellyimport::is_importing; -use jellylogic::session::Session; +use jellylogic::{session::Session, Database}; use jellyui::{ account::settings::SettingsPage, locale::{tr, Language}, @@ -74,10 +73,6 @@ pub fn r_account_settings_post( ) -> MyResult<RawHtml<String>> { let AcceptLanguage(lang) = lang; let A(session) = session; - session - .user - .permissions - .assert(&UserPermission::ManageSelf)?; let form = match &form.value { Some(v) => v, |