aboutsummaryrefslogtreecommitdiff
path: root/server/src/ui/player.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/ui/player.rs')
-rw-r--r--server/src/ui/player.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/server/src/ui/player.rs b/server/src/ui/player.rs
index 1fd9e07..ae4468d 100644
--- a/server/src/ui/player.rs
+++ b/server/src/ui/player.rs
@@ -15,7 +15,7 @@ use jellycommon::{
NodeID,
};
use jellyimport::is_importing;
-use jellylogic::{node::get_node, session::Session, Database};
+use jellylogic::{node::get_node, session::Session};
use jellyui::{
node_page::NodePage,
render_page,
@@ -24,7 +24,7 @@ use jellyui::{
use rocket::{
get,
response::{content::RawHtml, Redirect},
- Either, State,
+ Either,
};
use std::time::Duration;
@@ -46,20 +46,12 @@ fn jellynative_url(action: &str, seek: f64, secret: &str, node: &str, session: &
pub fn r_player(
session: A<Session>,
lang: AcceptLanguage,
- db: &State<Database>,
t: Option<f64>,
id: A<NodeID>,
) -> MyResult<Either<RawHtml<String>, Redirect>> {
let AcceptLanguage(lang) = lang;
- let r = get_node(
- &db,
- id.0,
- &session.0,
- false,
- true,
- NodeFilterSort::default(),
- )?;
+ let r = get_node(&session.0, id.0, false, true, NodeFilterSort::default())?;
let native_session = |action: &str| {
Ok(Either::Right(Redirect::temporary(jellynative_url(