Upload main.rs

src/main.rs

@@ -969,20 +969,6 @@ async fn gw_light_call(
     let url = "https://www.deezer.com/ajax/gw-light.php";
     let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
 
-    fn cookie_value(jar: &Jar, url: &Url, key: &str) -> Option<String> {
-        let Some(hv) = jar.cookies(url) else { return None };
-        let Ok(s) = hv.to_str() else { return None };
-        for part in s.split(';') {
-            let p = part.trim();
-            if let Some(rest) = p.strip_prefix(&format!("{key}=")) {
-                if !rest.is_empty() {
-                    return Some(rest.to_string());
-                }
-            }
-        }
-        None
-    }
-
     fn cid() -> String {
         SystemTime::now()
             .duration_since(UNIX_EPOCH)
@@ -992,7 +978,6 @@ async fn gw_light_call(
 
     async fn do_req(
         client: &reqwest::Client,
-        jar: &Arc<Jar>,
         url_deezer: &Url,
         url: &str,
         method: &str,
@@ -1010,17 +995,6 @@ async fn gw_light_call(
                 .header("Content-Type", "text/plain;charset=UTF-8")
                 .body(params.to_string())
         };
-
-        let sid = cookie_value(jar, url_deezer, "sid").unwrap_or_default();
-        let arl = cookie_value(jar, url_deezer, "arl").unwrap_or_default();
-        if !sid.is_empty() || !arl.is_empty() {
-            let mut parts: Vec<String> = Vec::new();
-            parts.push(format!("arl={arl}"));
-            if !sid.is_empty() {
-                parts.push(format!("sid={sid}"));
-            }
-            req = req.header("Cookie", parts.join("; "));
-        }
         if let Some(uid) = user_id.filter(|s| !s.trim().is_empty()) {
             req = req.header("x-deezer-user", uid);
         }
@@ -1054,19 +1028,6 @@ async fn gw_light_call(
             .await
             .map_err(|_| "network".to_string())?;
 
-        if method == "deezer.getUserData" {
-            for v in r.headers().get_all("set-cookie").iter() {
-                if let Ok(s) = v.to_str() {
-                    if s.starts_with("sid=") {
-                        let cookie = s.split(';').next().unwrap_or("").trim();
-                        if !cookie.is_empty() {
-                            jar.add_cookie_str(&format!("{cookie}; Domain=.deezer.com"), url_deezer);
-                        }
-                    }
-                }
-            }
-        }
-
         let status = r.status();
         let text = r.text().await.map_err(|_| "read".to_string())?;
         let json: GwResp = serde_json::from_str(&text).map_err(|_| {
@@ -1085,17 +1046,17 @@ async fn gw_light_call(
     }
 
     if method == "deezer.getUserData" {
-        match do_req(client, jar, &url_deezer, url, method, api_token, &params, true, None).await {
+        match do_req(client, &url_deezer, url, method, api_token, &params, true, None).await {
             Ok(v) => Ok(v),
-            Err(e1) => match do_req(client, jar, &url_deezer, url, method, api_token, &params, false, None).await {
+            Err(e1) => match do_req(client, &url_deezer, url, method, api_token, &params, false, None).await {
                 Ok(v) => Ok(v),
                 Err(e2) => Err(format!("getUserData:{e1}; fallback:{e2}")),
             },
         }
     } else {
-        match do_req(client, jar, &url_deezer, url, method, api_token, &params, false, None).await {
+        match do_req(client, &url_deezer, url, method, api_token, &params, false, None).await {
             Ok(v) => Ok(v),
-            Err(e1) => match do_req(client, jar, &url_deezer, url, method, api_token, &params, false, None).await {
+            Err(e1) => match do_req(client, &url_deezer, url, method, api_token, &params, false, None).await {
                 Ok(v) => Ok(v),
                 Err(e2) => Err(format!("{e1}; retry:{e2}")),
             },