fix(coremods): message popover plaintext patch

src/renderer/coremods/messagePopover/index.tsx

@@ -0,0 +1,58 @@
+import type { Channel, Message } from "discord-types/general";
+import type { GetButtonItem, IconButtonProps } from "../../../types/coremods/message";
+import { Logger } from "../../modules/logger";
+
+const logger = Logger.api("MessagePopover");
+
+export const buttons = new Map<GetButtonItem, string>();
+
+/**
+ * Adds a button to any MessagePopover
+ * @param item The function that creates the button to add
+ * @param key Optional key for button
+ * @returns A callback to remove the button from set.
+ */
+export function addButton(item: GetButtonItem, key?: string): () => void {
+  buttons.set(item, `${key || "repluggedButton"}-${Math.random().toString(36).substring(2)}`);
+
+  return () => removeButton(item);
+}
+
+/**
+ * Removes a button from MessagePopover
+ * @param item The function that creates the button to add
+ * @returns
+ */
+export function removeButton(item: GetButtonItem): void {
+  buttons.delete(item);
+}
+
+/**
+ * @internal
+ * @hidden
+ */
+export function _buildPopoverElements(
+  msg: Message,
+  channel: Channel,
+  IconButton: React.FC<IconButtonProps>,
+): React.ReactElement[] {
+  const items = [] as React.ReactElement[];
+
+  buttons.forEach((key, getItem) => {
+    try {
+      const item = getItem(msg, channel);
+      try {
+        if (item) {
+          item.key = key;
+          items.push(<IconButton {...item} />);
+        }
+      } catch (err) {
+        logger.error(`Error in making the button [${item?.key}]`, err, item);
+      }
+    } catch (err) {
+      logger.error("Error while running GetButtonItem function", err, getItem);
+    }
+  });
+
+  return items;
+}

src/renderer/coremods/messagePopover/plaintextPatches.ts

@@ -2,13 +2,13 @@ import type { PlaintextPatch } from "src/types";
 
 export default [
   {
-    find: 'key:"copy-id"',
+    find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
     replacements: [
       {
         match:
-          /(Fragment,{children:\[)(.{0,200}children:\[.{0,20}?(\w{1,3})\({.{0,5}\s?key:"copy-id".{0,20}channel:(.{1,3})[,}].{0,20}message:(.{1,3})[,}])/,
-        replace: (_, prefix, suffix, makeButton, channel, message) =>
-          `${prefix}...(replugged.coremods.coremods.messagePopover?._buildPopoverElements(${message},${channel},${makeButton}) ?? []),${suffix}`,
+          /(\.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}`,
       },
     ],
   },

src/renderer/modules/injector.ts

@@ -320,7 +320,7 @@ export class Injector {
      * By default, items are placed in a group for custom items, though that can be customized with `sectionId` and `indexInSection`
      * @param navId The id of the menu to add to
      * @param item The function that creates the item to add
-     * @param sectionId — The number of the section to add to. Defaults to replugged's section
+     * @param sectionId — The number of the section to add to. Defaults to Replugged's section
      * @param indexInSection — The index in the section to add to. Defaults to the end position
      * @returns A callback to de-register the function
      *

src/types/coremods/message.ts

@@ -7,19 +7,19 @@ interface ButtonPopoverProps extends React.ComponentPropsWithoutRef<"div"> {
   dangerous?: boolean;
 }
 
-export interface IconButtonProps extends Omit<ButtonPopoverProps, "onClick"> {
+export interface IconButtonProps extends ButtonPopoverProps {
   label: string;
-  channel?: Channel;
-  message?: Message;
-  onClick: (channel: Channel, message: Message, event: React.MouseEvent<HTMLDivElement>) => void;
   ariaLabel?: string;
   tooltipText?: string;
   tooltipColor?: string;
   icon: React.ComponentType<unknown>;
   iconProps?: Record<string, unknown>;
-  key?: string;
+  onTooltipShow?: () => void;
+  onTooltipHide?: () => void;
   separator?: boolean;
   sparkle?: boolean;
+  showNewBadge?: boolean;
+  buttonClassName?: string;
 }
 
 export type GetButtonItem = (message: Message, channel: Channel) => IconButtonProps | null;