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/admin/log.rs | 5 ++++- server/src/ui/admin/mod.rs | 2 +- server/src/ui/admin/user.rs | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'server/src/ui/admin') 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; -- cgit v1.2.3-70-g09d2