Merge pull request #1303 from DaXcess/clienttoken-ver-fix

Fix spotify version in client token request
librespot-org · Jul 1, 2024 · 299b7de · 299b7de
2 parents cdff6da + ba8ec55
commit 299b7de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/src/spclient.rs b/core/src/spclient.rs
@@ -35,7 +35,7 @@ use crate::{
         extended_metadata::BatchedEntityRequest,
     },
     token::Token,
-    version::spotify_version,
+    version::spotify_semantic_version,
     Error, FileId, SpotifyId,
 };
 
@@ -182,7 +182,7 @@ impl SpClient {
 
         let client_data = request.mut_client_data();
 
-        client_data.client_version = spotify_version();
+        client_data.client_version = spotify_semantic_version();
 
         // Current state of affairs: keymaster ID works on all tested platforms, but may be phased out,
         // so it seems a good idea to mimick the real clients. `self.session().client_id()` returns the

diff --git a/core/src/version.rs b/core/src/version.rs
@@ -29,6 +29,13 @@ pub const SPOTIFY_MOBILE_VERSION: &str = "8.6.84";
 pub const FALLBACK_USER_AGENT: &str = "Spotify/117300517 Linux/0 (librespot)";
 
 pub fn spotify_version() -> String {
+    match std::env::consts::OS {
+        "android" | "ios" => SPOTIFY_MOBILE_VERSION.to_owned(),
+        _ => SPOTIFY_VERSION.to_string(),
+    }
+}
+
+pub fn spotify_semantic_version() -> String {
     match std::env::consts::OS {
         "android" | "ios" => SPOTIFY_MOBILE_VERSION.to_owned(),
         _ => SPOTIFY_SEMANTIC_VERSION.to_string(),