Use findAndParseParams() in "gameCardCustomIcons" patch

.github/workflows/stale.yaml

@@ -0,0 +1,25 @@
+name: 'Mark stale bug issues'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'  # Runs daily at midnight UTC
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: |
+            This issue has been marked `stale` due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days.
+          close-issue-message: |
+            This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+          days-before-stale: 60
+          days-before-close: 30
+          stale-issue-label: 'stale'
+          only-issues: true
+          only-labels: 'bug'

bun.lock

@@ -3,11 +3,11 @@
   "workspaces": {
     "": {
       "devDependencies": {
-        "@types/bun": "^1.2.9",
+        "@types/bun": "^1.2.10",
         "@types/node": "^22.14.1",
         "@types/stylus": "^0.48.43",
         "@webgpu/types": "^0.1.60",
-        "eslint": "^9.24.0",
+        "eslint": "^9.25.0",
         "eslint-plugin-compat": "^6.0.2",
         "stylus": "^0.64.0",
       },
@@ -27,15 +27,15 @@
 
     "@eslint/config-helpers": ["@eslint/config-helpers@0.2.1", "", {}, "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw=="],
 
-    "@eslint/core": ["@eslint/core@0.13.0", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw=="],
+    "@eslint/core": ["@eslint/core@0.14.0", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg=="],
 
     "@eslint/eslintrc": ["@eslint/eslintrc@3.3.1", "", { "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ=="],
 
-    "@eslint/js": ["@eslint/js@9.25.0", "", {}, "sha512-iWhsUS8Wgxz9AXNfvfOPFSW4VfMXdVhp1hjkZVhXCrpgh/aLcc45rX6MPu+tIVUWDw0HfNwth7O28M1xDxNf9w=="],
+    "@eslint/js": ["@eslint/js@9.27.0", "", {}, "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA=="],
 
     "@eslint/object-schema": ["@eslint/object-schema@2.1.6", "", {}, "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA=="],
 
-    "@eslint/plugin-kit": ["@eslint/plugin-kit@0.2.8", "", { "dependencies": { "@eslint/core": "^0.13.0", "levn": "^0.4.1" } }, "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA=="],
+    "@eslint/plugin-kit": ["@eslint/plugin-kit@0.3.1", "", { "dependencies": { "@eslint/core": "^0.14.0", "levn": "^0.4.1" } }, "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w=="],
 
     "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="],
 
@@ -51,17 +51,17 @@
 
     "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="],
 
-    "@types/bun": ["@types/bun@1.2.10", "", { "dependencies": { "bun-types": "1.2.10" } }, "sha512-eilv6WFM3M0c9ztJt7/g80BDusK98z/FrFwseZgT4bXCq2vPhXD4z8R3oddmAn+R/Nmz9vBn4kweJKmGTZj+lg=="],
+    "@types/bun": ["@types/bun@1.2.15", "", { "dependencies": { "bun-types": "1.2.15" } }, "sha512-U1ljPdBEphF0nw1MIk0hI7kPg7dFdPyM7EenHsp6W5loNHl7zqy6JQf/RKCgnUn2KDzUpkBwHPnEJEjII594bA=="],
 
     "@types/estree": ["@types/estree@1.0.6", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
 
     "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
 
-    "@types/node": ["@types/node@22.14.1", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw=="],
+    "@types/node": ["@types/node@22.15.24", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-w9CZGm9RDjzTh/D+hFwlBJ3ziUaVw7oufKA3vOFSOZlzmW9AkZnfjPb+DLnrV6qtgL/LNmP0/2zBNCFHL3F0ng=="],
 
     "@types/stylus": ["@types/stylus@0.48.43", "", { "dependencies": { "@types/node": "*" } }, "sha512-72dv/zdhuyXWVHUXG2VTPEQdOG+oen95/DNFx2aMFFaY6LoITI6PwEqf5x31JF49kp2w9hvUzkNfTGBIeg61LQ=="],
 
-    "@webgpu/types": ["@webgpu/types@0.1.60", "", {}, "sha512-8B/tdfRFKdrnejqmvq95ogp8tf52oZ51p3f4QD5m5Paey/qlX4Rhhy5Y8tgFMi7Ms70HzcMMw3EQjH/jdhTwlA=="],
+    "@webgpu/types": ["@webgpu/types@0.1.61", "", {}, "sha512-w2HbBvH+qO19SB5pJOJFKs533CdZqxl3fcGonqL321VHkW7W/iBo6H8bjDy6pr/+pbMwIu5dnuaAxH7NxBqUrQ=="],
 
     "acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="],
 
@@ -83,7 +83,7 @@
 
     "browserslist": ["browserslist@4.24.3", "", { "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" } }, "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA=="],
 
-    "bun-types": ["bun-types@1.2.10", "", { "dependencies": { "@types/node": "*" } }, "sha512-b5ITZMnVdf3m1gMvJHG+gIfeJHiQPJak0f7925Hxu6ZN5VKA8AGy4GZ4lM+Xkn6jtWxg5S3ldWvfmXdvnkp3GQ=="],
+    "bun-types": ["bun-types@1.2.15", "", { "dependencies": { "@types/node": "*" } }, "sha512-NarRIaS+iOaQU1JPfyKhZm4AsUOrwUOqRNHY0XxI8GI8jYxiLXLcdjYMG9UKS+fwWasc1uw1htV9AX24dD+p4w=="],
 
     "callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
 
@@ -113,7 +113,7 @@
 
     "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
 
-    "eslint": ["eslint@9.25.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", "@eslint/core": "^0.13.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.25.0", "@eslint/plugin-kit": "^0.2.8", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-MsBdObhM4cEwkzCiraDv7A6txFXEqtNXOb877TsSp2FCkBNl8JfVQrmiuDqC1IkejT6JLPzYBXx/xAiYhyzgGA=="],
+    "eslint": ["eslint@9.27.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.27.0", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q=="],
 
     "eslint-plugin-compat": ["eslint-plugin-compat@6.0.2", "", { "dependencies": { "@mdn/browser-compat-data": "^5.5.35", "ast-metadata-inferer": "^0.8.1", "browserslist": "^4.24.2", "caniuse-lite": "^1.0.30001687", "find-up": "^5.0.0", "globals": "^15.7.0", "lodash.memoize": "^4.1.2", "semver": "^7.6.2" }, "peerDependencies": { "eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" } }, "sha512-1ME+YfJjmOz1blH0nPZpHgjMGK4kjgEeoYqGCqoBPQ/mGu/dJzdoP0f1C8H2jcWZjzhZjAMccbM/VdXhPORIfA=="],
 

dist/better-xcloud.meta.js

@@ -1,5 +1,5 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      6.6.0
+// @version      6.6.1
 // ==/UserScript==

dist/better-xcloud.pretty.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      6.6.0
+// @version      6.6.2-beta
 // @description  Improve Xbox Cloud Gaming (xCloud) experience
 // @author       redphx
 // @license      MIT
@@ -193,7 +193,7 @@ class UserAgent {
   });
  }
 }
-var SCRIPT_VERSION = "6.6.0", SCRIPT_VARIANT = "full", AppInterface = window.AppInterface;
+var SCRIPT_VERSION = "6.6.2-beta", SCRIPT_VARIANT = "full", AppInterface = window.AppInterface;
 UserAgent.init();
 var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, STATES = {
  supportedRegion: !0,
@@ -5160,6 +5160,30 @@ class PatcherUtils {
   let newCode = `window.BX_EXPOSED.reactUseEffect(() => window.BxEventBus.${group}.emit('${eventName}', {}), [])${separator}`;
   return str = PatcherUtils.insertAt(str, index, newCode), str;
  }
+ static findAndParseParams(str, index, maxRange) {
+  let substr = str.substring(index, index + maxRange), startIndex = substr.indexOf("({");
+  if (startIndex < 0) return !1;
+  startIndex += 1;
+  let endIndex = substr.indexOf("})", startIndex);
+  if (endIndex < 0) return !1;
+  endIndex += 1;
+  try {
+   let input = substr.substring(startIndex, endIndex);
+   return PatcherUtils.parseObjectVariables(input);
+  } catch {
+   return null;
+  }
+ }
+ static parseObjectVariables(input) {
+  try {
+   let pairs = [...input.matchAll(/(\w+)\s*:\s*([a-zA-Z_$][\w$]*)/g)], result = {};
+   for (let [_, key, value] of pairs)
+    result[key] = value;
+   return result;
+  } catch {
+   return null;
+  }
+ }
 }
 var LOG_TAG2 = "Patcher", PATCHES = {
  disableAiTrack(str) {
@@ -5256,8 +5280,9 @@ logFunc(logTag, '//', logMessage);
  disableGamepadDisconnectedScreen(str) {
   let index = str.indexOf('"GamepadDisconnected_Title",');
   if (index < 0) return !1;
-  let constIndex = str.indexOf("const", index - 30);
-  return str = str.substring(0, constIndex) + "e.onClose();return null;" + str.substring(constIndex), str;
+  let constIndex = PatcherUtils.lastIndexOf(str, "const[", index, 100);
+  if (constIndex < 0) return !1;
+  return str = PatcherUtils.insertAt(str, constIndex, "e();return null;"), str;
  },
  patchUpdateInputConfigurationAsync(str) {
   let text = "async updateInputConfigurationAsync(e){";
@@ -5345,6 +5370,7 @@ if (titleInfo && !titleInfo.details.hasTouchSupport && !titleInfo.details.hasFak
   let index = str.indexOf("({onCollapse:");
   if (index < 0) return !1;
   try {
+   if (!PatcherUtils.findAndParseParams(str, index, 1000)) return !1;
    let canShowTakHUDVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "canShowTakHUD", index, 500, !0) + 1), guideUIVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "guideUI", index, 500, !0) + 1), onShowStreamMenuVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "onShowStreamMenu", index, 500, !0) + 1), offsetVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "offset", index, 500, !0) + 1), newCode = renderString(stream_hud_default, {
     guideUI: guideUIVar,
     onShowStreamMenu: onShowStreamMenuVar,
@@ -5505,8 +5531,9 @@ true` + text;
  },
  ignoreSiglSections(str) {
   let index = str.indexOf("SiglRow-module__heroCard___");
-  if (index < 0) return !1;
-  if (index = PatcherUtils.lastIndexOf(str, "const[", index, 300), index < 0) return !1;
+  if (index >= 0 && (index = PatcherUtils.lastIndexOf(str, "const[", index, 300)), index < 0) return !1;
+  let params = PatcherUtils.findAndParseParams(str, index - 500, 500);
+  if (!params || !params.id) return !1;
   let PREF_HIDE_SECTIONS = getGlobalPref("ui.hideSections"), siglIds = [], sections = {
    "native-mkb": "8fa264dd-124f-4af3-97e8-596fcdf4b486",
    "most-popular": "e7590b22-e299-44db-ae22-25c61405454c",
@@ -5517,14 +5544,7 @@ true` + text;
    let galleryId = sections[section];
    galleryId && siglIds.push(galleryId);
   }
-  let newCode = `
-if (e && e.id) {
-  const siglId = e.id;
-  if (${siglIds.map((item2) => `siglId === "${item2}"`).join(" || ")}) {
-    return null;
-  }
-}
-`;
+  let checkSyntax = siglIds.map((item2) => `${params.id} === "${item2}"`).join(" || "), newCode = `if (${params.id} && (${checkSyntax})) return null;`;
   return str = PatcherUtils.insertAt(str, index, newCode), str;
  },
  ignoreGenresSection(str) {
@@ -5631,8 +5651,10 @@ ${subsVar} = subs;
   if (returnIndex < 0) return !1;
   let productIdIndex = PatcherUtils.lastIndexOf(str, ",productId:", initialIndex, 300);
   if (productIdIndex < 0) return !1;
-  let productIdVar = PatcherUtils.getVariableNameAfter(str, productIdIndex + 11), supportedInputIconsVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "supportedInputIcons:", initialIndex, 100, !0));
-  if (!productIdVar || !supportedInputIconsVar) return !1;
+  let params = PatcherUtils.findAndParseParams(str, productIdIndex - 200, 400);
+  if (!params || !params.productId) return !1;
+  let productIdVar = params.productId, supportedInputIconsVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, "supportedInputIcons:", initialIndex, 100, !0));
+  if (!supportedInputIconsVar) return !1;
   let newCode = renderString(game_card_icons_default, {
    productId: productIdVar,
    supportedInputIcons: supportedInputIconsVar
@@ -5661,7 +5683,7 @@ ${subsVar} = subs;
  injectErrorPageUseEffect(str) {
   let index = str.indexOf('"PureErrorPage-module__container');
   if (index > -1 && (index = PatcherUtils.lastIndexOf(str, "})=>(0,", index, 200)), index < 0) return !1;
-  return str = PatcherUtils.insertAt(str, index + 4, "{"), str = PatcherUtils.injectUseEffect(str, index + 5, "Script", "ui.error.rendered"), str += "}", str;
+  return str = PatcherUtils.insertAt(str, index + 4, "{return "), str = PatcherUtils.injectUseEffect(str, index + 5, "Script", "ui.error.rendered"), str += "}", str;
  },
  injectStreamMenuUseEffect(str) {
   let index = str.indexOf('"StreamMenu-module__container');

package.json

@@ -10,11 +10,11 @@
     "build": "build.ts"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.10",
-    "@types/node": "^22.14.1",
+    "@types/bun": "^1.2.15",
+    "@types/node": "^22.15.24",
     "@types/stylus": "^0.48.43",
-    "@webgpu/types": "^0.1.60",
-    "eslint": "^9.25.0",
+    "@webgpu/types": "^0.1.61",
+    "eslint": "^9.27.0",
     "eslint-plugin-compat": "^6.0.2",
     "stylus": "^0.64.0"
   },

src/modules/patcher/patcher-utils.ts

@@ -110,4 +110,41 @@ export class PatcherUtils {
 
         return str;
     }
+
+    static findAndParseParams(str: string, index: number, maxRange: number) {
+        const substr = str.substring(index, index + maxRange);
+        let startIndex = substr.indexOf('({');
+        if (startIndex < 0) {
+            return false;
+        }
+        startIndex += 1;
+
+        let endIndex = substr.indexOf('})', startIndex);
+        if (endIndex < 0) {
+            return false;
+        }
+        endIndex += 1;
+
+        try {
+            const input = substr.substring(startIndex, endIndex);
+            return PatcherUtils.parseObjectVariables(input);
+        } catch {
+            return null;
+        }
+    }
+
+    static parseObjectVariables(input: string) {
+        try {
+            const pairs = [...input.matchAll(/(\w+)\s*:\s*([a-zA-Z_$][\w$]*)/g)];
+
+            const result: Record<string, string> = {};
+            for (const [_, key, value] of pairs) {
+                result[key] = value;
+            }
+
+            return result;
+        } catch {
+            return null;
+        }
+    }
 }

src/modules/patcher/patcher.ts

@@ -237,8 +237,12 @@ logFunc(logTag, '//', logMessage);
             return false;
         }
 
