1 files changed, 22 insertions, 26 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index e7a3674..92f9451 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -11,7 +11,6 @@ pub mod logic;
 pub mod protocol;
 
 use crate::protocol::ClientboundPacket;
-use assets::css;
 use config::{AppearanceConfig, Config};
 use futures_util::{SinkExt, StreamExt, TryFutureExt};
 use listenfd::ListenFd;
@@ -62,8 +61,8 @@ async fn run() {
 
     let index: _ = warp::path!().and(s_file!("client-web/public/start.html", "text/html"));
     let favicon: _ =
-        warp::path!("favicon.ico").and(s_file!("client-web/public/favicon.ico", "image/avif"));
-    let room: _ = warp::path!("room").and(s_file!("client-web/public/app.html", "text/html"));
+        warp::path("favicon.ico").and(s_file!("client-web/public/favicon.ico", "image/avif"));
+    let room: _ = warp::path("room").and(s_file!("client-web/public/app.html", "text/html"));
     let assets: _ = warp::path("assets").and(s_asset_dir!());
     let sw_script: _ = warp::path("sw.js").and(s_file!(
         "client-web/public/assets/sw.js",
@@ -79,8 +78,6 @@ async fn run() {
     let client_config_css: _ = warp::path!("overrides.css").map(move || {
         warp::reply::with_header(client_config_css.clone(), "content-type", "text/css")
     });
-    let css: _ = warp::path!("style.css")
-        .map(move || warp::reply::with_header(css(), "content-type", "text/css"));
     let old_format_redirect: _ = warp::path!("room" / String).map(|rsecret| {
         reply::with_header(
             StatusCode::MOVED_PERMANENTLY,
@@ -92,27 +89,26 @@ async fn run() {
     let version: _ = warp::path!("version").map(|| env!("CARGO_PKG_VERSION"));
 
     let routes: _ = signaling
-        .or(assets
-            .or(room)
-            .or(index)
-            .or(client_config)
-            .or(version)
-            .or(css)
-            .or(favicon)
-            .or(sw_script)
-            .or(old_format_redirect)
-            .or(client_config_css)
-            .map(|r| {
-                warp::reply::with_header(
-                    r,
-                    "cache-control",
-                    if cfg!(debug_assertions) {
-                        "no-cache"
-                    } else {
-                        "max-age=1000000"
-                    },
-                )
-            }))
+        .or(room)
+        .or(index)
+        .or(client_config)
+        .or(version)
+        .or(assets)
+        .or(favicon)
+        .or(sw_script)
+        .or(old_format_redirect)
+        .or(client_config_css)
+        .map(|r| {
+            warp::reply::with_header(
+                r,
+                "cache-control",
+                if cfg!(debug_assertions) {
+                    "no-cache"
+                } else {
+                    "max-age=1000000"
+                },
+            )
+        })
         .recover(handle_rejection)
         .with(warp::log("keks-meet"))
         .map(|r| warp::reply::with_header(r, "server", "keks-meet"));