From 2837151dbaccfc989f61921c02d9489408c8afe5 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 30 Aug 2024 02:54:47 +0000
Subject: [PATCH] redirect legacy url preview
Signed-off-by: Jason Volk <jason@zemos.net>
---
src/api/router.rs | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/api/router.rs b/src/api/router.rs
index 536ef6ea2..1e4a74649 100644
--- a/src/api/router.rs
+++ b/src/api/router.rs
@@ -5,13 +5,15 @@
mod response;
pub mod state;
+use std::str::FromStr;
+
use axum::{
- response::IntoResponse,
+ response::{IntoResponse, Redirect},
routing::{any, get, post},
Router,
};
use conduit::{err, Server};
-use http::Uri;
+use http::{uri, Uri};
use self::handler::RouterExt;
pub(super) use self::{args::Args as Ruma, response::RumaResponse, state::State};
@@ -243,11 +245,29 @@ pub fn build(router: Router<State>, server: &Server) -> Router<State> {
);
} else {
router = router.route("/_matrix/media/*path", any(legacy_media_disabled));
+ router = router.route("/_matrix/media/v3/preview_url", any(redirect_legacy_preview));
}
router
}
+async fn redirect_legacy_preview(uri: Uri) -> impl IntoResponse {
+ let path = "/_matrix/client/v1/media/preview_url";
+ let query = uri.query().unwrap_or_default();
+
+ let path_and_query = format!("{path}?{query}");
+ let path_and_query = uri::PathAndQuery::from_str(&path_and_query)
+ .expect("Failed to build PathAndQuery for media preview redirect URI");
+
+ let uri = uri::Builder::new()
+ .path_and_query(path_and_query)
+ .build()
+ .expect("Failed to build URI for redirect")
+ .to_string();
+
+ Redirect::temporary(&uri)
+}
+
async fn initial_sync(_uri: Uri) -> impl IntoResponse {
err!(Request(GuestAccessForbidden("Guest access not implemented")))
}
--
GitLab