-        const constIndex = str.indexOf('const', index - 30);
-        str = str.substring(0, constIndex) + 'e.onClose();return null;' + str.substring(constIndex);
+        const constIndex = PatcherUtils.lastIndexOf(str, 'const[', index, 100);
+        if (constIndex < 0) {
+            return false;
+        }
+
+        str = PatcherUtils.insertAt(str, constIndex, 'e();return null;');
         return str;
     },
 
@@ -395,6 +399,11 @@ if (titleInfo && !titleInfo.details.hasTouchSupport && !titleInfo.details.hasFak
         }
 
         try {
+            const params = PatcherUtils.findAndParseParams(str, index, 1000);
+            if (!params) {
+                return false;
+            }
+
             const canShowTakHUDVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, 'canShowTakHUD', index, 500, true) + 1);
             const guideUIVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, 'guideUI', index, 500, true) + 1);
             const onShowStreamMenuVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, 'onShowStreamMenu', index, 500, true) + 1);
@@ -764,12 +773,13 @@ true` + text;
     // home-page.js
     ignoreSiglSections(str: string) {
         let index = str.indexOf('SiglRow-module__heroCard___');
+        index >= 0 && (index = PatcherUtils.lastIndexOf(str, 'const[', index, 300));
         if (index < 0) {
             return false;
         }
 
-        index = PatcherUtils.lastIndexOf(str, 'const[', index, 300);
-        if (index < 0) {
+        const params = PatcherUtils.findAndParseParams(str, index - 500, 500);
+        if (!params || !params.id) {
             return false;
         }
 
@@ -788,16 +798,9 @@ true` + text;
             galleryId && siglIds.push(galleryId);
         };
 
