Stop crashes (mod doesn't fully initialize yet)

replugged-org · Jul 4, 2024 · 1173064 · 1173064
1 parent 40eb0a4
commit 1173064
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/renderer/coremods/language/plaintextPatches.ts b/src/renderer/coremods/language/plaintextPatches.ts
@@ -8,11 +8,12 @@ export default [
     replacements: [
       {
         match: /(\.Messages\.LANGUAGE,)\s*children:((?:[^}]*?}){3}\))/,
-        replace: (_, prefix, ogChild) => `${prefix}children:[${coremodStr}.Card(),${ogChild}]`,
+        replace: (_, prefix, ogChild) =>
+          `${prefix}children:[${coremodStr}?.Card() ?? null,${ogChild}]`,
       },
       {
         match: /children:\[(.+?\.localeName[^\]]*?)]/,
-        replace: (_, ogChild) => `children:[${coremodStr}.Percentage(${ogChild})]`,
+        replace: (_, ogChild) => `children:[${coremodStr}?.Percentage(${ogChild}) ?? ${ogChild}]`,
       },
     ],
   },

diff --git a/src/renderer/coremods/messagePopover/plaintextPatches.ts b/src/renderer/coremods/messagePopover/plaintextPatches.ts
@@ -8,7 +8,7 @@ export default [
         match:
           /(Fragment,{children:\[)(.{0,200}children:\[.{0,20}?(\w{1,3})\({.{0,5}\s?key:"copy-id".{0,20}channel:(.{1,3})[,}].{0,20}message:(.{1,3})[,}])/,
         replace: (_, prefix, suffix, makeButton, channel, message) =>
-          `${prefix}...replugged.coremods.coremods.messagePopover._buildPopoverElements(${message},${channel},${makeButton}),${suffix}`,
+          `${prefix}...(replugged.coremods.coremods.messagePopover?._buildPopoverElements(${message},${channel},${makeButton}) ?? []),${suffix}`,
       },
     ],
   },

diff --git a/src/renderer/coremods/notices/plaintextPatches.tsx b/src/renderer/coremods/notices/plaintextPatches.tsx
@@ -9,7 +9,7 @@ export default [
       {
         match: /(\w+\.base,children:\[)(.+?}\)),/,
         replace: (_, prefix, noticeWrapper) =>
-          `${prefix}${coremodStr}.AnnouncementContainer({originalRes:${noticeWrapper}}),`,
+          `${prefix}${coremodStr}?.AnnouncementContainer({originalRes:${noticeWrapper}}) ?? ${noticeWrapper},`,
       },
     ],
   },

diff --git a/src/renderer/coremods/settings/plaintextPatches.ts b/src/renderer/coremods/settings/plaintextPatches.ts
@@ -7,9 +7,9 @@ export default [
     find: "getPredicateSections",
     replacements: [
       {
-        match: /this\.props\.sections\.filter\((.+?)\)}/,
-        replace: (_, sections) =>
-          `${coremodStr}.insertSections(this.props.sections.filter(${sections}))};`,
+        match: /(this\.props\.sections\.filter\(.+?\))}/,
+        replace: (_, filteredSections) =>
+          `${coremodStr}?.insertSections(${filteredSections}) ?? ${filteredSections}};`,
       },
     ],
   },
@@ -18,7 +18,7 @@ export default [
     replacements: [
       {
         match: /appArch,children:.{0,200}?className:\w+\.line,.{0,100}children:\w+}\):null/,
-        replace: `$&,${coremodStr}.VersionInfo()`,
+        replace: `$&,${coremodStr}?.VersionInfo() ?? null`,
       },
     ],
   },