Compatibility with 1904X.3086+

Fix #46
krlvm · Jun 20, 2023 · f115cc0 · f115cc0
1 parent daf54d0
commit f115cc0
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/BeautySearch/Installer/ScriptInstaller.cs b/BeautySearch/Installer/ScriptInstaller.cs
@@ -1,6 +1,4 @@
-using Microsoft.Win32;
-using System;
-using System.Diagnostics;
+using System;
 using System.IO;
 using System.Windows.Forms;
 
@@ -260,6 +258,7 @@ private static string LoadScript(string name)
         }
 
         // Controller Injector
+        // TODO: Refactor
 
         private static bool InjectController()
         {
@@ -273,7 +272,12 @@ private static bool InjectController()
 
             // Controller is accessible via 'bsController' global variable
             controller = "var bsController = null;" + controller;
-            if (IS_20H1 && SystemInfo.BUILD_NUMBER_MINOR < MIN_20H1_PATCH_FIX)
+            if (controller.Contains("static bindShown"))
+            {
+                // 1904X.3086+
+                controller = controller.Insert(controller.IndexOf("t._queryParamsCache={};"), ";bsController=t;");
+            }
+            else if (IS_20H1 && SystemInfo.BUILD_NUMBER_MINOR < MIN_20H1_PATCH_FIX)
             {
                 controller = controller.Insert(controller.IndexOf("}return l.prototype"), ";bsController=l;");
             }
@@ -295,7 +299,12 @@ public static string FindControllerFile()
             foreach (var file in Directory.EnumerateFiles(TARGET_DIR, "*.js"))
             {
                 string text = File.ReadAllText(file);
-                if (text.Contains("return l.prototype") || text.Contains("return l.isBingWallpaperAppInstalled")) return file;
+                if (text.Contains("static bindShown")
+                    || text.Contains("return l.prototype")
+                    || text.Contains("return l.isBingWallpaperAppInstalled"))
+                {
+                    return file;
+                }
             }
             return null;
         }