From 0fa9a389d894e6cbf6a0b30a126d7e57686d0e38 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 16 Jan 2024 15:55:15 +0100 Subject: resume player correctly when progress --- server/src/routes/mod.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'server/src/routes/mod.rs') diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs index 4c7838d..c3299d3 100644 --- a/server/src/routes/mod.rs +++ b/server/src/routes/mod.rs @@ -6,9 +6,8 @@ use crate::{database::Database, routes::ui::error::MyResult}; use api::{r_api_account_login, r_api_node_raw, r_api_root, r_api_version}; use base64::Engine; -use jellybase::{CONF, federation::Federation}; +use jellybase::{federation::Federation, CONF}; use log::warn; -use progress::{r_player_progress, r_player_watched}; use rand::random; use rocket::{ catchers, config::SecretKey, fairing::AdHoc, fs::FileServer, get, http::Header, routes, Build, @@ -36,11 +35,12 @@ use ui::{ player::r_player, style::{r_assets_font, r_assets_js, r_assets_js_map, r_assets_style}, }; +use userdata::{r_node_userdata, r_player_progress, r_player_watched}; pub mod api; -pub mod progress; pub mod stream; pub mod ui; +pub mod userdata; #[macro_export] macro_rules! uri { @@ -93,6 +93,7 @@ pub fn build_rocket(database: Database, federation: Federation) -> Rocket r_assets_js, r_assets_js_map, r_stream, + r_node_userdata, r_player, r_player_progress, r_player_watched, -- cgit v1.2.3-70-g09d2