From f56ddda85f014cef43cc8e4fd8f61f8af5cc3837 Mon Sep 17 00:00:00 2001
From: Flash303 <Flash303mc@gmail.com>
Date: Wed, 4 Nov 2026 22:55:34 +0100
Subject: [PATCH 1/3] feat: remove labymod proxy, use the backend values

---
 .../components/ServerSidebar.tsx              | 28 +++--------
 .../server-detail/hooks/useServerData.ts      | 31 -------------
 frontend/app/pages/server-detail/index.tsx    |  2 -
 frontend/app/pages/server-detail/types.ts     |  7 +--
 frontend/app/routes.ts                        |  1 -
 frontend/app/routes/labyManifest.ts           | 46 -------------------
 6 files changed, 7 insertions(+), 108 deletions(-)
 delete mode 100644 frontend/app/routes/labyManifest.ts

diff --git a/frontend/app/pages/server-detail/components/ServerSidebar.tsx b/frontend/app/pages/server-detail/components/ServerSidebar.tsx
index 8c8732de..56c605e4 100644
--- a/frontend/app/pages/server-detail/components/ServerSidebar.tsx
+++ b/frontend/app/pages/server-detail/components/ServerSidebar.tsx
@@ -9,7 +9,7 @@ import { cn } from "@/core/lib/utils"
 import { lunarLogoClass } from "@/core/lib/theme-colors"
 import { LunarLogo } from "@/ui/components/LunarLogo"
 import { LabyLogo } from "@/ui/components/LabyLogo"
