ui: remove nongeneric uri!

2 files changed, 5 insertions, 9 deletions

diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index 008daf0..7386f54 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -6,7 +6,6 @@
 use super::{
     assets::rocket_uri_macro_r_item_assets,
     error::MyError,
-    player::player_uri,
     sort::{filter_and_sort_nodes, NodeFilterSort, NodeFilterSortForm},
 };
 use crate::{
@@ -17,6 +16,7 @@ use crate::{
             account::session::Session,
             assets::AssetRole,
             layout::{DynLayoutPage, LayoutPage},
+            player::{rocket_uri_macro_r_player, PlayerConfig},
         },
     },
     uri,
@@ -91,7 +91,7 @@ markup::define! {
                     .cardhover.open { a[href=&uri!(r_library_node(id))] { "Open" } }
                 } else {
                     .cardhover.item {
-                        a.play[href=&player_uri(id)] { "▶" }
+                        a.play[href=&uri!(r_player(id, PlayerConfig::default()))] { "▶" }
                         @Props { node }
                     }
                 }
@@ -113,7 +113,7 @@ markup::define! {
             }
             .title {
                 h1 { @node.title }
-                @if node.media.is_some() { a.play[href=&player_uri(id)] { "Watch now" }}
+                @if node.media.is_some() { a.play[href=&uri!(r_player(id, PlayerConfig::default()))] { "Watch now" }}
             }
             .details {
                 @Props { node }
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 0e6962e..005e513 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -19,9 +19,9 @@ use crate::{
 use anyhow::anyhow;
 use jellycommon::{Node, SourceTrackKind};
 use markup::DynRender;
-use rocket::{get, FromForm, State};
+use rocket::{get, FromForm, State, UriDisplayQuery};
 
-#[derive(FromForm, Default, Clone, Debug)]
+#[derive(FromForm, Default, Clone, Debug, UriDisplayQuery)]
 pub struct PlayerConfig {
     pub a: Option<u64>,
     pub v: Option<u64>,
@@ -29,10 +29,6 @@ pub struct PlayerConfig {
     pub webm: bool,
 }
 
-pub fn player_uri(id: &str) -> String {
-    format!("/n/{}/player", id)
-}
-
 #[get("/n/<id>/player?<conf..>", rank = 4)]
 pub fn r_player(
     _sess: Session,