Drop text/html accept header requirement

Author: matze

CHANGELOG.md

@@ -12,6 +12,9 @@
 - **Breaking**: From now on, `WASTEBIN_BASE_URL` is only used for the QR code
   link but not for internal routing. Use a dedicated proxy server to do that if
   necessary.
+- **Breaking**: Always return HTML on `/:id` even if `text/html` is not in the
+  Accept header. On the other hand, `/raw/:id` must be used to retrieve raw
+  text.
 - Use the [two-face](https://docs.rs/two-face) crate for an extended syntax
   list.
 - Serve all CSS assets under hashed URL to avoid caching issues.

src/handlers/download.rs

@@ -73,7 +73,7 @@ mod tests {
         assert_eq!(res.status(), StatusCode::SEE_OTHER);
 
         let location = res.headers().get("location").unwrap().to_str()?;
-        let res = client.get(&format!("{location}?dl=cpp")).send().await?;
+        let res = client.get(&format!("/dl{location}.cpp")).send().await?;
         assert_eq!(res.status(), StatusCode::OK);
 
         let content = res.text().await?;

src/handlers/html/paste.rs

@@ -8,7 +8,6 @@ use askama::Template;
 use axum::extract::{Form, Path, State};
 use axum::response::{IntoResponse, Response};
 use axum_extra::extract::SignedCookieJar;
-use http::{header, HeaderMap};
 use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
@@ -34,7 +33,6 @@ pub async fn get(
     State(db): State<Database>,
     State(highlighter): State<Highlighter>,
     Path(id): Path<String>,
-    headers: HeaderMap,
     jar: SignedCookieJar,
     form: Option<Form<PasswordForm>>,
 ) -> Result<Response, ErrorResponse> {
@@ -56,27 +54,18 @@ pub async fn get(
             Err(err) => return Err(err),
         };
 
-        let accept_html = headers
-            .get(header::ACCEPT)
-            .and_then(|value| value.to_str().ok())
-            .is_some_and(|value| value.contains("text/html"));
-
-        if accept_html {
-            return Ok(get_html(
-                page.clone(),
-                cache,
-                highlighter,
-                key,
-                data,
-                can_be_cached,
-                jar,
-                password.is_some(),
-            )
-            .await
-            .into_response());
-        }
-
-        Ok(data.text.into_response())
+        Ok(get_html(
+            page.clone(),
+            cache,
+            highlighter,
+            key,
+            data,
+            can_be_cached,
+            jar,
+            password.is_some(),
+        )
+        .await
+        .into_response())
     }
     .await
     .map_err(|err| make_error(err, page))