From 09f86ee5b25fbddf667ef98a22eaa076cedba23c Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 13 May 2025 14:57:19 +0200 Subject: move AcceptJson and AcceptLanguage guard in preperation to remove them --- server/src/ui/account/mod.rs | 3 +-- server/src/ui/account/settings.rs | 5 ++++- server/src/ui/admin/log.rs | 5 ++++- server/src/ui/admin/mod.rs | 2 +- server/src/ui/admin/user.rs | 5 ++++- server/src/ui/home.rs | 2 +- server/src/ui/items.rs | 2 +- server/src/ui/mod.rs | 5 ++++- server/src/ui/node.rs | 2 +- server/src/ui/player.rs | 5 ++++- server/src/ui/search.rs | 2 +- server/src/ui/stats.rs | 2 +- 12 files changed, 27 insertions(+), 13 deletions(-) (limited to 'server/src/ui') diff --git a/server/src/ui/account/mod.rs b/server/src/ui/account/mod.rs index f3cd450..51da348 100644 --- a/server/src/ui/account/mod.rs +++ b/server/src/ui/account/mod.rs @@ -7,8 +7,7 @@ pub mod settings; use super::error::MyError; use crate::{ - helper::A, - locale::AcceptLanguage, + helper::{language::AcceptLanguage, A}, ui::{error::MyResult, home::rocket_uri_macro_r_home}, }; use anyhow::anyhow; diff --git a/server/src/ui/account/settings.rs b/server/src/ui/account/settings.rs index 93f442c..f1a367d 100644 --- a/server/src/ui/account/settings.rs +++ b/server/src/ui/account/settings.rs @@ -4,7 +4,10 @@ Copyright (C) 2025 metamuffin */ use super::{format_form_error, hash_password}; -use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult}; +use crate::{ + helper::{language::AcceptLanguage, A}, + ui::error::MyResult, +}; use jellycommon::user::{PlayerKind, Theme}; use jellyimport::is_importing; use jellylogic::{session::Session, Database}; diff --git a/server/src/ui/admin/log.rs b/server/src/ui/admin/log.rs index 64782ba..f0a85f2 100644 --- a/server/src/ui/admin/log.rs +++ b/server/src/ui/admin/log.rs @@ -3,7 +3,10 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult}; +use crate::{ + helper::{language::AcceptLanguage, A}, + ui::error::MyResult, +}; use jellyimport::is_importing; use jellylogic::{ admin::log::{get_log_buffer, get_log_stream}, diff --git a/server/src/ui/admin/mod.rs b/server/src/ui/admin/mod.rs index a03d09b..942f4f8 100644 --- a/server/src/ui/admin/mod.rs +++ b/server/src/ui/admin/mod.rs @@ -10,7 +10,7 @@ use super::{ assets::{resolve_asset, AVIF_QUALITY, AVIF_SPEED}, error::MyResult, }; -use crate::{helper::A, locale::AcceptLanguage}; +use crate::helper::{language::AcceptLanguage, A}; use anyhow::{anyhow, Context}; use jellycommon::routes::u_admin_dashboard; use jellyimport::{asset_token::AssetInner, import_wrap, is_importing}; diff --git a/server/src/ui/admin/user.rs b/server/src/ui/admin/user.rs index eedf66c..939ee83 100644 --- a/server/src/ui/admin/user.rs +++ b/server/src/ui/admin/user.rs @@ -3,7 +3,10 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::{helper::A, locale::AcceptLanguage, ui::error::MyResult}; +use crate::{ + helper::{language::AcceptLanguage, A}, + ui::error::MyResult, +}; use anyhow::{anyhow, Context}; use jellycommon::user::UserPermission; use jellyimport::is_importing; diff --git a/server/src/ui/home.rs b/server/src/ui/home.rs index d323b11..555b654 100644 --- a/server/src/ui/home.rs +++ b/server/src/ui/home.rs @@ -5,7 +5,7 @@ */ use super::error::MyResult; -use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; +use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use jellycommon::api::ApiHomeResponse; use jellyimport::is_importing; use jellylogic::{session::Session, Database}; diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs index 31902f8..ed16c61 100644 --- a/server/src/ui/items.rs +++ b/server/src/ui/items.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin */ use super::error::MyError; -use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; +use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use jellycommon::api::{ApiItemsResponse, NodeFilterSort}; use jellyimport::is_importing; use jellylogic::{items::all_items, session::Session, Database}; diff --git a/server/src/ui/mod.rs b/server/src/ui/mod.rs index 041dadc..e71b08d 100644 --- a/server/src/ui/mod.rs +++ b/server/src/ui/mod.rs @@ -3,7 +3,10 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::{helper::A, locale::AcceptLanguage, CONF}; +use crate::{ + helper::{language::AcceptLanguage, A}, + CONF, +}; use error::MyResult; use home::rocket_uri_macro_r_home; use jellylogic::session::Session; diff --git a/server/src/ui/node.rs b/server/src/ui/node.rs index eced16a..00445a9 100644 --- a/server/src/ui/node.rs +++ b/server/src/ui/node.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin */ use super::error::MyResult; -use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; +use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use jellycommon::{ api::{ApiNodeResponse, NodeFilterSort}, NodeID, diff --git a/server/src/ui/player.rs b/server/src/ui/player.rs index 614bf4a..1fd9e07 100644 --- a/server/src/ui/player.rs +++ b/server/src/ui/player.rs @@ -4,7 +4,10 @@ Copyright (C) 2025 metamuffin */ use super::error::MyResult; -use crate::{helper::A, locale::AcceptLanguage, CONF}; +use crate::{ + helper::{language::AcceptLanguage, A}, + CONF, +}; use jellycommon::{ api::NodeFilterSort, stream::{StreamContainer, StreamSpec}, diff --git a/server/src/ui/search.rs b/server/src/ui/search.rs index 92fcfce..750c8bd 100644 --- a/server/src/ui/search.rs +++ b/server/src/ui/search.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin */ use super::error::MyResult; -use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; +use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use anyhow::anyhow; use jellycommon::api::ApiSearchResponse; use jellyimport::is_importing; diff --git a/server/src/ui/stats.rs b/server/src/ui/stats.rs index d991fa0..b6e9321 100644 --- a/server/src/ui/stats.rs +++ b/server/src/ui/stats.rs @@ -4,7 +4,7 @@ Copyright (C) 2025 metamuffin */ use super::error::MyError; -use crate::{api::AcceptJson, helper::A, locale::AcceptLanguage}; +use crate::helper::{accept::AcceptJson, language::AcceptLanguage, A}; use jellycommon::api::ApiStatsResponse; use jellyimport::is_importing; use jellylogic::{session::Session, stats::stats, Database}; -- cgit v1.2.3-70-g09d2