context menu api fix

src/renderer/coremods/contextMenu/index.tsx

@@ -1,3 +1,6 @@
+import { Injector } from "src/renderer/modules/injector";
+import { Logger } from "src/renderer/modules/logger";
+import { filters, waitForModule } from "src/renderer/modules/webpack";
 import { React } from "@common";
 import type { ContextMenuProps } from "@components/ContextMenu";
 import type {
@@ -6,9 +9,9 @@ import type {
  GetContextItem,
  RawContextItem,
 } from "../../../types/coremods/contextMenu";
-import { Logger } from "../../modules/logger";
-import { getByProps } from "../../modules/webpack";
+import { AnyFunction } from "src/types";
 
+let injector: Injector;
 const logger = Logger.api("ContextMenu");
 
 export const menuItems = {} as Record<
@@ -88,53 +91,69 @@ type ContextMenuData = ContextMenuProps["ContextMenu"] & {
  * @internal
  * @hidden
  */
-export function _insertMenuItems(menu: ContextMenuData): void {
- const { navId } = menu;
 
- // No items to insert
- if (!menuItems[navId]) return;
-
- // Already inserted items
- // If this isn't here, another group of items is added every update
- if (menu.plugged) return;
-
- // We delay getting the items until now, as importing at the start of the file causes Discord to hang
- // Using `await import(...)` is undesirable because the new items will only appear once the menu is interacted with
- const { MenuGroup } = getByProps<Record<string, React.ComponentType>>([
+async function injectMenu(): Promise<void> {
+ const RepluggedComponents = await waitForModule(filters.byProps("Menu", "MenuGroup", "MenuItem"));
+ injector.instead(
+ RepluggedComponents as Record<string, AnyFunction>,
  "Menu",
- "MenuItem",
- "MenuGroup",
- ])!;
-
- if (!MenuGroup) return;
-
- // The data as passed as Arguments from the calling function, so we just grab what we want from it
- const data = menu.data[0];
-
- const repluggedGroup = <MenuGroup />;
- repluggedGroup.props.id = "replugged";
- repluggedGroup.props.children = [];
-
- // Add in the new menu items right above the DevMode Copy ID
- // If the user doesn't have DevMode enabled, the new items will be at the bottom
- menu.children.splice(-1, 0, repluggedGroup);
-
- menuItems[navId].forEach((item) => {
- try {
- const res = makeItem(item.getItem(data, menu)) as ContextItem & { props: { id?: string } };
-
- if (res?.props) {
- // add in unique ids
- res.props.id = `${res.props.id || "repluggedItem"}-${Math.random()
- .toString(36)
- .substring(2)}`;
+ ([menu]: [ContextMenuData], res) => {
+ const ContextMenu = res as React.FunctionComponent<ContextMenuData>;
+ const { navId } = menu;
+ const { MenuGroup } = RepluggedComponents as Record<string, React.ComponentType>;
+
+ // No items to insert
+ // Or MenuGroup Component is not available
+ if (!menuItems[navId] || !MenuGroup) {
+ return <ContextMenu {...menu} />;
  }
 
- menu.children.at(item.sectionId)?.props?.children?.splice(item.indexInSection, 0, res);
- } catch (err) {
- logger.error("Error while running GetContextItem function", err, item.getItem);
- }
- });
+ // The data as passed as Arguments from the calling function, so we just grab what we want from it
+ const data = menu.data[0];
+
+ const repluggedGroup = <MenuGroup />;
+ repluggedGroup.props.id = "replugged";
+ repluggedGroup.props.children = [];
+
+ // Add in the new menu items right above the DevMode Copy ID
+ // If the user doesn't have DevMode enabled, the new items will be at the bottom
+ menu.children.splice(-1, 0, repluggedGroup);
+ menuItems[navId].forEach((item) => {
+ try {
+ const itemRet = makeItem(item.getItem(data, menu)) as ContextItem & {
+ props: { id?: string };
+ };
+
+ if (itemRet?.props) {
+ // add in unique ids
+ itemRet.props.id = `${itemRet.props.id || "repluggedItem"}-${Math.random()
+ .toString(36)
+ .substring(2)}`;
+ }
+
+ if (!menu.children.at(item.sectionId)?.props?.plugged) {
+ // menu props can stay same while having different children
+ // so we check children props if its plugged or not
+ menu.children
+ .at(item.sectionId)
+ ?.props.children?.splice(item.indexInSection, 0, itemRet);
+ if (menu.children.at(item.sectionId)?.props)
+ menu.children.at(item.sectionId)!.props.plugged = true;
+ }
+ } catch (err) {
+ logger.error("Error while running GetContextItem function", err, item.getItem);
+ }
+ });
+
+ return <ContextMenu {...menu} />;
+ },
+ );
+}
+export function start(): void {
+ injector = new Injector();
+ void injectMenu();
+}
 
- menu.plugged = true;
+export function stop(): void {
+ injector.uninjectAll();
 }

src/renderer/coremods/contextMenu/plaintextPatches.ts

@@ -1,16 +1,6 @@
 import type { PlaintextPatch } from "src/types";
 
 export default [
- {
- find: 'Error("Menu',
- replacements: [
- {
- match: /var \w,\w=(.)\.navId/,
- replace: (vars, menu) =>
- `replugged.coremods.coremods.contextMenu._insertMenuItems(${menu});${vars}`,
- },
- ],
- },
  {
  find: "navId:",
  replacements: [