From eecc555dace0a2993d4dc9c479d11be9ac9ad042 Mon Sep 17 00:00:00 2001 From: ActuallyTheSun <78964224+ActuallyTheSun@users.noreply.github.com> Date: Sat, 7 Jan 2023 18:17:18 +0200 Subject: [PATCH] Fix Badges & MessageLinkEmbeds (#383) --- src/plugins/apiBadges.tsx | 2 +- src/plugins/messageLinkEmbeds.tsx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/apiBadges.tsx b/src/plugins/apiBadges.tsx index d14678c13..3fe2f6b18 100644 --- a/src/plugins/apiBadges.tsx +++ b/src/plugins/apiBadges.tsx @@ -73,7 +73,7 @@ export default definePlugin({ replace: (_, imageMap, badge) => `src: ${badge}.image ?? ${imageMap}[${badge}.key], ...${badge}.props,` }, { - match: /spacing:(\d{1,2}),children:(.{1,40}(.{1,2})\.jsx.+?(.{1,2})\.onClick.+?\)})},/, + match: /spacing:(\d{1,2}),children:(.{1,40}(\i)\.jsx.+?(\i)\.onClick.+?\)})},/, // if the badge provides it's own component, render that instead of an image // the badge also includes info about the user that has it (type BadgeUserArgs), which is why it's passed as props replace: (_, s, origBadgeComponent, React, badge) => diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx index bcd2fa424..d08f25e8c 100644 --- a/src/plugins/messageLinkEmbeds.tsx +++ b/src/plugins/messageLinkEmbeds.tsx @@ -151,9 +151,8 @@ export default definePlugin({ match: /{"use strict";(.{0,10})\(\)=>(.{1,2})}\);/, replace: '{"use strict";$1()=>$2,me:()=>messageEmbed});' }, { - match: /function (.{1,2})\((.{1,2})\){var (.{1,2})=.{1,2}\.message,(.{1,2})=.{1,2}\.channel(.{0,300})\.embedCard(.{0,500})}\)}/, - replace: "function $1($2){var $3=$2.message,$4=$2.channel$5().embedCard$6})}\ -var messageEmbed={mle_AutomodEmbed:$1};" + match: /function (.{1,2})\(.{1,2}\){var .{1,2}=.{1,2}\.message,.{1,2}=.{1,2}\.channel.{0,300}\.embedCard.{0,500}}\)}/, + replace: "$&;var messageEmbed={mle_AutomodEmbed:$1};" }] } ],