From 14e01792e33631d134fe895018d3bef5ea74a958 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Wed, 2 Aug 2023 01:03:16 +0200
Subject: move client code to its own crate

---
 server/src/routes/ui/error.rs  | 7 +------
 server/src/routes/ui/player.rs | 9 +++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'server/src/routes/ui')

diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs
index d911a41..01aebd3 100644
--- a/server/src/routes/ui/error.rs
+++ b/server/src/routes/ui/error.rs
@@ -90,9 +90,4 @@ impl From<serde_json::Error> for MyError {
     fn from(err: serde_json::Error) -> Self {
         MyError(anyhow::anyhow!("{err}"))
     }
-}
-impl From<reqwest::Error> for MyError {
-    fn from(err: reqwest::Error) -> Self {
-        MyError(anyhow::anyhow!("{err}"))
-    }
-}
+}
\ No newline at end of file
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 2af9d9e..e295b02 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -7,7 +7,7 @@ use super::{account::session::Session, layout::LayoutPage};
 use crate::{
     database::Database,
     routes::{
-        stream::stream_uri,
+        stream::rocket_uri_macro_r_stream,
         ui::{
             assets::{rocket_uri_macro_r_item_assets, AssetRole},
             error::MyResult,
@@ -21,7 +21,6 @@ use jellycommon::{Node, SourceTrackKind};
 use markup::DynRender;
 use rocket::{get, FromForm, State};
 
-
 #[derive(FromForm, Default, Clone, Debug)]
 pub struct PlayerConfig {
     pub a: Option<u64>,
@@ -47,7 +46,9 @@ pub fn r_player(
         .chain(conf.v.into_iter())
         .chain(conf.a.into_iter())
         .chain(conf.s.into_iter())
-        .collect::<Vec<_>>();
+        .map(|e| format!("{e}"))
+        .collect::<Vec<_>>()
+        .join(",");
 
     let conf = player_conf(item.clone(), !tracks.is_empty())?;
     Ok(LayoutPage {
@@ -57,7 +58,7 @@ pub fn r_player(
             @if tracks.is_empty() {
                 img.backdrop[src=uri!(r_item_assets(&id, AssetRole::Backdrop)).to_string()];
             } else {
-                video[src=stream_uri(&id, &tracks, true), controls]{}
+                video[src=uri!(r_stream(&id, &tracks, Some(true))), controls]{}
             }
             @conf
         },
-- 
cgit v1.2.3-70-g09d2