From 93a95b6d565d7d6bb501b2776d641f6e25cac542 Mon Sep 17 00:00:00 2001
From: Jack <30497388+FieryFlames@users.noreply.github.com>
Date: Wed, 22 Nov 2023 01:23:21 -0500
Subject: [PATCH] feat(patcher): Grouped replacements (#2009)

Co-authored-by: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Co-authored-by: V <vendicated@riseup.net>
---
 src/utils/types.ts          |  2 ++
 src/webpack/patchWebpack.ts | 33 +++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/utils/types.ts b/src/utils/types.ts
index 7305cd01..16867a43 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -41,6 +41,8 @@ export interface Patch {
     all?: boolean;
     /** Do not warn if this patch did no changes */
     noWarn?: boolean;
+    /** Only apply this set of replacements if all of them succeed. Use this if your replacements depend on each other */
+    group?: boolean;
     predicate?(): boolean;
 }
 
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index b81415e6..82648f62 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -204,6 +204,9 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
             if (code.includes(patch.find)) {
                 patchedBy.add(patch.plugin);
 
+                const previousMod = mod;
+                const previousCode = code;
+
                 // we change all patch.replacement to array in plugins/index
                 for (const replacement of patch.replacement as PatchReplacement[]) {
                     if (replacement.predicate && !replacement.predicate()) continue;
@@ -214,11 +217,21 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
 
                     try {
                         const newCode = executePatch(replacement.match, replacement.replace as string);
-                        if (newCode === code && !patch.noWarn) {
-                            (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
-                            logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
-                            if (IS_DEV) {
-                                logger.debug("Function Source:\n", code);
+                        if (newCode === code) {
+                            if (!patch.noWarn) {
+                                (window.explosivePlugins ??= new Set<string>()).add(patch.plugin);
+                                logger.warn(`Patch by ${patch.plugin} had no effect (Module id is ${id}): ${replacement.match}`);
+                                if (IS_DEV) {
+                                    logger.debug("Function Source:\n", code);
+                                }
+                            }
+
+                            if (patch.group) {
+                                logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} had no effect`);
+                                code = previousCode;
+                                mod = previousMod;
+                                patchedBy.delete(patch.plugin);
+                                break;
                             }
                         } else {
                             code = newCode;
@@ -259,9 +272,17 @@ function patchFactories(factories: Record<string | number, (module: { exports: a
                             const [titleFmt, ...titleElements] = Logger.makeTitle("white", "Diff");
                             logger.errorCustomFmt(titleFmt + fmt, ...titleElements, ...elements);
                         }
+
+                        patchedBy.delete(patch.plugin);
+                        if (patch.group) {
+                            logger.warn(`Undoing patch ${patch.find} by ${patch.plugin} because replacement ${replacement.match} errored`);
+                            code = previousCode;
+                            mod = previousMod;
+                            break;
+                        }
+
                         code = lastCode;
                         mod = lastMod;
-                        patchedBy.delete(patch.plugin);
                     }
                 }