move files around

29 files changed, 50 insertions, 74 deletions

diff --git a/server/src/logic/mod.rs b/server/src/logic/mod.rs
deleted file mode 100644
index 24d58f8..0000000
--- a/server/src/logic/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2026 metamuffin <metamuffin.org>
-*/
-pub mod playersync;
-pub mod stream;
-pub mod userdata;
diff --git a/server/src/main.rs b/server/src/main.rs
index d6f1e1e..0c42bb6 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -23,15 +23,11 @@ use routes::build_rocket;
 use serde::Deserialize;
 use std::{env::args, fs::read_to_string, path::PathBuf, process::exit, sync::Arc};
 
-pub mod api;
 pub mod auth;
-pub mod compat;
 pub mod logger;
-pub mod logic;
 pub mod request_info;
 pub mod responders;
 pub mod routes;
-pub mod ui;
 
 #[rocket::main]
 async fn main() {
diff --git a/server/src/request_info.rs b/server/src/request_info.rs
index 55dde0d..9e83230 100644
--- a/server/src/request_info.rs
+++ b/server/src/request_info.rs
@@ -7,7 +7,7 @@
 use crate::{
     State,
     auth::token_to_user,
-    ui::error::{MyError, MyResult},
+    routes::error::{MyError, MyResult},
 };
 use anyhow::anyhow;
 use jellycommon::{USER_ADMIN, User, jellyobject::Object};
diff --git a/server/src/request_info/session.rs b/server/src/request_info/session.rs
deleted file mode 100644
index d032659..0000000
--- a/server/src/request_info/session.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-    This file is part of jellything (https://codeberg.org/metamuffin/jellything)
-    which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
-    Copyright (C) 2026 metamuffin <metamuffin.org>
-*/
-use super::A;
-use crate::ui::error::MyError;
-use anyhow::anyhow;
-use log::warn;
-use rocket::{
-    Request, async_trait,
-    http::Status,
-    outcome::Outcome,
-    request::{self, FromRequest},
-};
diff --git a/server/src/ui/account/mod.rs b/server/src/routes/account/mod.rs
index df8bec5..e15df9e 100644
--- a/server/src/ui/account/mod.rs
+++ b/server/src/routes/account/mod.rs
@@ -10,7 +10,7 @@ pub mod settings;
 use crate::{
     auth::{hash_password, login},
     request_info::RequestInfo,
-    ui::error::MyResult,
+    routes::error::MyResult,
 };
 use jellycommon::{
     jellyobject::Path,
diff --git a/server/src/ui/account/settings.rs b/server/src/routes/account/settings.rs
index 2585061..54ecf22 100644
--- a/server/src/ui/account/settings.rs
+++ b/server/src/routes/account/settings.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 use super::format_form_error;
-use crate::{auth::hash_password, request_info::RequestInfo, ui::error::MyResult};
+use crate::{auth::hash_password, request_info::RequestInfo, routes::error::MyResult};
 use anyhow::anyhow;
 use jellycommon::{
     jellyobject::{Object, Path, Tag},
diff --git a/server/src/ui/admin/import.rs b/server/src/routes/admin/import.rs
index e199de4..31e7d70 100644
--- a/server/src/ui/admin/import.rs
+++ b/server/src/routes/admin/import.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{request_info::RequestInfo, ui::error::MyResult};
+use crate::{request_info::RequestInfo, routes::error::MyResult};
 use jellycommon::routes::u_admin_import;
 use jellyimport::{
     ImportConfig, import_wrap, is_importing,
diff --git a/server/src/ui/admin/log.rs b/server/src/routes/admin/log.rs
index 168ec6a..bf8126a 100644
--- a/server/src/ui/admin/log.rs
+++ b/server/src/routes/admin/log.rs
@@ -6,7 +6,7 @@
 use crate::{
     logger::{get_log_buffer, get_log_stream},
     request_info::RequestInfo,
-    ui::error::MyResult,
+    routes::error::MyResult,
 };
 use jellyui::components::admin_log::{ServerLogPage, render_log_line};
 use rocket::{get, response::content::RawHtml};
diff --git a/server/src/ui/admin/mod.rs b/server/src/routes/admin/mod.rs
index 6119b74..6119b74 100644
--- a/server/src/ui/admin/mod.rs
+++ b/server/src/routes/admin/mod.rs
diff --git a/server/src/ui/admin/users.rs b/server/src/routes/admin/users.rs
index f5fef24..01a6403 100644
--- a/server/src/ui/admin/users.rs
+++ b/server/src/routes/admin/users.rs
@@ -6,7 +6,7 @@
 
 use std::str::FromStr;
 
-use crate::{auth::hash_password, request_info::RequestInfo, ui::error::MyResult};
+use crate::{auth::hash_password, request_info::RequestInfo, routes::error::MyResult};
 use anyhow::anyhow;
 use base64::{Engine, prelude::BASE64_URL_SAFE};
 use jellycommon::{
diff --git a/server/src/api.rs b/server/src/routes/api.rs
index d83d8e3..d83d8e3 100644
--- a/server/src/api.rs
+++ b/server/src/routes/api.rs
diff --git a/server/src/ui/assets.rs b/server/src/routes/assets.rs
index 089f293..089f293 100644
--- a/server/src/ui/assets.rs
+++ b/server/src/routes/assets.rs
diff --git a/server/src/compat/jellyfin/mod.rs b/server/src/routes/compat/jellyfin/mod.rs
index 8fa44cb..8fa44cb 100644
--- a/server/src/compat/jellyfin/mod.rs
+++ b/server/src/routes/compat/jellyfin/mod.rs
diff --git a/server/src/compat/jellyfin/models.rs b/server/src/routes/compat/jellyfin/models.rs
index 0a41461..0a41461 100644
--- a/server/src/compat/jellyfin/models.rs
+++ b/server/src/routes/compat/jellyfin/models.rs
diff --git a/server/src/compat/mod.rs b/server/src/routes/compat/mod.rs
index 859b60a..859b60a 100644
--- a/server/src/compat/mod.rs
+++ b/server/src/routes/compat/mod.rs
diff --git a/server/src/compat/youtube.rs b/server/src/routes/compat/youtube.rs
index 917adc0..9674635 100644
--- a/server/src/compat/youtube.rs
+++ b/server/src/routes/compat/youtube.rs
@@ -3,7 +3,8 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
-use crate::{request_info::RequestInfo, ui::error::MyResult};
+use crate::request_info::RequestInfo;
+use crate::routes::error::MyResult;
 use anyhow::anyhow;
 use jellycommon::{
     IDENT_YOUTUBE_VIDEO, NO_IDENTIFIERS, NO_SLUG, jellyobject::Path, routes::u_node_id,
diff --git a/server/src/ui/error.rs b/server/src/routes/error.rs
index 578d841..578d841 100644
--- a/server/src/ui/error.rs
+++ b/server/src/routes/error.rs
diff --git a/server/src/ui/home.rs b/server/src/routes/home.rs
index 17cac83..17cac83 100644
--- a/server/src/ui/home.rs
+++ b/server/src/routes/home.rs
diff --git a/server/src/ui/mod.rs b/server/src/routes/index.rs
index 2dab076..1f0e8c9 100644
--- a/server/src/ui/mod.rs
+++ b/server/src/routes/index.rs
@@ -3,23 +3,12 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
-use crate::{State, request_info::RequestInfo};
-use error::MyResult;
+use crate::{State, request_info::RequestInfo, routes::error::MyResult};
 use jellycommon::routes::{u_account_login, u_home};
 use rocket::{futures::FutureExt, get, response::Redirect};
 use std::{future::Future, pin::Pin, sync::Arc};
 use tokio::{fs::File, io::AsyncRead};
 
-pub mod account;
-pub mod admin;
-pub mod assets;
-pub mod error;
-pub mod home;
-pub mod items;
-pub mod node;
-pub mod player;
-pub mod style;
-
 #[get("/")]
 pub async fn r_index(ri: RequestInfo<'_>) -> MyResult<Redirect> {
     if ri.user.is_some() {
diff --git a/server/src/ui/items.rs b/server/src/routes/items.rs
index bd4b759..0f7386c 100644
--- a/server/src/ui/items.rs
+++ b/server/src/routes/items.rs
@@ -4,7 +4,7 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use crate::{request_info::RequestInfo, ui::error::MyResult};
+use crate::{request_info::RequestInfo, routes::error::MyResult};
 use anyhow::anyhow;
 use base64::{Engine, prelude::BASE64_URL_SAFE};
 use jellycommon::{
diff --git a/server/src/routes.rs b/server/src/routes/mod.rs
index fc1d5e6..959971a 100644
--- a/server/src/routes.rs
+++ b/server/src/routes/mod.rs
@@ -3,35 +3,48 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
-use crate::{
-    State,
-    api::{r_api_root, r_version},
-    compat::youtube::{r_youtube_channel, r_youtube_embed, r_youtube_watch},
-    logic::{
-        playersync::{PlayersyncChannels, r_playersync},
-        stream::r_stream,
+
+pub mod account;
+pub mod admin;
+pub mod api;
+pub mod assets;
+pub mod compat;
+pub mod error;
+pub mod home;
+pub mod index;
+pub mod items;
+pub mod node;
+pub mod player;
+pub mod playersync;
+pub mod stream;
+pub mod style;
+pub mod userdata;
+
+use self::{
+    account::{
+        r_account_login, r_account_login_post, r_account_logout, r_account_logout_post,
+        settings::{r_account_settings, r_account_settings_post},
     },
-    ui::{
-        account::{
-            r_account_login, r_account_login_post, r_account_logout, r_account_logout_post,
-            settings::{r_account_settings, r_account_settings_post},
-        },
-        admin::{
-            import::{r_admin_import, r_admin_import_post, r_admin_import_stream},
-            log::{r_admin_log, r_admin_log_stream},
-            r_admin_dashboard,
-            users::{r_admin_new_user, r_admin_user, r_admin_user_remove, r_admin_users},
-        },
-        assets::{r_image, r_image_fallback_person},
-        error::{r_api_catch, r_catch},
-        home::r_home,
-        items::r_items,
-        node::r_node,
-        player::r_player,
-        r_favicon, r_index,
-        style::{r_assets_css, r_assets_font, r_assets_js, r_assets_js_map},
+    admin::{
+        import::{r_admin_import, r_admin_import_post, r_admin_import_stream},
+        log::{r_admin_log, r_admin_log_stream},
+        r_admin_dashboard,
+        users::{r_admin_new_user, r_admin_user, r_admin_user_remove, r_admin_users},
     },
+    api::{r_api_root, r_version},
+    assets::{r_image, r_image_fallback_person},
+    compat::youtube::{r_youtube_channel, r_youtube_embed, r_youtube_watch},
+    error::{r_api_catch, r_catch},
+    home::r_home,
+    index::{r_favicon, r_index},
+    items::r_items,
+    node::r_node,
+    player::r_player,
+    playersync::{PlayersyncChannels, r_playersync},
+    stream::r_stream,
+    style::{r_assets_css, r_assets_font, r_assets_js, r_assets_js_map},
 };
+use crate::State;
 use rocket::{
     Build, Config, Rocket, catchers, fairing::AdHoc, fs::FileServer, http::Header, routes,
     shield::Shield,
diff --git a/server/src/ui/node.rs b/server/src/routes/node.rs
index ca07bac..ca07bac 100644
--- a/server/src/ui/node.rs
+++ b/server/src/routes/node.rs
diff --git a/server/src/ui/player.rs b/server/src/routes/player.rs
index c6c177e..c6c177e 100644
--- a/server/src/ui/player.rs
+++ b/server/src/routes/player.rs
diff --git a/server/src/logic/playersync.rs b/server/src/routes/playersync.rs
index 71e2809..71e2809 100644
--- a/server/src/logic/playersync.rs
+++ b/server/src/routes/playersync.rs
diff --git a/server/src/ui/search.rs b/server/src/routes/search.rs
index 8ec2697..8ec2697 100644
--- a/server/src/ui/search.rs
+++ b/server/src/routes/search.rs
diff --git a/server/src/ui/stats.rs b/server/src/routes/stats.rs
index 387ca63..387ca63 100644
--- a/server/src/ui/stats.rs
+++ b/server/src/routes/stats.rs
diff --git a/server/src/logic/stream.rs b/server/src/routes/stream.rs
index 38d2b7b..a72e0d9 100644
--- a/server/src/logic/stream.rs
+++ b/server/src/routes/stream.rs
@@ -3,7 +3,7 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
-use crate::{request_info::RequestInfo, ui::error::MyError};
+use crate::{request_info::RequestInfo, routes::error::MyError};
 use anyhow::{Result, anyhow};
 use jellycommon::{
     NO_SLUG, NO_TITLE, NO_TRACK, TR_SOURCE, TRSOURCE_LOCAL_PATH, jellyobject::Path,
diff --git a/server/src/ui/style.rs b/server/src/routes/style.rs
index b2a2189..b2a2189 100644
--- a/server/src/ui/style.rs
+++ b/server/src/routes/style.rs
diff --git a/server/src/logic/userdata.rs b/server/src/routes/userdata.rs
index 9fdc2bf..9fdc2bf 100644
--- a/server/src/logic/userdata.rs
+++ b/server/src/routes/userdata.rs