fix: use uk language code for Ukrainian locale

- localization for tags in liked songs has been fixed
- added support for custom themes for lyrics in versions 1.2.80+
- lyrics are disabled for the right panel

css-helper/lyrics-color/rules.css

@@ -42,7 +42,9 @@ body .KDhLFoEqoClhH12bsfrS {
 /* lyrics not available message */
 .C3pBU1DsOUJJOAv89ZFT,
 .T67LFP0PElpfkkLuegQt,
-.e7eFLioNSG5PAi1qVFT4 {
+.e7eFLioNSG5PAi1qVFT4,
+.l2060qoyWU4J9ihSxHLE,
+.hfTlyhd7WCIk9xmP {
     color: var(--musixmatch) !important;
 }
 
@@ -50,7 +52,8 @@ body .KDhLFoEqoClhH12bsfrS {
 .FUYNhisXTCmbzt9IDxnT,
 .tr8V5eHsUaIkOYVw7eSG,
 .hW9km7ku6_iggdWDR_Lg,
-.lofIAg8Ixko3mfBrbfej {
+.lofIAg8Ixko3mfBrbfej,
+.bbJIIopLxggQmv5x {
     --lyrics-color-active: var(--current) !important;
     --lyrics-color-inactive: var(--next) !important;
     --lyrics-color-passed: var(--past) !important;
@@ -69,7 +72,11 @@ body .KDhLFoEqoClhH12bsfrS {
 ._LKG3z7SnerR0eigPCoK:hover,
 .NHVfxGs2HwmI_fly2JC4:hover,
 .gaHIufRWhoWbiT8S6zuM:hover,
-.FQYXZaa0aDIrse54YlYO:hover {
+.FQYXZaa0aDIrse54YlYO:hover,
+.PSyA4iign083ZV6vOqPj:hover,
+.Plu0zvuRv7kOQwsQ02cC:hover,
+.Mnf9PkrVHsX90BNf:hover,
+.XiH9KR6bhDwEFykV:hover {
     color: var(--hover) !important;
     /* remove underline */
     text-decoration: none !important;

patches/patches.json

@@ -780,6 +780,22 @@
                     "fr": "1.2.84",
                     "to": ""
                 }
+            },
+            "ad_feedback_in_stream": {
+                "name": "enable_ad_feedback_in_stream",
+                "description": "Enable new ad feedback UX for in-stream ads",
+                "version": {
+                    "fr": "1.2.88",
+                    "to": ""
+                }
+            },
+            "HarmonyMediaPlaybackReporting": {
+                "name": "enableHarmonyMediaPlaybackReporting",
+                "description": "Enable the reporting of media playback events in Harmony",
+                "version": {
+                    "fr": "1.2.88",
+                    "to": ""
+                }
             }
         },
         "EnableExp": {
@@ -2645,6 +2661,7 @@
             "replace": "min:250,max:400"
         },
         "filtertags_locale_fix": {
+            "disable": true,
             "version": {
                 "fr": "1.2.29",
                 "to": ""

run.ps1

@@ -2,7 +2,7 @@
 param
 (
     [Parameter(HelpMessage = 'Latest recommended Spotify version for Windows 10+.')]
-    [string]$latest_full = "1.2.86.502.g8cd7fb22",
+    [string]$latest_full = "1.2.88.483.g8aa8628e",
 
     [Parameter(HelpMessage = 'Latest supported Spotify version for Windows 7-8.1')]
     [string]$last_win7_full = "1.2.5.1006.g22820f93",
@@ -106,9 +106,6 @@ param
 
     [Parameter(HelpMessage = 'Enable right sidebar coloring to match cover color)')]
     [switch]$rightsidebarcolor,
-    
-    [Parameter(HelpMessage = 'Returns old lyrics')]
-    [switch]$old_lyrics,
 
     [Parameter(HelpMessage = 'Disable native lyrics')]
     [switch]$lyrics_block,
@@ -137,7 +134,11 @@ param
     
     [Parameter(HelpMessage = 'Select the desired language to use for installation. Default is the detected system language.')]
     [Alias('l')]
-    [string]$language
+    [string]$language,
+
+    # Deprecated parameters
+    [Parameter(HelpMessage = 'Deprecated, old lyrics are enabled by default')]
+    [switch]$old_lyrics
 )
 
 # Ignore errors from `Stop-Process`
@@ -156,7 +157,7 @@ function Format-LanguageCode {
     $supportLanguages = @(
         'be', 'bn', 'cs', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fil', 'fr', 'hi', 'hu', 
         'id', 'it', 'ja', 'ka', 'ko', 'lv', 'pl', 'pt', 'ro', 'ru', 'sk', 'sr', 'sr-Latn',
-        'sv', 'ta', 'tr', 'ua', 'vi', 'zh', 'zh-TW'
+        'sv', 'ta', 'tr', 'uk', 'vi', 'zh', 'zh-TW'
     )
     
     # Trim the language code down to two letter code.
@@ -277,8 +278,8 @@ function Format-LanguageCode {
             $returnCode = 'tr'
             break
         }
-        '^ua' {
-            $returnCode = 'ua'
+        '^uk' {
+            $returnCode = 'uk'
             break
         }
         '^vi' {
@@ -405,6 +406,15 @@ $lang = CallLang -clg $langCode
 Write-Host ($lang).Welcome
 Write-Host
 
+if ($old_lyrics) {
+    Write-Warning @"
+-old_lyrics is deprecated
+    Old lyrics are enabled by default
+    Remove this parameter from your command line
+"@
+    Write-Host
+}
+
 # Check version Windows
 $os = Get-CimInstance -ClassName "Win32_OperatingSystem" -ErrorAction SilentlyContinue
 if ($os) {
@@ -479,6 +489,7 @@ function Get-SpotifyInstallerArchitecture {
 
 $spotifyDownloadBaseUrl = "https://loadspot.amd64fox1.workers.dev/download"
 $spotifyTemporaryDownloadBaseUrl = "https://loadspot.amd64fox1.workers.dev/temporary-download"
+$spotifyTemporaryDownloadVersion = "1.2.86.502.g8cd7fb22"
 $systemArchitecture = Get-SystemArchitecture
 
 $match_v = "^(?<version>\d+\.\d+\.\d+\.\d+\.g[0-9a-f]{8})(?:-\d+)?$"
@@ -587,7 +598,8 @@ function Get-PatchesJson {
                 throw "File not found: $resolvedPath"
             }
 
-            Write-Host ("Using local patches.json: {0}" -f $resolvedPath)
+            Write-Host ("Using a local file for patches: {0}" -f $resolvedPath)
+            Write-Host
 
             $jsonContent = [System.IO.File]::ReadAllText($resolvedPath, [System.Text.Encoding]::UTF8)
             return $jsonContent | ConvertFrom-Json -ErrorAction Stop
@@ -1234,8 +1246,7 @@ function downloadSp([string]$DownloadFolder) {
         -LastX86SupportedVersion $last_x86
 
     $downloadBaseUrl = $spotifyDownloadBaseUrl
-    if ($onlineFull -eq $latest_full -and $arch -eq 'x64') {
-        # Temporary route for the latest x64 build while Cloudflare rechecks the file
+    if ($onlineFull -eq $spotifyTemporaryDownloadVersion -and $arch -eq 'x64') {
         $downloadBaseUrl = $spotifyTemporaryDownloadBaseUrl
     }
 
@@ -1848,7 +1859,12 @@ function Helper($paramname) {
                 Move-Json -n 'DevicePickerSidePanel' -t $Enable -f $Disable
             }
 
-            if ([version]$offline -ge [version]'1.2.41.434' -and $lyrics_block) { Move-Json -n 'Lyrics' -t $Enable -f $Disable } 
+            if ([version]$offline -ge [version]'1.2.41.434' -and $lyrics_block) { Move-Json -n 'Lyrics' -t $Enable -f $Disable }
+
+            Remove-Json -j $Enable -p 'RightSidebarLyrics'
+            if ($Custom.PSObject.Properties.Name -contains 'LyricsVariationsInNPV') {
+                $Custom.LyricsVariationsInNPV.value = "CONTROL"
+            }
 
             if ([version]$offline -eq [version]'1.2.30.1135') { Move-Json -n 'QueueOnRightPanel' -t $Enable -f $Disable }
 
@@ -1896,11 +1912,6 @@ function Helper($paramname) {
                 }
                 else {
                     if (!($rightsidebarcolor)) { Remove-Json -j $Enable -p 'RightSidebarColors' }
-                    
-                    if ($old_lyrics) { 
-                        Remove-Json -j $Enable -p 'RightSidebarLyrics' 
-                        $Custom.LyricsVariationsInNPV.value = "CONTROL"
-                    } 
                 }
             }
             if (!$premium) { Remove-Json -j $Enable -p 'RemoteDownloads', 'Magpie', 'MagpiePrompting', 'MagpieScheduling', 'MagpieCuration' }
@@ -1910,7 +1921,7 @@ function Helper($paramname) {
                 $objects = @(
                     @{
                         Object           = $webjson.others.CustomExp.psobject.properties
-                        PropertiesToKeep = @('LyricsUpsell')
+                        PropertiesToKeep = @('LyricsUpsell', 'LyricsVariationsInNPV')
                     },
                     @{
                         Object           = $webjson.others.EnableExp.psobject.properties
@@ -2099,6 +2110,10 @@ function Helper($paramname) {
 
     $contents | foreach { 
 
+        if ($json.$PSItem.disable -eq $true) {
+            return
+        }
+
         if ( $json.$PSItem.version.to ) { $to = [version]$json.$PSItem.version.to -ge [version]$offline_patch } else { $to = $true }
         if ( $json.$PSItem.version.fr ) { $fr = [version]$json.$PSItem.version.fr -le [version]$offline_patch } else { $fr = $false }