From 2fc5931a6ce9bbb75757c4a20022b19778bd91c5 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Oct 2023 19:22:01 +0200
Subject: move db to jellybase

---
 server/src/routes/ui/error.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/src/routes')

diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs
index b538a06..a4ef50c 100644
--- a/server/src/routes/ui/error.rs
+++ b/server/src/routes/ui/error.rs
@@ -5,6 +5,7 @@
 */
 use super::layout::{DynLayoutPage, LayoutPage};
 use crate::{routes::ui::account::rocket_uri_macro_r_account_login, uri};
+use jellybase::database::sled;
 use rocket::{
     catch,
     http::{MediaType, Status},
-- 
cgit v1.2.3-70-g09d2


From 203e0f6d790db5512f32787a7c587c46e21cafb8 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Oct 2023 21:49:30 +0200
Subject: federated content permitted by default

---
 common/src/user.rs          | 4 +++-
 server/src/routes/stream.rs | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'server/src/routes')

diff --git a/common/src/user.rs b/common/src/user.rs
index 0d4806e..17700a0 100644
--- a/common/src/user.rs
+++ b/common/src/user.rs
@@ -47,7 +47,9 @@ impl UserPermission {
         use UserPermission::*;
         matches!(
             self,
-            Transcode | StreamFormat(Jhls | HlsMaster | HlsVariant | Matroska | Segment)
+            Transcode
+                | FederatedContent
+                | StreamFormat(Jhls | HlsMaster | HlsVariant | Matroska | Segment)
         )
     }
 }
diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index 0569903..5c59591 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -68,6 +68,7 @@ pub async fn r_stream(
             .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(
@@ -78,6 +79,7 @@ pub async fn r_stream(
             .await?;
 
         let uri = session.stream(&remote_id, &spec);
+        info!("federation redirect");
         return Ok(Either::Right(Redirect::found(uri)));
     }
 
-- 
cgit v1.2.3-70-g09d2


From 42b35a4bb86dd6f67cfe6ef14b6ff53f8b9eab1a Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Oct 2023 21:52:54 +0200
Subject: cors stream

---
 server/src/routes/stream.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/src/routes')

diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index 5c59591..5944ace 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -127,6 +127,7 @@ impl<'r> Responder<'r, 'static> for StreamResponse {
     fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
         let mut b = Response::build();
         b.status(Status::Ok);
+        b.header(Header::new("access-control-allow-origin", "*"));
         if let Some(range) = self.range {
             b.status(Status::PartialContent);
             b.header(Header::new("content-range", range.to_cr_hv()));
-- 
cgit v1.2.3-70-g09d2