Fix AceStream playback URLs in content detail streams API.

The catalog streams endpoint never built MediaFlow acestream URLs, so the UI showed no playable URL even when MediaFlow was configured.

Author: mhdzumair

backend/src/routes/content/catalog_browse.rs

@@ -1179,6 +1179,10 @@ pub async fn get_media_streams(
         .mediaflow_config
         .as_ref()
         .filter(|m| m.enable_web_playback && m.proxy_url.as_deref().is_some_and(|s| !s.is_empty()));
+    let mediaflow_config = ud
+        .mediaflow_config
+        .as_ref()
+        .filter(|m| m.proxy_url.as_deref().is_some_and(|s| !s.is_empty()));
     let web_playback_enabled = mediaflow_web_config.is_some();
     let season = effective_season;
     let episode = effective_episode;
@@ -1231,6 +1235,8 @@ pub async fn get_media_streams(
             tgs.chat_id AS tg_chat_id,
             tgs.message_id AS tg_message_id,
             tgs.id AS telegram_stream_id,
+            ace.content_id AS ace_content_id,
+            ace.info_hash AS ace_info_hash,
             {STREAM_LINK_AGG_COLS},
             ts.created_at
            FROM stream s
@@ -1243,6 +1249,7 @@ pub async fn get_media_streams(
            LEFT JOIN usenet_stream us ON us.stream_id = s.id
            LEFT JOIN youtube_stream ys ON ys.stream_id = s.id
            LEFT JOIN telegram_stream tgs ON tgs.stream_id = s.id
+           LEFT JOIN acestream_stream ace ON ace.stream_id = s.id
            WHERE {stream_visibility}
              AND fml.media_id = $1
              AND fml.season_number = $2
@@ -1272,6 +1279,8 @@ pub async fn get_media_streams(
             tgs.chat_id AS tg_chat_id,
             tgs.message_id AS tg_message_id,
             tgs.id AS telegram_stream_id,
+            ace.content_id AS ace_content_id,
+            ace.info_hash AS ace_info_hash,
             {STREAM_LINK_AGG_COLS},
             ts.created_at
            FROM stream s
@@ -1280,6 +1289,7 @@ pub async fn get_media_streams(
            LEFT JOIN usenet_stream us ON us.stream_id = s.id
            LEFT JOIN youtube_stream ys ON ys.stream_id = s.id
            LEFT JOIN telegram_stream tgs ON tgs.stream_id = s.id
+           LEFT JOIN acestream_stream ace ON ace.stream_id = s.id
            WHERE sml.media_id = $1
              AND {stream_visibility}"#
         )))
@@ -1496,8 +1506,23 @@ pub async fn get_media_streams(
                 };
             let keyword_blocked = kf.is_stream_text_blocked(&r.name, r.filename.as_deref());
 
-            // Build playback URL for torrent/usenet/telegram streams when configured.
-            let raw_playback_url: Option<String> = if rd_blocked || secret_str.is_empty() {
+            // Build playback URL for torrent/usenet/telegram/acestream streams when configured.
+            let raw_playback_url: Option<String> = if rd_blocked {
+                None
+            } else if r.stream_type == StreamType::Acestream {
+                if ud.enable_acestream_streams {
+                    mediaflow_config.and_then(|mf| {
+                        mediaflow::encode_mediaflow_acestream_url(
+                            mf.proxy_url.as_deref()?,
+                            r.ace_content_id.as_deref(),
+                            r.ace_info_hash.as_deref(),
+                            mf.api_password.as_deref(),
+                        )
+                    })
+                } else {
+                    None
+                }
+            } else if secret_str.is_empty() {
                 None
             } else if r.stream_type == StreamType::Telegram {
                 if let Some(tg_id) = r.telegram_stream_id {
@@ -1564,25 +1589,29 @@ pub async fn get_media_streams(
             };
 
             // Build browser_url by wrapping raw_playback_url through MediaFlow when configured.
-            // raw_playback_url is kept for external players; browser_url is for in-browser playback.
-            let browser_url: Option<String> = raw_playback_url.as_deref().and_then(|raw| {
-                mediaflow_web_config.and_then(|mf| {
-                    let proxy_url = mf.proxy_url.as_deref()?;
-                    let mut params = std::collections::BTreeMap::new();
-                    if let Some(ap) = mf.api_password.as_deref().filter(|s| !s.is_empty()) {
-                        params.insert("api_password".into(), ap.to_string());
-                    }
-                    mediaflow::encode_mediaflow_proxy_url(
-                        proxy_url,
-                        "/proxy/stream",
-                        Some(raw),
-                        params,
-                        None,
-                        None,
-                    )
-                    .ok()
+            // AceStream URLs already target MediaFlow directly and must not be double-wrapped.
+            let browser_url: Option<String> = if r.stream_type == StreamType::Acestream {
+                raw_playback_url.clone()
+            } else {
+                raw_playback_url.as_deref().and_then(|raw| {
+                    mediaflow_web_config.and_then(|mf| {
+                        let proxy_url = mf.proxy_url.as_deref()?;
+                        let mut params = std::collections::BTreeMap::new();
+                        if let Some(ap) = mf.api_password.as_deref().filter(|s| !s.is_empty()) {
+                            params.insert("api_password".into(), ap.to_string());
+                        }
+                        mediaflow::encode_mediaflow_proxy_url(
+                            proxy_url,
+                            "/proxy/stream",
+                            Some(raw),
+                            params,
+                            None,
+                            None,
+                        )
+                        .ok()
+                    })
                 })
-            });
+            };
 
             let output = json!({
                 "id": r.id,

backend/src/routes/content/stream_rows.rs

@@ -65,6 +65,8 @@ pub struct BrowseStreamRow {
     pub tg_chat_id: Option<String>,
     pub tg_message_id: Option<i32>,
     pub telegram_stream_id: Option<i32>,
+    pub ace_content_id: Option<String>,
+    pub ace_info_hash: Option<String>,
     pub audio_formats: Option<String>,
     pub channels: Option<String>,
     pub hdr_formats: Option<String>,

backend/src/routes/stream.rs

@@ -3074,22 +3074,12 @@ fn format_acestream_stream(
         .get("info_hash")
         .and_then(|v| v.as_str())
         .filter(|s| !s.is_empty());
-    if content_id.is_none() && info_hash.is_none() {
-        return None;
-    }
-
-    // Build MediaFlow acestream URL: {proxy_url}/proxy/acestream/stream?id=...&api_password=...
-    let mut params = Vec::new();
-    if let Some(id) = content_id {
-        params.push(format!("id={}", urlencoding::encode(id)));
-    } else if let Some(ih) = info_hash {
-        params.push(format!("infohash={}", urlencoding::encode(ih)));
-    }
-    if let Some(ap) = mf.api_password.as_deref().filter(|s| !s.is_empty()) {
-        params.push(format!("api_password={}", urlencoding::encode(ap)));
-    }
-    let base = proxy_url.trim_end_matches('/');
-    let url = format!("{base}/proxy/acestream/stream?{}", params.join("&"));
+    let url = mediaflow::encode_mediaflow_acestream_url(
+        proxy_url,
+        content_id,
+        info_hash,
+        mf.api_password.as_deref(),
+    )?;
 
     let quality = row.get("quality").and_then(|v| v.as_str()).unwrap_or("");
     let resolution = row.get("resolution").and_then(|v| v.as_str()).unwrap_or("");

backend/src/util/mediaflow.rs

@@ -47,6 +47,40 @@ pub fn encode_mediaflow_proxy_url(
     Ok(format!("{base_url}?{query}"))
 }
 
+/// Build a MediaFlow proxy URL for AceStream MPEG-TS playback.
+pub fn encode_mediaflow_acestream_url(
+    mediaflow_proxy_url: &str,
+    content_id: Option<&str>,
+    info_hash: Option<&str>,
+    api_password: Option<&str>,
+) -> Option<String> {
+    let content_id = content_id.filter(|s| !s.is_empty());
+    let info_hash = info_hash.filter(|s| !s.is_empty());
+    if content_id.is_none() && info_hash.is_none() {
+        return None;
+    }
+
+    let mut params = BTreeMap::new();
+    if let Some(id) = content_id {
+        params.insert("id".into(), id.to_string());
+    } else if let Some(ih) = info_hash {
+        params.insert("infohash".into(), ih.to_string());
+    }
+    if let Some(ap) = api_password.filter(|s| !s.is_empty()) {
+        params.insert("api_password".into(), ap.to_string());
+    }
+
+    encode_mediaflow_proxy_url(
+        mediaflow_proxy_url,
+        "/proxy/acestream/stream",
+        None,
+        params,
+        None,
+        None,
+    )
+    .ok()
+}
+
 /// Returns true when `url` has a usable scheme and host.
 pub fn is_valid_url(url: &str) -> bool {
     Url::parse(url)
@@ -65,6 +99,33 @@ mod tests {
         assert!(!is_valid_url(""));
     }
 
+    #[test]
+    fn encode_acestream_url_prefers_content_id() {
+        let url = encode_mediaflow_acestream_url(
+            "https://proxy.example.com",
+            Some("0123456789abcdef0123456789abcdef01234567"),
+            Some("fedcba9876543210fedcba9876543210fedcba98"),
+            Some("secret"),
+        )
+        .unwrap();
+        assert!(url.contains("/proxy/acestream/stream?"));
+        assert!(url.contains("id=0123456789abcdef0123456789abcdef01234567"));
+        assert!(url.contains("api_password=secret"));
+        assert!(!url.contains("infohash="));
+    }
+
+    #[test]
+    fn encode_acestream_url_falls_back_to_info_hash() {
+        let url = encode_mediaflow_acestream_url(
+            "https://proxy.example.com",
+            None,
+            Some("fedcba9876543210fedcba9876543210fedcba98"),
+            None,
+        )
+        .unwrap();
+        assert!(url.contains("infohash=fedcba9876543210fedcba9876543210fedcba98"));
+    }
+
     #[test]
     fn encode_plain_proxy_url_includes_destination() {
         let url = encode_mediaflow_proxy_url(