From c13b69cb04d37e1bb7e198ee2b4f447c317625ab Mon Sep 17 00:00:00 2001
From: Jade Macho <ade@0x0a.de>
Date: Mon, 13 May 2024 21:24:03 +0200
Subject: [PATCH] More 10.9 lazy load fixes

---
 Jadefin.js          | 18 +++++++++++-------
 mods/ExtrasMenu.js  |  2 ++
 mods/InputEater.js  |  2 ++
 mods/VolumeBoost.js |  2 ++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Jadefin.js b/Jadefin.js
index 10f969e..59eb7e0 100644
--- a/Jadefin.js
+++ b/Jadefin.js
@@ -87,13 +87,17 @@ export default JadefinIntegrity("Jadefin", import.meta.url, () => window["Jadefi
         this.webpackTryLoad = id => {
             const sid = `${id}`;
 
-            const chunk = window["webpackChunk"].find(c => c[1][sid]);
-            const chunkNames = chunk ? chunk[0].map(this.webpackChunkIdToJS) : null;
-            if (chunkNames && (chunkNames.find(c =>
-                c.startsWith("session-login.") ||
-                c.startsWith("35463.")
-            ))) {
-                return null;
+            if (!document.querySelector(".mainDrawer")) {
+                const chunk = window["webpackChunk"].find(c => c[1][sid]);
+                const chunkNames = chunk ? chunk[0].map(this.webpackChunkIdToJS) : null;
+                if (chunkNames && (chunkNames.find(c =>
+                    c.startsWith("session-login.") ||
+                    c.startsWith("syncPlay-ui-") ||
+                    c.startsWith("35463.") ||
+                    c.startsWith("1998.")
+                ))) {
+                    return null;
+                }
             }
 
             try {
diff --git a/mods/ExtrasMenu.js b/mods/ExtrasMenu.js
index e792d6c..4ab67c2 100644
--- a/mods/ExtrasMenu.js
+++ b/mods/ExtrasMenu.js
@@ -75,6 +75,8 @@ export default JadefinIntegrity("ExtrasMenu", import.meta.url, () => new (class
     async init(name, url) {
         await super.init(name, url);
 
+        await JadefinUtils.waitUntil(() => document.querySelector(".headerRight"));
+
         this.initStyle();
         this.initHeaderExtras();
         this.initDrawerExtras();
diff --git a/mods/InputEater.js b/mods/InputEater.js
index 40435a9..b9f0200 100644
--- a/mods/InputEater.js
+++ b/mods/InputEater.js
@@ -70,6 +70,8 @@ export default JadefinIntegrity("InputEater", import.meta.url, () => new (class
     async init(name, url) {
         await super.init(name, url);
 
+        await JadefinUtils.waitUntil(() => JadefinModules.syncPlay);
+
         this.initStyle();
         this.initHookSyncPlayEnabled();
         this.initHookSyncPlayDisabled();
diff --git a/mods/VolumeBoost.js b/mods/VolumeBoost.js
index 24efe61..1e36cea 100644
--- a/mods/VolumeBoost.js
+++ b/mods/VolumeBoost.js
@@ -62,6 +62,8 @@ export default JadefinIntegrity("VolumeBoost", import.meta.url, () => new (class
     async init(name, url) {
         await super.init(name, url);
 
+        await JadefinUtils.waitUntil(() => JadefinModules.actionSheet);
+
         this.initHookActionSheetShow();
 
         document.addEventListener("viewshow", () => {