From fbb7ee50dd636900467cbae44e3bdd88273f62eb Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 31 May 2024 17:34:32 -0300
Subject: [PATCH] Revert indexOf change

---
 src/webpack/patchWebpack.ts | 4 +---
 src/webpack/webpack.ts      | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
index a2264c541..abfabb438 100644
--- a/src/webpack/patchWebpack.ts
+++ b/src/webpack/patchWebpack.ts
@@ -219,10 +219,8 @@ function patchFactory(id: PropertyKey, factory: ModuleFactory) {
         const patch = patches[i];
         if (patch.predicate && !patch.predicate()) continue;
 
-        // indexOf is faster than includes because it doesn't check if searchString is a RegExp
-        // https://github.com/moonlight-mod/moonlight/blob/53ae39d4010277f49f3b70bebbd27b9cbcdb1c8b/packages/core/src/patch.ts#L61
         const moduleMatches = typeof patch.find === "string"
-            ? code.indexOf(patch.find) !== -1
+            ? code.includes(patch.find)
             : (patch.find.global && (patch.find.lastIndex = 0), patch.find.test(code));
 
         if (!moduleMatches) continue;
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index af57a324e..f31855870 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -48,7 +48,7 @@ export const filters = {
         if (typeof m !== "function") return false;
         const s = Function.prototype.toString.call(m);
         for (const c of code) {
-            if (s.indexOf(c) === -1) return false;
+            if (!s.includes(c)) return false;
         }
         return true;
     },
@@ -229,7 +229,7 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
         const str = String(wreq.m[id]);
 
         for (const c of code) {
-            if (str.indexOf(c) === -1) continue outer;
+            if (!str.includes(c)) continue outer;
         }
         return id;
     }
@@ -526,7 +526,7 @@ export function search(...filters: Array<string | RegExp>) {
         const factory = factories[id];
         const factoryStr = String(factory);
         for (const filter of filters) {
-            if (typeof filter === "string" && factoryStr.indexOf(filter) === -1) continue outer;
+            if (typeof filter === "string" && !factoryStr.includes(filter)) continue outer;
             if (filter instanceof RegExp && !filter.test(factoryStr)) continue outer;
         }
         results[id] = factory;