2 files changed, 81 insertions, 1 deletions
diff --git a/src/plugins/apiMenuItemDeobfuscator.ts b/src/plugins/apiMenuItemDeobfuscator.ts
new file mode 100644
index 0000000..59d40cf
--- /dev/null
+++ b/src/plugins/apiMenuItemDeobfuscator.ts
@@ -0,0 +1,80 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "../utils/constants";
+import definePlugin from "../utils/types";
+
+// duplicate values have multiple branches with different types. Just include all to be safe
+const nameMap = {
+    radio: "MenuRadioItem",
+    separator: "MenuSeparator",
+    checkbox: "MenuCheckboxItem",
+    groupstart: "MenuGroup",
+
+    control: "MenuControlItem",
+    compositecontrol: "MenuControlItem",
+
+    item: "MenuItem",
+    customitem: "MenuItem",
+};
+
+export default definePlugin({
+    name: "MenuItemDeobfuscatorApi",
+    description: "Deobfuscates Discord's Menu Item module",
+    authors: [Devs.Ven],
+    patches: [
+        {
+            find: '"Menu API',
+            replacement: {
+                match: /function.{0,80}type===(.{1,3})\..{1,3}\).{0,50}navigable:.+?Menu API/s,
+                replace: (m, mod) => {
+                    let nicenNames = "";
+                    const redefines = [] as string[];
+                    // if (t.type === m.MenuItem)
+                    const typeCheckRe = /\(.{1,3}\.type===(.{1,5})\)/g;
+                    // push({type:"item"})
+                    const pushTypeRe = /type:"(\w+)"/g;
+
+                    let typeMatch: RegExpExecArray | null;
+                    // for each if (t.type === ...)
+                    while ((typeMatch = typeCheckRe.exec(m)) !== null) {
+                        // extract the current menu item
+                        const item = typeMatch[1];
+                        // Set the starting index of the second regex to that of the first to start
+                        // matching from after the if
+                        pushTypeRe.lastIndex = typeCheckRe.lastIndex;
+                        // extract the first type: "..."
+                        const type = pushTypeRe.exec(m)?.[1];
+                        if (type && type in nameMap) {
+                            const name = nameMap[type];
+                            nicenNames += `Object.defineProperty(${item},"name",{value:"${name}"});`;
+                            redefines.push(`${name}:${item}`);
+                        }
+                    }
+                    if (redefines.length < 6) {
+                        console.warn("[ApiMenuItemDeobfuscator] Expected to at least remap 6 items, only remapped", redefines.length);
+                    }
+
+                    // Merge all our redefines with the actual module
+                    return `${nicenNames}Object.assign(${mod},{${redefines.join(",")}});${m}`;
+                },
+            },
+        },
+    ],
+});
+
diff --git a/src/plugins/apiNotices.ts b/src/plugins/apiNotices.ts
index b2bdbce..1a1df4b 100644
--- a/src/plugins/apiNotices.ts
+++ b/src/plugins/apiNotices.ts
@@ -20,7 +20,7 @@ import { Devs } from "../utils/constants";
 import definePlugin from "../utils/types";
 
 export default definePlugin({
-    name: "ApiNotices",
+    name: "NoticesApi",
     description: "Fixes notices being automatically dismissed",
     authors: [Devs.Ven],
     required: true,