From 94c742cbd66cde2097b512e957caedcca5df1317 Mon Sep 17 00:00:00 2001
From: redphx <96280+redphx@users.noreply.github.com>
Date: Wed, 18 Dec 2024 06:32:51 +0700
Subject: [PATCH] Fix not adding custom controller IDs

---
 src/enums/game-pass-gallery.ts |  3 ++-
 src/utils/bx-exposed.ts        | 13 +++++++++----
 src/utils/network.ts           |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/enums/game-pass-gallery.ts b/src/enums/game-pass-gallery.ts
index 4549896..a5766a4 100755
--- a/src/enums/game-pass-gallery.ts
+++ b/src/enums/game-pass-gallery.ts
@@ -1,5 +1,6 @@
 export enum GamePassCloudGallery {
-    ALL = 'ce573635-7c18-4d0c-9d68-90b932393470',
+    ALL = '29a81209-df6f-41fd-a528-2ae6b91f719c',
+    ALL_WITH_BYGO = 'ce573635-7c18-4d0c-9d68-90b932393470',
     MOST_POPULAR = 'e7590b22-e299-44db-ae22-25c61405454c',
     NATIVE_MKB = '8fa264dd-124f-4af3-97e8-596fcdf4b486',
     TOUCH = '9c86f07a-f3e8-45ad-82a0-a1f759597059',
diff --git a/src/utils/bx-exposed.ts b/src/utils/bx-exposed.ts
index 1a0c7f8..b2004eb 100755
--- a/src/utils/bx-exposed.ts
+++ b/src/utils/bx-exposed.ts
@@ -54,11 +54,16 @@ export const BxExposed = {
                 let customList = TouchController.getCustomList();
 
                 // Remove non-cloud games from the official list
-                const allGames = sigls[GamePassCloudGallery.ALL].data.products;
-                customList = customList.filter(id => allGames.includes(id));
+                const siglId = GamePassCloudGallery.ALL_WITH_BYGO;
+                if (siglId in sigls) {
+                    const allGames = sigls[siglId].data.products;
+                    customList = customList.filter(id => allGames.includes(id));
 
-                // Add to the official touchlist
-                sigls[GamePassCloudGallery.TOUCH]?.data.products.push(...customList);
+                    // Add to the official touchlist
+                    sigls[GamePassCloudGallery.TOUCH]?.data.products.push(...customList);
+                } else {
+                    BxLogger.warning(LOG_TAG, 'Sigl not found: ' + siglId);
+                }
             }
         } catch (e) {
             BxLogger.error(LOG_TAG, e);
diff --git a/src/utils/network.ts b/src/utils/network.ts
index 9aab359..74001af 100755
--- a/src/utils/network.ts
+++ b/src/utils/network.ts
@@ -253,7 +253,7 @@ export function interceptHttpRequests() {
             const response = await NATIVE_FETCH(request, init);
             const obj = await response.clone().json();
 
-            if (url.includes(GamePassCloudGallery.ALL)) {
+            if (url.includes(GamePassCloudGallery.ALL) || url.includes(GamePassCloudGallery.ALL_WITH_BYGO)) {
                 for (let i = 1; i < obj.length; i++) {
                     gamepassAllGames.push(obj[i].id);
                 }