From 554bb18e9b6a554c9b7b5fd6d5e5613a3e529d3c Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 25 Oct 2023 15:24:06 +0200
Subject: [PATCH] BadgeAPI: fix

---
 src/plugins/_api/badges.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/_api/badges.tsx b/src/plugins/_api/badges.tsx
index d10d0021..11e843db 100644
--- a/src/plugins/_api/badges.tsx
+++ b/src/plugins/_api/badges.tsx
@@ -85,17 +85,19 @@ export default definePlugin({
                 },
                 {
                     // alt: "", aria-hidden: false, src: originalSrc
-                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/g,
+                    match: /alt:" ","aria-hidden":!0,src:(?=(\i)\.src)/,
                     // ...badge.props, ..., src: badge.image ?? ...
                     replace: "...$1.props,$& $1.image??"
                 },
+                // replace their component with ours if applicable
                 {
-                    match: /children:function(?<=(\i)\.(?:tooltip|description),spacing:\d.+?)/g,
-                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) : function"
+                    match: /(?<=text:(\i)\.description,spacing:12,)children:/,
+                    replace: "children:$1.component ? () => $self.renderBadgeComponent($1) :"
                 },
+                // conditionally override their onClick with badge.onClick if it exists
                 {
-                    match: /onClick:function(?=.{0,200}href:(\i)\.link)/,
-                    replace: "onClick:$1.onClick??function"
+                    match: /href:(\i)\.link/,
+                    replace: "...($1.onClick && { onClick: $1.onClick }),$&"
                 }
             ]
         }