-import type { ClientInfos, LabyManifest } from "@/pages/server-detail/types"
+import type { ClientInfos } from "@/pages/server-detail/types"
 
 const SOCIAL_ICONS: Record<string, { icon: React.ElementType, colorClass: string }> = {
     web: { icon: Globe, colorClass: "text-blue-500" },
@@ -27,10 +27,9 @@ const SOCIAL_ICONS: Record<string, { icon: React.ElementType, colorClass: string
 
 interface ServerSidebarProps {
     client_infos?: ClientInfos;
-    labyManifest?: LabyManifest;
 }
 
-export function ServerSidebar({ client_infos, labyManifest }: ServerSidebarProps) {
+export function ServerSidebar({ client_infos }: ServerSidebarProps) {
     const labyServerInfo = client_infos?.laby?.raw;
     const lunarServerInfo = client_infos?.lunar?.raw_partner || client_infos?.lunar?.raw;
     const [searchQuery, setSearchQuery] = useState("");
@@ -49,8 +48,7 @@ export function ServerSidebar({ client_infos, labyManifest }: ServerSidebarProps
         labyScore += Object.entries(social).filter(([, v]) => !!v).length;
         if (user_stats) labyScore += 1;
         labyScore += Object.keys(gamemodes).length;
-        if (labyManifest?.supported_languages) labyScore += labyManifest.supported_languages.length;
-        if (labyManifest?.yt_trailer) labyScore += 1;
+        if (labyServerInfo?.supported_languages) labyScore += labyServerInfo.supported_languages.length;
         if (client_infos?.laby?.partner) labyScore += 1;
     }
 
@@ -186,8 +184,7 @@ export function ServerSidebar({ client_infos, labyManifest }: ServerSidebarProps
         if (!labyServerInfo) return null;
 
         const hasContent = client_infos?.laby?.partner || hasSocials || user_stats || hasGamemodes
-            || (labyManifest?.supported_languages?.length > 0)
-            || labyManifest?.yt_trailer;
+            || (labyServerInfo?.supported_languages?.length ?? 0) > 0;
 
         if (!hasContent) {
             return (
@@ -292,11 +289,11 @@ export function ServerSidebar({ client_infos, labyManifest }: ServerSidebarProps
                     </div>
                 )}
 
-                {labyManifest?.supported_languages && labyManifest.supported_languages.length > 0 && (
+                {labyServerInfo?.supported_languages && labyServerInfo.supported_languages.length > 0 && (
                     <div className="flex flex-col gap-3">
                         <h3 className="text-sm font-semibold text-muted-foreground">{t("serverDetail.sidebar.languages")}</h3>
                         <div className="flex flex-wrap gap-2">
-                            {labyManifest.supported_languages.map((lang: string) => {
+                            {labyServerInfo.supported_languages.map((lang: string) => {
                                 const code = lang.toLowerCase();
                                 const flagCode = {
                                     en: 'gb', ja: 'jp', zh: 'cn', ko: 'kr',
@@ -322,19 +319,6 @@ export function ServerSidebar({ client_infos, labyManifest }: ServerSidebarProps
                     </div>
                 )}
 
-                {labyManifest?.yt_trailer && (
-                    <div className="flex flex-col gap-3">
-                        <h3 className="text-sm font-semibold text-muted-foreground">{t("serverDetail.sidebar.trailer")}</h3>
-                        <div className="aspect-video w-full rounded-md overflow-hidden border">
-                            <iframe 
-                                src={`https://www.youtube.com/embed/${labyManifest.yt_trailer}`}
-                                title={t("serverDetail.sidebar.trailer")}
-                                className="w-full h-full"
-                                allowFullScreen
-                            />
-                        </div>
-                    </div>
-                )}
             </div>
         );
     };
diff --git a/frontend/app/pages/server-detail/hooks/useServerData.ts b/frontend/app/pages/server-detail/hooks/useServerData.ts
index fe1afbc4..13c962f7 100644
--- a/frontend/app/pages/server-detail/hooks/useServerData.ts
+++ b/frontend/app/pages/server-detail/hooks/useServerData.ts
@@ -3,7 +3,6 @@ import { useParams } from "react-router"
 import { useAuth } from "@clerk/react"
 import { fetchRecords, fetchServer } from "@/core/lib/api"
 import type { Server, ServerRecord } from "@/core/lib/api"
-import type { LabyManifest, LabyRawInfo } from "@/pages/server-detail/types"
 import { DEFAULT_INTERVAL_MS, DEFAULT_RANGE_MS } from "@/core/lib/time"
 
 
@@ -46,39 +45,10 @@ export function useServerData(initialServer: Server | null, initialRecords: Serv
     const [loadedFrom, setLoadedFrom] = useState<number>(initialFrom || Infinity)
     const [records, setRecords] = useState<{ date: number; value: number }[]>([])
     
-    const [labyManifest, setLabyManifest] = useState<LabyManifest | undefined>()
-
     const labyBackground = server?.client_infos?.laby?.background
     const lunarBackground = server?.client_infos?.lunar?.background
     const backgroundUrl = labyBackground || lunarBackground
 
-    useEffect(() => {
-        let cancelled = false
-        // eslint-disable-next-line react-hooks/set-state-in-effect
-        setLabyManifest(undefined)
-
-        if (server?.client_infos?.laby?.raw) {
-            const info: LabyRawInfo | undefined = server.client_infos.laby.raw;
-            const manifestAttachment = info?.attachments?.find((a) => a.file_name === 'manifest.json')
-            if (manifestAttachment?.url) {
-                const proxyUrl = `/api/laby/manifest?url=${encodeURIComponent(manifestAttachment.url)}`
-                fetch(proxyUrl)
-                    .then(res => {
-                        if (!res.ok) throw new Error("Failed to fetch manifest")
-                        return res.json()
-                    })
-                    .then(data => {
-                        if (!cancelled) setLabyManifest(data)
-                    })
-                    .catch(console.error)
-            }
-        }
-
-        return () => {
-            cancelled = true
-        }
-    }, [server?.client_infos])
-
     useEffect(() => {
         // eslint-disable-next-line react-hooks/set-state-in-effect
         setServer(initialServer)
@@ -274,7 +244,6 @@ export function useServerData(initialServer: Server | null, initialRecords: Serv
         appliedRange, appliedInterval, appliedCustomRange,
         timeLimits, visibleRange, setVisibleRange,
         isChartZoomed,
-        labyManifest,
         backgroundUrl, labyBackground,
         isRateLimited
     }
diff --git a/frontend/app/pages/server-detail/index.tsx b/frontend/app/pages/server-detail/index.tsx
index dd06ea40..02bade6c 100644
--- a/frontend/app/pages/server-detail/index.tsx
+++ b/frontend/app/pages/server-detail/index.tsx
@@ -147,7 +147,6 @@ export default function ServerDetail() {
         appliedRange, appliedInterval, appliedCustomRange,
         timeLimits, visibleRange, setVisibleRange,
         isChartZoomed,
-        labyManifest,
         backgroundUrl, labyBackground, isRateLimited
     } = useServerData(initialServer, initialRecords, initialFrom);
     const TIME_RANGES = useMemo(() => getTimeRanges(t), [t])
@@ -411,7 +410,6 @@ export default function ServerDetail() {
                         {/* Sidebar */}
                         <ServerSidebar 
                             client_infos={server?.client_infos}
-                            labyManifest={labyManifest} 
                         />
                     </div>
                 </div>
diff --git a/frontend/app/pages/server-detail/types.ts b/frontend/app/pages/server-detail/types.ts
index bd96b406..fa787811 100644
--- a/frontend/app/pages/server-detail/types.ts
+++ b/frontend/app/pages/server-detail/types.ts
@@ -11,7 +11,7 @@ export interface LabyRawInfo {
     user_stats?: string
     background?: string
     partner?: boolean
-    attachments?: Array<{ file_name?: string; url?: string }>
+    supported_languages?: string[]
 }
 
 /** LunarClient launcher payload (subset actually rendered). */
@@ -41,8 +41,3 @@ export interface ClientInfos {
     }
 }
 
-/** LabyClient manifest.json attachment (subset actually rendered). */
-export interface LabyManifest {
-    supported_languages?: string[]
-    yt_trailer?: string
-}
diff --git a/frontend/app/routes.ts b/frontend/app/routes.ts
index e0c3bd7a..af4fcbea 100644
--- a/frontend/app/routes.ts
+++ b/frontend/app/routes.ts
@@ -16,6 +16,5 @@ export default [
   route("dashboard/:subview", "pages/admin/index.tsx", { id: "dashboard-subview" }),
   route("sitemap.xml", "routes/sitemap.ts"),
   route("api/favicon/:id", "routes/favicon.ts"),
-  route("api/laby/manifest", "routes/labyManifest.ts"),
   route("robots.txt", "routes/robots.ts"),
 ] satisfies RouteConfig;
diff --git a/frontend/app/routes/labyManifest.ts b/frontend/app/routes/labyManifest.ts
deleted file mode 100644
index 215e248b..00000000
--- a/frontend/app/routes/labyManifest.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { LoaderFunctionArgs } from "react-router";
-
-export async function loader({ request }: LoaderFunctionArgs) {
-    const url = new URL(request.url);
-    const targetUrl = url.searchParams.get("url");
-
-    if (!targetUrl) {
-        return new Response("Invalid URL", { status: 400 });
-    }
-
-    let parsedTarget: URL;
-    try {
-        parsedTarget = new URL(targetUrl);
-    } catch {
-        return new Response("Invalid URL", { status: 400 });
-    }
-
-    const allowedOrigins = ["https://dl.labymod.net", "https://resource.laby.net"];
-    if (
-        parsedTarget.protocol !== "https:" ||
-        parsedTarget.username ||
-        parsedTarget.password ||
-        !allowedOrigins.includes(parsedTarget.origin)
-    ) {
-        return new Response("Invalid URL", { status: 400 });
-    }
-
-    try {
-        const res = await fetch(targetUrl);
-        if (!res.ok) {
-            return new Response("Failed to fetch manifest", { status: res.status });
-        }
-        
-        const data = await res.text();
-        
-        return new Response(data, {
-            status: 200,
-            headers: {
-                "Content-Type": "application/json",
-                "Cache-Control": "public, max-age=3600"
-            }
-        });
-    } catch {
-        return new Response("Internal Server Error", { status: 500 });
-    }
-}

From 78ba45727a41f41cef5fb12a8d7da10e2b0e91e3 Mon Sep 17 00:00:00 2001
From: Flash303 <Flash303mc@gmail.com>
Date: Wed, 4 Nov 2026 23:34:57 +0100
Subject: [PATCH 2/3] remove old route

---
 frontend/app/routes.ts | 1 -
 frontend/server.ts     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/frontend/app/routes.ts b/frontend/app/routes.ts
index af4fcbea..674e2ac8 100644
--- a/frontend/app/routes.ts
+++ b/frontend/app/routes.ts
@@ -11,7 +11,6 @@ export default [
     route("legal", "pages/LegalNotice.tsx"),
     route("*", "routes/catchall.tsx"),
   ]),
-  route("admin", "pages/admin/index.tsx", { id: "admin" }),
   route("dashboard", "pages/admin/index.tsx", { id: "dashboard" }),
   route("dashboard/:subview", "pages/admin/index.tsx", { id: "dashboard-subview" }),
   route("sitemap.xml", "routes/sitemap.ts"),
diff --git a/frontend/server.ts b/frontend/server.ts
index 243c5257..34b6ddc7 100644
--- a/frontend/server.ts
+++ b/frontend/server.ts
@@ -106,7 +106,6 @@ serve({
       // Bypass cache for private logged-in routes
       if (
         url.pathname.startsWith("/account") ||
-        url.pathname.startsWith("/admin") ||
         url.pathname.startsWith("/dashboard")
       ) {
         return requestHandler(req);

From 4ff5f7455f0e65855dcbbdd6525c629057319ded Mon Sep 17 00:00:00 2001
From: Flash303 <Flash303mc@gmail.com>
Date: Wed, 4 Nov 2026 23:43:49 +0100
Subject: [PATCH 3/3] feat: labymod youtube trailer

---
 backend/rest-api/src/main.rs                  |   1 +
 backend/rest-api/src/services/clients/laby.rs | 198 +++++++++++++++++-
 backend/rest-api/src/state.rs                 |   1 +
 backend/rest-api/src/worker/client_fetcher.rs |   5 +-
 .../components/ServerSidebar.tsx              |  17 +-
 frontend/app/pages/server-detail/types.ts     |   1 +
 6 files changed, 218 insertions(+), 5 deletions(-)

diff --git a/backend/rest-api/src/main.rs b/backend/rest-api/src/main.rs
index 48abe8d6..4ab37f62 100644
--- a/backend/rest-api/src/main.rs
+++ b/backend/rest-api/src/main.rs
@@ -120,6 +120,7 @@ async fn main() {
 
         laby_partner_cache: Arc::new(DashMap::new()),
         laby_servers_cache: Arc::new(RwLock::new(Vec::new())),
+        laby_manifest_cache: TtlCache::new(),
 
         lunar_partner_cache: Arc::new(DashMap::new()),
         lunar_servers_cache: Arc::new(RwLock::new(Vec::new())),
diff --git a/backend/rest-api/src/services/clients/laby.rs b/backend/rest-api/src/services/clients/laby.rs
index 7fbb8140..4f8dcb37 100644
--- a/backend/rest-api/src/services/clients/laby.rs
+++ b/backend/rest-api/src/services/clients/laby.rs
@@ -1,17 +1,21 @@
 use crate::services::clients::BaseClientInfo;
 use crate::state::AppState;
+use futures::stream::{self, StreamExt};
 use log::error;
 use regex::Regex;
 use repository::models::server::Server;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
+use std::time::Duration;
 
 #[derive(Serialize)]
 pub struct LabyClientInfo {
     #[serde(flatten)]
     base: BaseClientInfo,
     raw: Arc<RawLabyServer>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    yt_trailer: Option<String>,
 }
 
 impl RawLabyServer {
@@ -32,7 +36,7 @@ impl RawLabyServer {
     }
 }
 
-fn construct_laby_info(state: &AppState, server: Arc<RawLabyServer>) -> LabyClientInfo {
+async fn construct_laby_info(state: &AppState, server: Arc<RawLabyServer>) -> LabyClientInfo {
     let srv_part = state.laby_partner_cache.get(&server.direct_ip);
     let is_partner = srv_part.map(|t| *t.value()).unwrap_or(false);
 
@@ -46,9 +50,21 @@ fn construct_laby_info(state: &AppState, server: Arc<RawLabyServer>) -> LabyClie
             .next(),
     };
 
+    let yt_trailer = match manifest_url(&server) {
+        Some(url) if is_allowed_manifest_url(url) => {
+            state
+                .laby_manifest_cache
+                .get(&url.to_string())
+                .await
+                .flatten()
+        }
+        _ => None,
+    };
+
     LabyClientInfo {
         base,
         raw: server.clone(),
+        yt_trailer,
     }
 }
 
@@ -56,7 +72,7 @@ pub async fn get_laby_infos(state: &AppState, current_server: &Server) -> Option
     let guard = state.laby_servers_cache.read().await;
     for server in guard.iter() {
         if server.matches(current_server.ip.as_str()) {
-            return Some(construct_laby_info(state, server.clone()));
+            return Some(construct_laby_info(state, server.clone()).await);
         }
     }
 
@@ -220,3 +236,179 @@ pub struct Location {
     pub country: String,
     pub country_code: Option<String>,
 }
+
+const MANIFEST_CACHE_TTL: Duration = Duration::from_hours(24);
+const ALLOWED_MANIFEST_ORIGINS: [&str; 2] =
+    ["https://dl.labymod.net", "https://resource.laby.net"];
+
+fn manifest_url(server: &RawLabyServer) -> Option<&str> {
+    server
+        .attachments
+        .iter()
+        .find(|a| a.file_name == "manifest.json")
+        .map(|a| a.url.as_str())
+}
+
+fn is_allowed_manifest_url(url: &str) -> bool {
+    let parsed = match reqwest::Url::parse(url) {
+        Ok(parsed) => parsed,
+        Err(_) => return false,
+    };
+    if parsed.scheme() != "https" || !parsed.username().is_empty() || parsed.password().is_some() {
+        return false;
+    }
+    ALLOWED_MANIFEST_ORIGINS
+        .iter()
+        .any(|origin| parsed.origin().ascii_serialization() == *origin)
+}
+
+#[derive(Deserialize)]
+struct RawLabyManifest {
+    #[serde(default)]
+    yt_trailer: Option<String>,
+}
+
+fn normalize_trailer(value: Option<String>) -> Option<String> {
+    value.filter(|trailer| !trailer.trim().is_empty())
+}
+
+async fn fetch_manifest_trailer(state: &AppState, url: &str) -> Option<Option<String>> {
+    let response = match state.http_client.get(url).send().await {
+        Ok(response) => response,
+        Err(err) => {
+            error!("Could not fetch laby manifest url={url} {err}");
+            return None;
+        }
+    };
+    if !response.status().is_success() {
+        error!(
+            "Could not fetch laby manifest url={url} status={}",
+            response.status()
+        );
+        return None;
+    }
+    match response.json::<RawLabyManifest>().await {
+        Ok(manifest) => Some(normalize_trailer(manifest.yt_trailer)),
+        Err(err) => {
+            error!("Could not parse laby manifest url={url} {err}");
+            None
+        }
+    }
+}
+
+pub async fn refresh_laby_manifests(state: &AppState) {
+    let urls: HashSet<String> = {
+        let guard = state.laby_servers_cache.read().await;
+        guard
+            .iter()
+            .filter_map(|server| manifest_url(server))
+            .filter(|url| is_allowed_manifest_url(url))
+            .map(str::to_string)
+            .collect()
+    };
+
+    stream::iter(urls)
+        .for_each_concurrent(8, |url| async {
+            if state.laby_manifest_cache.get(&url).await.is_some() {
+                return;
+            }
+            // Failures stay uncached so the next cycle retries them.
+            if let Some(trailer) = fetch_manifest_trailer(state, &url).await {
+                state
+                    .laby_manifest_cache
+                    .insert(url, trailer, MANIFEST_CACHE_TTL)
+                    .await;
+            }
+        })
+        .await;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn server_with_attachments(attachments: Vec<Attachment>) -> RawLabyServer {
+        RawLabyServer {
+            server_name: String::new(),
+            nice_name: String::new(),
+            direct_ip: String::new(),
+            wildcards: Vec::new(),
+            compiled_regexes: Vec::new(),
+            attachments,
+            addons: None,
+            social: None,
+            gamemodes: HashMap::new(),
+            user_stats: None,
+            chat: None,
+            supported_languages: None,
+            brand: None,
+            location: None,
+            command_delay: None,
+        }
+    }
+
+    fn attachment(file_name: &str, url: &str) -> Attachment {
+        Attachment {
+            file_name: file_name.to_string(),
+            url: url.to_string(),
+            hash: String::new(),
+        }
+    }
+
+    #[test]
+    fn manifest_url_finds_manifest_attachment() {
+        let server = server_with_attachments(vec![
+            attachment("background.webp", "https://dl.labymod.net/bg.webp"),
+            attachment(
+                "manifest.json",
+                "https://dl.labymod.net/manifest.json",
+            ),
+        ]);
+        assert_eq!(
+            manifest_url(&server),
+            Some("https://dl.labymod.net/manifest.json")
+        );
+    }
+
+    #[test]
+    fn manifest_url_returns_none_without_manifest() {
+        let server = server_with_attachments(vec![attachment(
+            "background.webp",
+            "https://dl.labymod.net/bg.webp",
+        )]);
+        assert_eq!(manifest_url(&server), None);
+    }
+
+    #[test]
+    fn only_allowlists_laby_cdn_manifest_urls() {
+        assert!(is_allowed_manifest_url(
+            "https://dl.labymod.net/manifest.json"
+        ));
+        assert!(is_allowed_manifest_url(
+            "https://resource.laby.net/abc/manifest.json"
+        ));
+        assert!(!is_allowed_manifest_url("http://dl.labymod.net/manifest.json"));
+        assert!(!is_allowed_manifest_url(
+            "https://dl.labymod.net.evil.com/manifest.json"
+        ));
+        assert!(!is_allowed_manifest_url(
+            "https://evil.com/https://dl.labymod.net/manifest.json"
+        ));
+        assert!(!is_allowed_manifest_url(
+            "https://dl.labymod.net@evil.com/manifest.json"
+        ));
+        assert!(!is_allowed_manifest_url("not a url"));
+    }
+
+    #[test]
+    fn parses_manifest_trailer() {
+        let manifest: RawLabyManifest =
+            serde_json::from_str(r#"{"yt_trailer": "dQw4w9WgXcQ"}"#).unwrap();
+        assert_eq!(normalize_trailer(manifest.yt_trailer), Some("dQw4w9WgXcQ".to_string()));
+
+        let manifest: RawLabyManifest = serde_json::from_str(r#"{}"#).unwrap();
+        assert_eq!(normalize_trailer(manifest.yt_trailer), None);
+
+        assert_eq!(normalize_trailer(Some("   ".to_string())), None);
+    }
+}
diff --git a/backend/rest-api/src/state.rs b/backend/rest-api/src/state.rs
index 9146f968..2f0729c2 100644
--- a/backend/rest-api/src/state.rs
+++ b/backend/rest-api/src/state.rs
@@ -27,6 +27,7 @@ pub struct AppState {
 
     pub laby_partner_cache: Arc<DashMap<String, bool>>,
     pub laby_servers_cache: Arc<RwLock<Vec<Arc<RawLabyServer>>>>,
+    pub laby_manifest_cache: TtlCache<String, Option<String>>,
 
     pub lunar_servers_cache: Arc<RwLock<Vec<Arc<RawLunarServer>>>>,
     pub lunar_partner_cache: Arc<DashMap<String, RawLunarPartnerServer>>,
diff --git a/backend/rest-api/src/worker/client_fetcher.rs b/backend/rest-api/src/worker/client_fetcher.rs
index 63adc0fd..c519dd1e 100644
--- a/backend/rest-api/src/worker/client_fetcher.rs
+++ b/backend/rest-api/src/worker/client_fetcher.rs
@@ -1,4 +1,6 @@
-use crate::services::clients::laby::{refresh_laby_infos, refresh_laby_partner_infos};
+use crate::services::clients::laby::{
+    refresh_laby_infos, refresh_laby_manifests, refresh_laby_partner_infos,
+};
 use crate::services::clients::lunar::{refresh_lunar_infos, refresh_lunar_partner_infos};
 use crate::state::AppState;
 use std::time::Duration;
@@ -13,6 +15,7 @@ pub fn start(state: AppState) {
             refresh_lunar_partner_infos(&state).await;
 
             refresh_laby_infos(&state).await;
+            refresh_laby_manifests(&state).await;
             refresh_laby_partner_infos(&state).await;
 
             sleep(FETCH_DELAY).await;
diff --git a/frontend/app/pages/server-detail/components/ServerSidebar.tsx b/frontend/app/pages/server-detail/components/ServerSidebar.tsx
index 56c605e4..ee40785e 100644
--- a/frontend/app/pages/server-detail/components/ServerSidebar.tsx
+++ b/frontend/app/pages/server-detail/components/ServerSidebar.tsx
@@ -49,6 +49,7 @@ export function ServerSidebar({ client_infos }: ServerSidebarProps) {
         if (user_stats) labyScore += 1;
         labyScore += Object.keys(gamemodes).length;
         if (labyServerInfo?.supported_languages) labyScore += labyServerInfo.supported_languages.length;
+        if (client_infos?.laby?.yt_trailer) labyScore += 1;
         if (client_infos?.laby?.partner) labyScore += 1;
     }
 
@@ -184,7 +185,8 @@ export function ServerSidebar({ client_infos }: ServerSidebarProps) {
         if (!labyServerInfo) return null;
 
         const hasContent = client_infos?.laby?.partner || hasSocials || user_stats || hasGamemodes
-            || (labyServerInfo?.supported_languages?.length ?? 0) > 0;
+            || (labyServerInfo?.supported_languages?.length ?? 0) > 0
+            || client_infos?.laby?.yt_trailer;
 
         if (!hasContent) {
             return (
@@ -319,6 +321,19 @@ export function ServerSidebar({ client_infos }: ServerSidebarProps) {
                     </div>
                 )}
 
+                {client_infos?.laby?.yt_trailer && (
+                    <div className="flex flex-col gap-3">
+                        <h3 className="text-sm font-semibold text-muted-foreground">{t("serverDetail.sidebar.trailer")}</h3>
+                        <div className="aspect-video w-full rounded-md overflow-hidden border">
+                            <iframe
+                                src={`https://www.youtube.com/embed/${client_infos.laby.yt_trailer}`}
+                                title={t("serverDetail.sidebar.trailer")}
+                                className="w-full h-full"
+                                allowFullScreen
+                            />
+                        </div>
+                    </div>
+                )}
             </div>
         );
     };
diff --git a/frontend/app/pages/server-detail/types.ts b/frontend/app/pages/server-detail/types.ts
index fa787811..25f46bde 100644
--- a/frontend/app/pages/server-detail/types.ts
+++ b/frontend/app/pages/server-detail/types.ts
@@ -32,6 +32,7 @@ export interface ClientInfos {
         raw?: LabyRawInfo
         background?: string
         partner?: boolean
+        yt_trailer?: string
     }
     lunar?: {
         raw?: LunarRawInfo