From e503d5af484fb55a07125b3708ba658606e56c5d Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 13 Apr 2024 16:09:36 +0200
Subject: start native player at time

---
 server/src/routes/ui/account/settings.rs | 2 +-
 server/src/routes/ui/player.rs           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'server/src')

diff --git a/server/src/routes/ui/account/settings.rs b/server/src/routes/ui/account/settings.rs
index ec92ba2..1b0de99 100644
--- a/server/src/routes/ui/account/settings.rs
+++ b/server/src/routes/ui/account/settings.rs
@@ -95,7 +95,7 @@ fn settings_page(session: Session, flash: Option<MyResult<String>>) -> DynLayout
                 label[for="native_secret"] { "Native Secret" }
                 input[type="password", id="native_secret", name="native_secret"];
                 input[type="submit", value="Update"];
-                p { "The secret can be found in " code{"$XDG_CONFIG_HOME/jellynative_secret"} " or by clicking " a.button[href="jellynative://show-secret"] { "Show Secret" } "." }
+                p { "The secret can be found in " code{"$XDG_CONFIG_HOME/jellynative_secret"} " or by clicking " a.button[href="jellynative://show-secret-v1"] { "Show Secret" } "." }
             }
         },
         ..Default::default()
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 80386ad..69445ed 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -51,7 +51,7 @@ impl PlayerConfig {
     }
 }
 
-fn jellynative_url(action: &str, secret: &str, node: &str, session: &str) -> String {
+fn jellynative_url(action: &str, seek: f64, secret: &str, node: &str, session: &str) -> String {
     let protocol = if CONF.tls { "https" } else { "http" };
     let host = &CONF.hostname;
     let stream_url = uri!(r_stream(
@@ -61,7 +61,7 @@ fn jellynative_url(action: &str, secret: &str, node: &str, session: &str) -> Str
             ..Default::default()
         }
     ));
-    format!("jellynative://{action}/{secret}/{session}/{protocol}://{host}{stream_url}",)
+    format!("jellynative://{action}/{secret}/{session}/{seek}/{protocol}://{host}{stream_url}",)
 }
 
 #[get("/n/<id>/player?<conf..>", rank = 4)]
@@ -84,6 +84,7 @@ pub fn r_player<'a>(
         }
         Ok(Either::Right(Redirect::temporary(jellynative_url(
             action,
+            conf.t.unwrap_or(0.),
             &sess.user.native_secret,
             id,
             &token::create(
@@ -97,10 +98,10 @@ pub fn r_player<'a>(
     match conf.kind.unwrap_or(sess.user.player_preference) {
         PlayerKind::Browser => (),
         PlayerKind::Native => {
-            return native_session("player");
+            return native_session("player-v2");
         }
         PlayerKind::NativeFullscreen => {
-            return native_session("player-fullscreen");
+            return native_session("player-fullscreen-v2");
         }
     }
 
-- 
cgit v1.2.3-70-g09d2