refactor(messagePopover): simplify the plaintext patch by getting the…

… component by source
replugged-org · Oct 17, 2024 · bb7e6e2 · bb7e6e2
1 parent f10b372
commit bb7e6e2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/src/renderer/coremods/messagePopover/index.tsx b/src/renderer/coremods/messagePopover/index.tsx
@@ -1,5 +1,6 @@
+import { getBySource, getFunctionBySource } from "@webpack";
 import type { Channel, Message } from "discord-types/general";
-import type { GetButtonItem, IconButtonProps } from "../../../types/coremods/message";
+import type { GetButtonItem, HoverBarButtonProps } from "../../../types/coremods/message";
 import { Logger } from "../../modules/logger";
 
 const logger = Logger.api("MessagePopover");
@@ -27,24 +28,33 @@ export function removeButton(item: GetButtonItem): void {
   buttons.delete(item);
 }
 
+type HoverBarButton = React.FC<HoverBarButtonProps>;
+
 /**
  * @internal
  * @hidden
  */
-export function _buildPopoverElements(
-  msg: Message,
-  channel: Channel,
-  IconButton: React.FC<IconButtonProps>,
-): React.ReactElement[] {
-  const items = [] as React.ReactElement[];
+export function _buildPopoverElements(msg: Message, channel: Channel): React.ReactElement[] {
+  const items: React.ReactElement[] = [];
+
+  // Waiting for the module is not necessary, as it is already loaded by the time this function is called
+  const hoverBarButtonStr = ".hoverBarButton";
+  const HoverBarButton = getFunctionBySource<HoverBarButton>(
+    getBySource(hoverBarButtonStr),
+    hoverBarButtonStr,
+  );
+  if (!HoverBarButton) {
+    logger.error("Could not find HoverBarButton");
+    return items;
+  }
 
   buttons.forEach((key, getItem) => {
     try {
       const item = getItem(msg, channel);
       try {
         if (item) {
           item.key = key;
-          items.push(<IconButton {...item} />);
+          items.push(<HoverBarButton {...item} />);
         }
       } catch (err) {
         logger.error(`Error in making the button [${item?.key}]`, err, item);

diff --git a/src/renderer/coremods/messagePopover/plaintextPatches.ts b/src/renderer/coremods/messagePopover/plaintextPatches.ts
@@ -5,10 +5,9 @@ export default [
     find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
     replacements: [
       {
-        match:
-          /(\.Fragment,{children:\[)(.{1,25}Fragment.{1,50}(\w+\.\w+),{label:\w+\.\w+\.Messages\.COPY_ID_MESSAGE)/,
-        replace: (_, prefix, suffix, makeButton) =>
-          `${prefix}...(replugged.coremods.coremods.messagePopover?._buildPopoverElements(arguments[0]?.message,arguments[0]?.channel,${makeButton}) ?? []),${suffix}`,
+        match: /(\.Fragment,{children:\[)(.{1,75},{label:\w+\.\w+\.Messages\.COPY_ID_MESSAGE)/,
+        replace: (_, prefix, suffix) =>
+          `${prefix}...(replugged.coremods.coremods.messagePopover?._buildPopoverElements(arguments[0]?.message,arguments[0]?.channel) ?? []),${suffix}`,
       },
     ],
   },

diff --git a/src/types/coremods/message.ts b/src/types/coremods/message.ts
@@ -7,7 +7,7 @@ interface ButtonPopoverProps extends React.ComponentPropsWithoutRef<"div"> {
   dangerous?: boolean;
 }
 
-export interface IconButtonProps extends ButtonPopoverProps {
+export interface HoverBarButtonProps extends ButtonPopoverProps {
   label: string;
   ariaLabel?: string;
   tooltipText?: string;
@@ -22,4 +22,4 @@ export interface IconButtonProps extends ButtonPopoverProps {
   buttonClassName?: string;
 }
 
-export type GetButtonItem = (message: Message, channel: Channel) => IconButtonProps | null;
+export type GetButtonItem = (message: Message, channel: Channel) => HoverBarButtonProps | null;