Merge branch 'main' into native-api

Author: yofukashino

src/renderer/coremods/badges/plaintextPatches.ts

@@ -12,7 +12,7 @@ export default [
       },
       // Change to a div and add a children for our custom badge
       {
-        match: /"img",({.+?\((\w+)\.icon\),)/,
+        match: /"img",(.{20,50}?\((\w+)\.icon\),)/,
         replace: `$2.component?"div":"img",$1children:$2.component,`,
       },
     ],

src/renderer/coremods/notrack/plaintextPatches.ts

@@ -5,8 +5,8 @@ export default [
     find: "AnalyticsActionHandlers.handleTrack",
     replacements: [
       {
-        match: /=>\w+\.AnalyticsActionHandlers\.handle\w+\([^)]*\)/g,
-        replace: "=>{}",
+        match: /(\(\)|\w+)=>\w+\.AnalyticsActionHandlers\.handle\w+\([^)]*\)/g,
+        replace: "arg=>{arg?.resolve?.()}",
       },
     ],
   },