Remove old jellycommon imports

14 files changed, 13 insertions, 49 deletions

diff --git a/ui/src/account/settings.rs b/ui/src/account/settings.rs
index 7184e26..f59dd3e 100644
--- a/ui/src/account/settings.rs
+++ b/ui/src/account/settings.rs
@@ -8,10 +8,7 @@ use crate::{
     locale::{Language, tr, trs},
     scaffold::{FlashDisplay, SessionInfo},
 };
-use jellycommon::{
-    routes::{u_account_login, u_account_settings},
-    user::{PlayerKind, Theme},
-};
+use jellycommon::routes::{u_account_login, u_account_settings};
 use markup::RenderAttributeValue;
 
 impl Page for SettingsPage<'_> {
diff --git a/ui/src/admin/log.rs b/ui/src/admin/log.rs
index 7ce21eb..637158f 100644
--- a/ui/src/admin/log.rs
+++ b/ui/src/admin/log.rs
@@ -5,10 +5,7 @@
 */
 
 use crate::Page;
-use jellycommon::{
-    api::{LogLevel, LogLine},
-    routes::u_admin_log,
-};
+use jellycommon::routes::u_admin_log;
 use markup::raw;
 use std::fmt::Write;
 
diff --git a/ui/src/admin/user.rs b/ui/src/admin/user.rs
index 86f44e1..a582d41 100644
--- a/ui/src/admin/user.rs
+++ b/ui/src/admin/user.rs
@@ -9,9 +9,8 @@ use crate::{
     locale::{Language, trs},
     scaffold::FlashDisplay,
 };