-        const checkSyntax = siglIds.map(item => `siglId === "${item}"`).join(' || ');
+        const checkSyntax = siglIds.map(item => `${params.id} === "${item}"`).join(' || ');
+        const newCode = `if (${params.id} && (${checkSyntax})) return null;`;
 
-        const newCode = `
-if (e && e.id) {
-    const siglId = e.id;
-    if (${checkSyntax}) {
-        return null;
-    }
-}
-`;
         str = PatcherUtils.insertAt(str, index, newCode);
         return str;
     },
@@ -1027,12 +1030,16 @@ ${subsVar} = subs;
             return false;
         }
 
-        const productIdVar = PatcherUtils.getVariableNameAfter(str, productIdIndex + 11);
+        const params = PatcherUtils.findAndParseParams(str, productIdIndex - 200, 400);
+        if (!params || !params.productId) {
+            return false;
+        }
+
+        const productIdVar = params.productId;
 
         // Find supportedInputIcons and title var names
         const supportedInputIconsVar = PatcherUtils.getVariableNameAfter(str, PatcherUtils.indexOf(str, 'supportedInputIcons:', initialIndex, 100, true));
-
-        if (!productIdVar || !supportedInputIconsVar) {
+        if (!supportedInputIconsVar) {
             return false;
         }
 
@@ -1123,7 +1130,7 @@ ${subsVar} = subs;
             return false;
         }
 
-        str = PatcherUtils.insertAt(str, index + 4, '{');
+        str = PatcherUtils.insertAt(str, index + 4, '{return ');
         str = PatcherUtils.injectUseEffect(str, index + 5, 'Script', 'ui.error.rendered');
         str += '}';
         return str;