Good changes

server-rs/src/routes/screenshot.rs

@@ -1,53 +1,19 @@
 use std::sync::Arc;
 
-use axum::extract::Query;
-use axum::http::{header, StatusCode};
+use axum::http::{header, StatusCode, Uri};
 use axum::response::IntoResponse;
 use tracing::{info, warn};
 
 use crate::state::AppState;
 
-#[derive(serde::Deserialize)]
-pub struct ScreenshotQuery {
-    #[serde(rename = "v")]
-    view: Option<String>,
-    #[serde(rename = "f")]
-    filters: Option<String>,
-    poi: Option<String>,
-    tab: Option<String>,
-    /// When "1", renders the OG heading overlay on the screenshot
-    og: Option<String>,
-}
-
-pub async fn get_screenshot(
-    state: Arc<AppState>,
-    Query(query): Query<ScreenshotQuery>,
-) -> impl IntoResponse {
+pub async fn get_screenshot(state: Arc<AppState>, uri: Uri) -> impl IntoResponse {
     let screenshot_base = &state.screenshot_url;
 
-    let mut params = Vec::new();
-    if query.og.as_deref() == Some("1") {
-        params.push("og=1".to_string());
-    }
-    if let Some(ref val) = query.view {
-        params.push(format!("v={}", urlencoding::encode(val)));
-    }
-    if let Some(ref val) = query.filters {
-        params.push(format!("f={}", urlencoding::encode(val)));
-    }
-    if let Some(ref val) = query.poi {
-        params.push(format!("poi={}", urlencoding::encode(val)));
-    }
-    if let Some(ref val) = query.tab {
-        params.push(format!("tab={}", urlencoding::encode(val)));
-    }
-
-    let qs = if params.is_empty() {
-        String::new()
-    } else {
-        format!("?{}", params.join("&"))
-    };
-    let url = format!("{}/screenshot{}", screenshot_base, qs);
+    let qs = uri
+        .query()
+        .map(|q| format!("?{q}"))
+        .unwrap_or_default();
+    let url = format!("{screenshot_base}/screenshot{qs}");
     info!("Proxying screenshot request to: {}", url);
 
     match state.http_client.get(&url).send().await {