rework import system pt. 1

1 files changed, 30 insertions, 29 deletions

diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index e7b3d54..14db462 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -4,14 +4,14 @@
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
 use super::ui::{account::session::Session, error::MyError};
-use crate::{database::Database, federation::Federation};
+use crate::database::Database;
 use anyhow::{anyhow, Result};
 use jellybase::{
+    federation::Federation,
     permission::{NodePermissionExt, PermissionSetExt},
     CONF,
 };
-use jellyclient::LoginDetails;
-use jellycommon::{stream::StreamSpec, user::UserPermission, MediaSource};
+use jellycommon::{stream::StreamSpec, user::UserPermission, TrackSource};
 use log::{info, warn};
 use rocket::{
     get, head,
@@ -58,35 +58,36 @@ pub async fn r_stream(
         .as_ref()
         .ok_or(anyhow!("item does not contain media"))?;
 
-    if let MediaSource::Remote { host, remote_id } = source {
-        session
-            .user
-            .permissions
-            .assert(&UserPermission::FederatedContent)?;
+    // TODO federated streams
+    // if let MediaSource::Remote { host, remote_id } = source {
+    //     session
+    //         .user
+    //         .permissions
+    //         .assert(&UserPermission::FederatedContent)?;
 
-        let (username, password, _) = CONF
-            .remote_credentials
-            .get(host)
-            .ok_or(anyhow!("no credentials on the server-side"))?;
+    //     let (username, password, _) = CONF
+    //         .remote_credentials
+    //         .get(host)
+    //         .ok_or(anyhow!("no credentials on the server-side"))?;
 
-        info!("creating session on {host}");
-        let instance = federation.get_instance(&host)?.to_owned();
-        let session = instance
-            .login(LoginDetails {
-                username: username.to_owned(),
-                password: password.to_owned(),
-                expire: Some(60),
-                drop_permissions: Some(HashSet::from_iter([
-                    UserPermission::ManageSelf,
-                    UserPermission::Admin, // in case somebody federated the admin :)))
-                ])),
-            })
-            .await?;
+    //     info!("creating session on {host}");
+    //     let instance = federation.get_instance(&host)?.to_owned();
+    //     let session = instance
+    //         .login(LoginDetails {
+    //             username: username.to_owned(),
+    //             password: password.to_owned(),
+    //             expire: Some(60),
+    //             drop_permissions: Some(HashSet::from_iter([
+    //                 UserPermission::ManageSelf,
+    //                 UserPermission::Admin, // in case somebody federated the admin :)))
+    //             ])),
+    //         })
+    //         .await?;
 
-        let uri = session.stream(&remote_id, &spec);
-        info!("federation redirect");
-        return Ok(Either::Right(RedirectResponse(uri)));
-    }
+    //     let uri = session.stream(&remote_id, &spec);
+    //     info!("federation redirect");
+    //     return Ok(Either::Right(RedirectResponse(uri)));
+    // }
 
     info!(
         "stream request (range={})",