-use jellycommon::{
-    routes::{u_admin_user, u_admin_user_permission, u_admin_user_remove, u_admin_users},
-    user::{PermissionSet, User, UserPermission},
+use jellycommon::routes::{
+    u_admin_user, u_admin_user_permission, u_admin_user_remove, u_admin_users,
 };
 
 impl Page for AdminUserPage<'_> {
diff --git a/ui/src/filter_sort.rs b/ui/src/filter_sort.rs
index 515e4bc..cf06609 100644
--- a/ui/src/filter_sort.rs
+++ b/ui/src/filter_sort.rs
@@ -5,7 +5,6 @@
 */
 
 use crate::locale::{Language, trs};
-use jellycommon::api::{FilterProperty, NodeFilterSort, SortOrder, SortProperty};
 use markup::RenderAttributeValue;
 
 const SORT_CATS: &[(&str, &[(SortProperty, &str)])] = {
diff --git a/ui/src/format.rs b/ui/src/format.rs
index cc87050..138589f 100644
--- a/ui/src/format.rs
+++ b/ui/src/format.rs
@@ -5,7 +5,6 @@
 */
 
 use crate::locale::{Language, TrString, tr, trs};
-use jellycommon::{Chapter, MediaInfo, NodeKind, SourceTrackKind};
 use std::fmt::Write;
 
 pub fn format_duration(d: f64) -> String {
diff --git a/ui/src/home.rs b/ui/src/home.rs
index 6d28a5d..64e1ee5 100644
--- a/ui/src/home.rs
+++ b/ui/src/home.rs
@@ -8,7 +8,6 @@ use crate::{
     locale::{Language, tr, trs},
     node_card::NodeCard,
 };
-use jellycommon::api::ApiHomeResponse;
 use markup::DynRender;
 
 markup::define! {
diff --git a/ui/src/items.rs b/ui/src/items.rs
index a1a2a45..3879b29 100644
--- a/ui/src/items.rs
+++ b/ui/src/items.rs
@@ -9,10 +9,7 @@ use crate::{
     locale::{Language, tr, trs},
     node_card::NodeCard,
 };
-use jellycommon::{
-    api::{ApiItemsResponse, NodeFilterSort},
-    routes::u_items_filter,
-};
+use jellycommon::routes::u_items_filter;
 use markup::DynRender;
 
 markup::define! {
diff --git a/ui/src/lib.rs b/ui/src/lib.rs
index a33824d..7e17a20 100644
--- a/ui/src/lib.rs
+++ b/ui/src/lib.rs
@@ -18,7 +18,6 @@ pub mod scaffold;
 pub mod search;
 pub mod stats;
 
-use jellycommon::user::Theme;
 use markup::DynRender;
 use scaffold::{RenderInfo, Scaffold};
 use serde::{Deserialize, Serialize};
diff --git a/ui/src/node_card.rs b/ui/src/node_card.rs
index bb2fe67..d0f9904 100644
--- a/ui/src/node_card.rs
+++ b/ui/src/node_card.rs
@@ -5,11 +5,7 @@
 */
 
 use crate::{locale::Language, node_page::aspect_class, props::Props};
-use jellycommon::{
-    Node, PictureSlot,
-    routes::{u_node_image, u_node_slug, u_node_slug_player},
-    user::NodeUserData,
-};
+use jellycommon::routes::{u_node_image, u_node_slug, u_node_slug_player};
 
 markup::define! {
     NodeCard<'a>(node: &'a Node, udata: &'a NodeUserData, lang: &'a Language) {
diff --git a/ui/src/node_page.rs b/ui/src/node_page.rs
index ee13d05..3e0c64f 100644
--- a/ui/src/node_page.rs
+++ b/ui/src/node_page.rs
@@ -12,15 +12,9 @@ use crate::{
     node_card::{NodeCard, NodeCardWide},
     props::Props,
 };
-use jellycommon::{
-    Chapter, CreditCategory, IdentifierType, Node, NodeKind, PictureSlot,
-    api::NodeFilterSort,
-    routes::{
-        u_node_image, u_node_slug, u_node_slug_person_asset, u_node_slug_player,
-        u_node_slug_player_time, u_node_slug_thumbnail, u_node_slug_update_rating,
-        u_node_slug_watched,
-    },
-    user::{ApiWatchedState, NodeUserData, WatchedState},
+use jellycommon::routes::{
+    u_node_image, u_node_slug, u_node_slug_person_asset, u_node_slug_player,
+    u_node_slug_player_time, u_node_slug_thumbnail, u_node_slug_update_rating, u_node_slug_watched,
 };
 use std::sync::Arc;
 
diff --git a/ui/src/props.rs b/ui/src/props.rs
index 65ffe5c..a2e79e5 100644
--- a/ui/src/props.rs
+++ b/ui/src/props.rs
@@ -7,11 +7,6 @@ use crate::{
     format::{MediaInfoExt, format_count, format_duration},
     locale::{Language, tr, trs},
 };
-use jellycommon::{
-    Node, RatingType, Visibility,
-    chrono::DateTime,
-    user::{NodeUserData, WatchedState},
-};
 
 markup::define! {
     Props<'a>(node: &'a Node, udata: &'a NodeUserData, full: bool, lang: &'a Language) {
diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index d68f672..4f1bc8b 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -8,12 +8,9 @@ use crate::{
     CONF, FlashM,
     locale::{Language, escape, tr, trs},
 };
-use jellycommon::{
-    routes::{
-        u_account_login, u_account_logout, u_account_register, u_account_settings,
-        u_admin_dashboard, u_home, u_items, u_node_slug, u_search, u_stats,
-    },
-    user::User,
+use jellycommon::routes::{
+    u_account_login, u_account_logout, u_account_register, u_account_settings, u_admin_dashboard,
+    u_home, u_items, u_node_slug, u_search, u_stats,
 };
 use markup::{Render, raw};
 use std::sync::LazyLock;
diff --git a/ui/src/search.rs b/ui/src/search.rs
index eb01433..99380e9 100644
--- a/ui/src/search.rs
+++ b/ui/src/search.rs
@@ -9,7 +9,6 @@ use crate::{
     locale::{Language, tr, trs},
     node_card::NodeCard,
 };
-use jellycommon::api::ApiSearchResponse;
 use markup::DynRender;
 
 impl Page for SearchPage<'_> {
diff --git a/ui/src/stats.rs b/ui/src/stats.rs
index 2e1f34f..2617b2c 100644
--- a/ui/src/stats.rs
+++ b/ui/src/stats.rs
@@ -9,10 +9,7 @@ use crate::{
     format::{format_duration, format_duration_long, format_kind, format_size},
     locale::{Language, tr, trs},
 };
-use jellycommon::{
-    api::{ApiStatsResponse, StatsBin},
-    routes::u_node_slug,
-};
+use jellycommon::routes::u_node_slug;
 use markup::raw;
 
 impl Page for StatsPage<'_> {