aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-10-24 21:49:30 +0200
committermetamuffin <metamuffin@disroot.org>2023-10-24 21:49:30 +0200
commit203e0f6d790db5512f32787a7c587c46e21cafb8 (patch)
tree736980434a696afab041022a43aeb7f8c18225c3
parent5ee01d06c0b067f2f07d0288c499897cd0df29f7 (diff)
downloadjellything-203e0f6d790db5512f32787a7c587c46e21cafb8.tar
jellything-203e0f6d790db5512f32787a7c587c46e21cafb8.tar.bz2
jellything-203e0f6d790db5512f32787a7c587c46e21cafb8.tar.zst
federated content permitted by default
-rw-r--r--common/src/user.rs4
-rw-r--r--server/src/routes/stream.rs2
2 files changed, 5 insertions, 1 deletions
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)));
}