Merge branch 'master' of codeberg.org:metamuffin/jellything

2 files changed, 4 insertions, 0 deletions

diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index 0569903..5944ace 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)));
     }
 
@@ -125,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()));
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},