version bump to 1.2.26.1180

- fixed patches for hiding podcasts and sections similar to ads - changing the list of sections #195 - included exp • encore cards • queue on right panel
SpotX-Official · Dec 3, 2023 · 3b588b3 · 3b588b3
1 parent 60858ca
commit 3b588b3
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 17 deletions.
diff --git a/patches/patches.json b/patches/patches.json
@@ -308,7 +308,7 @@
                 "native_description": "Use Gabito AdEvent instead of Gabo AdEvent",
                 "version": {
                     "fr": "1.1.93",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "YourListeningUpsell": {
@@ -346,6 +346,15 @@
                     "fr": "1.1.70",
                     "to": ""
                 }
+            },
+            "betamaxAutoSeekToAdPosition": {
+                "name": "AutoSeekToAdPosition",
+                "description": "If true, the player will seek to the ad position when an stop position is registered. Usefull for debugging ads.",
+                "native_description": "If true, the player will seek to the ad position when an stop position is registered. Usefull for debugging ads.",
+                "version": {
+                    "fr": "1.2.26",
+                    "to": ""
+                }
             }
         },
         "EnableExp": {
@@ -355,7 +364,7 @@
                 "native_description": "Enable Enhance Liked Songs UI and functionality",
                 "version": {
                     "fr": "1.1.86",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "EnhancePlaylist": {
@@ -364,7 +373,7 @@
                 "native_description": "Enable Enhance Playlist UI and functionality for end-users",
                 "version": {
                     "fr": "1.1.84",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "IgnoreInRecommendations": {
@@ -391,7 +400,7 @@
                 "native_description": "Use carousels on Home",
                 "version": {
                     "fr": "1.1.93",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "AttackOnTitanEaster": {
@@ -508,7 +517,7 @@
                 "native_description": "Show credits in the right sidebar",
                 "version": {
                     "fr": "1.2.7",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "WhatsNewFeed": {
@@ -696,7 +705,7 @@
                 "description": "Enable Queue on the right panel",
                 "native_description": "Enable About Podcast section in  NPV",
                 "version": {
-                    "fr": "1.2.21",
+                    "fr": "1.2.26",
                     "to": ""
                 }
             },
@@ -706,15 +715,15 @@
                 "native_description": "Show Recently Played shortcut in home view. Also increase max number of shortcuts to 8",
                 "version": {
                     "fr": "1.2.21",
-                    "to": ""
+                    "to": "1.2.25"
                 }
             },
             "EncoreCards": {
                 "name": "enableEncoreCards",
                 "description": "Enables all cards throughout app to be Encore Cards",
                 "native_description": "Enables all cards throughout app to be Encore Cards",
                 "version": {
-                    "fr": "1.2.21",
+                    "fr": "1.2.26",
                     "to": ""
                 }
             },
@@ -744,6 +753,25 @@
                     "fr": "1.2.22",
                     "to": ""
                 }
+            },
+            "EightShortcuts": {
+                "name": "enableEightShortcuts",
+                "description": "Increase max number of shortcuts on home to 8",
+                "native_description": "Increase max number of shortcuts on home to 8",
+                "version": {
+                    "fr": "1.2.26",
+                    "to": ""
+                }
+            }
+            ,
+            "NPVCredits": {
+                "name": "enableNPVCredits",
+                "description": "Show credits in the right sidebar",
+                "native_description": "Show credits in the right sidebar",
+                "version": {
+                    "fr": "1.2.26",
+                    "to": ""
+                }
             }
         },
         "CustomExp": {
@@ -860,16 +888,16 @@
                 "fr": "1.1.93",
                 "to": ""
             },
-            "match": "(\\!Array.isArray\\(.\\)\\|\\|.===..length\\)return null;)",
-            "replace": "$1 for (let i=0; i<(e.children?e.children.length:e.length); i++) {const key=(e.children?.[i]||e[i])?.key; if(!key||key.match(/(episode|show)/)||(e.title||t)?.match(/podcasts/i)) return null;};"
+            "match": "(\\!?Array.isArray\\(.\\)[\\|&]{2}.===(.).length\\)return null;)",
+            "replace": "$1 if (!Array.isArray($2)) { $2 = e; } for (let q=0; q<($2.children?$2.children.length:$2.length); q++) {const key=($2.children?.[q]||$2[q])?.key; if(!key||key.match(/(episode|show)/)||($2.title)?.match(/podcasts/i)) return null;};"
         },
         "adsectionsoff": {
             "version": {
                 "fr": "1.1.93",
                 "to": ""
             },
-            "match": "(\"Carousel\".+?{seeAllUri:(.),index.+?(UBIWrapper|id:.}\\)|\\.spec);)",
-            "replace": "$1 if ($2.match(/(0JQ5DAnM3wGh0gz1MXnu3B|0JQ5DAnM3wGh0gz1MXnu3D|0JQ5IMCbQBLupUQrQFeCzx|0JQ5IMCbQBLqTJyy28YCa9|0JQ5IMCbQBLlC31GvtaB6w|0JQ5DAob0KOew1FBAMSmBz|0JQ5DAnM3wGh0gz1MXnu4w|0JQ5DAnM3wGh0gz1MXnu3C|0JQ5DAnM3wGh0gz1MXnu3n|0JQ5DAnM3wGh0gz1MXnu3s|0JQ5DAnM3wGh0gz1MXnu3M|0JQ5DAob0JCuWaGLU6ntFT|0JQ5DAnM3wGh0gz1MXnucG|0JQ5DAnM3wGh0gz1MXnu3E|0JQ5DAnM3wGh0gz1MXnu4h|0JQ5DAnM3wGh0gz1MXnu7R|0JQ5DAnM3wGh0gz1MXnu3w|0JQ5DAuChZYPe9iDhh2mJz)/)) {return null};"
+            "match": "((\"Carousel\".+?|onClickCarouselControls:.,spec:.[\\{\\}\\(\\)]{3,8})seeAllUri:(.),index.+?(UBIWrapper|id:.}\\)|\\.spec);)",
+            "replace": "$1 if ($3 && $3.match && $3.match(/(0JQ5DAnM3wGh0gz1MXnu3B|0JQ5DAnM3wGh0gz1MXnu3D|0JQ5IMCbQBLupUQrQFeCzx|0JQ5IMCbQBLqTJyy28YCa9|0JQ5IMCbQBLlC31GvtaB6w|0JQ5DAob0KOew1FBAMSmBz|0JQ5DAnM3wGh0gz1MXnu4w|0JQ5DAnM3wGh0gz1MXnu3C|0JQ5DAnM3wGh0gz1MXnu3s|0JQ5DAnM3wGh0gz1MXnu3M|0JQ5DAob0JCuWaGLU6ntFT|0JQ5DAnM3wGh0gz1MXnucG|0JQ5DAnM3wGh0gz1MXnu3E|0JQ5DAnM3wGh0gz1MXnu4h|0JQ5DAnM3wGh0gz1MXnu7R|0JQ5DAnM3wGh0gz1MXnu3w|0JQ5DAuChZYPe9iDhh2mJz|0JQ5DAnM3wGh0gz1MXnu3x|0JQ5DAob0JCuWaGLU6ntFY|0JQ5DAnM3wGh0gz1MXnu3u|0JQ5DAnM3wGh0gz1MXnu3q|0JQ5DAob0Jr9ClCbkV4pZD|0JQ5DAob0LaV9FOMJ9utY5)/)) {return null};"
         },
         "themelyrics": {
             "theme": {
@@ -1406,4 +1434,4 @@
             "replace": "min:250,max:400"
         }
     }
-}
+}
diff --git a/run.ps1 b/run.ps1
@@ -348,7 +348,7 @@ if (!($version -and $version -match $match_v)) {
     }
     else {  
         # Recommended version for Win 10-12
-        $onlineFull = "1.2.25.1011.g0348b2ea-701"
+        $onlineFull = "1.2.26.1180.g6af55bfb-74"
     }
 }
 else {
@@ -1062,7 +1062,8 @@ function Helper($paramname) {
             if ($enhance_like_off) { Remove-Json -j $Enable -p'EnhanceLikedSongs' }
             if ($enhance_playlist_off) { Remove-Json -j $Enable -p 'EnhancePlaylist' }
 
-            if ($EnhanceSongs) { 
+
+            if ($EnhanceSongs -and [version]$offline -le [version]'1.2.25.1011') { 
                 Move-Json -n 'SmartShuffle' -t $Enable -f $Disable 
             }
             else { 
@@ -1077,8 +1078,6 @@ function Helper($paramname) {
                 Move-Json -n 'Plus' -t $Enable -f $Disable
             }
 
-            Remove-Json -j $Enable -p "EncoreCards", "QueueOnRightPanel"
-
             if (!($funnyprogressBar)) { Remove-Json -j $Enable -p "HeBringsNpb" }
 
             # Old theme