diff --git a/src/equicordplugins/equicordToolbox/index.tsx b/src/equicordplugins/equicordToolbox/index.tsx index b20c123e7..51ee62c26 100644 --- a/src/equicordplugins/equicordToolbox/index.tsx +++ b/src/equicordplugins/equicordToolbox/index.tsx @@ -165,7 +165,7 @@ export default definePlugin({ { find: ".controlButtonWrapper,", replacement: { - match: /(?<=function (\i).{0,100}\()\i.Fragment,(?=.+?toolbar:\1\(\))/, + match: /(?<=toolbar:function\(.{0,100}\()\i.Fragment,/, replace: "$self.ToolboxFragmentWrapper," } } diff --git a/src/plugins/_api/notices.ts b/src/plugins/_api/notices.ts index f0933ff0f..ace58e705 100644 --- a/src/plugins/_api/notices.ts +++ b/src/plugins/_api/notices.ts @@ -33,8 +33,8 @@ export default definePlugin({ replace: "if(Vencord.Api.Notices.currentNotice)return false;$&" }, { - match: /(?<=function (\i)\(\i\){)return null!=(\i)(?=.+?NOTICE_DISMISS:\1)/, - replace: (m, _, notice) => `if(${notice}?.id=="EquicordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);${m}` + match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/, + replace: (m, notice) => `if(${notice}?.id=="EquicordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);${m}` } ] } diff --git a/src/plugins/customIdle/index.ts b/src/plugins/customIdle/index.ts index a7b09dac5..032a285a4 100644 --- a/src/plugins/customIdle/index.ts +++ b/src/plugins/customIdle/index.ts @@ -40,7 +40,7 @@ export default definePlugin({ replace: "$self.getIdleTimeout()||" }, { - match: /Math\.min\((\i\.\i\.getSetting\(\)\*\i\.\i\.\i\.SECOND),\i\.\i\)/, + match: /Math\.min\((\i\*\i\.\i\.\i\.SECOND),\i\.\i\)/, replace: "$1" // Decouple idle from afk (phone notifications will remain at user setting or 10 min maximum) }, { diff --git a/src/plugins/greetStickerPicker/index.tsx b/src/plugins/greetStickerPicker/index.tsx index 4ea1f25dc..0cc3e170d 100644 --- a/src/plugins/greetStickerPicker/index.tsx +++ b/src/plugins/greetStickerPicker/index.tsx @@ -161,7 +161,7 @@ export default definePlugin({ { find: "#{intl::WELCOME_CTA_LABEL}", replacement: { - match: /innerClassName:\i\.welcomeCTAButton,(?<={channel:\i,message:\i}=(\i).+?)/, + match: /className:\i\.welcomeCTA,(?<={channel:\i,message:\i}=(\i).+?)/, replace: "$&onContextMenu:(vcEvent)=>$self.pickSticker(vcEvent, $1)," } } diff --git a/src/plugins/showAllMessageButtons/index.ts b/src/plugins/showAllMessageButtons/index.ts index 4d209d2b0..10069a583 100644 --- a/src/plugins/showAllMessageButtons/index.ts +++ b/src/plugins/showAllMessageButtons/index.ts @@ -36,8 +36,8 @@ export default definePlugin({ find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}", replacement: [ { - match: /(?<=(\i)=)\i(?=&&.+?isExpanded:\1)/, - replace: "true" + match: /isExpanded:\i&&(.+?),/, + replace: "isExpanded:$1," }, { predicate: () => settings.store.noShiftDelete, diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx index ee4ad8c06..755aa4530 100644 --- a/src/plugins/showHiddenChannels/index.tsx +++ b/src/plugins/showHiddenChannels/index.tsx @@ -331,7 +331,7 @@ export default definePlugin({ }, { // Export the channel for the users allowed component patch - match: /maxUsers:\i,users:\i(?<=channel:(\i).+?)/, + match: /maxUsers:\d+?,users:\i(?<=channel:(\i).+?)/, replace: (m, channel) => `${m},shcChannel:${channel}` }, { diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts index 8b0e55f97..046ae4f55 100644 --- a/src/plugins/superReactionTweaks/index.ts +++ b/src/plugins/superReactionTweaks/index.ts @@ -42,8 +42,8 @@ export default definePlugin({ { find: ",BURST_REACTION_EFFECT_PLAY", replacement: { - match: /(?<=(\i)=\i=>{.+?)(\i\(\i,\i\))>=\i(?=\).+BURST_REACTION_EFFECT_PLAY:\1)/, - replace: "!$self.shouldPlayBurstReaction($2)" + match: /(BURST_REACTION_EFFECT_PLAY:\i=>{.+?if\()(\(\(\i,\i\)=>.+?\(\i,\i\))>=\d+?(?=\))/, + replace: (_, rest, playingCount) => `${rest}!$self.shouldPlayBurstReaction(${playingCount})` } }, { diff --git a/src/plugins/webContextMenus.web/index.ts b/src/plugins/webContextMenus.web/index.ts index b19a9265f..55776892e 100644 --- a/src/plugins/webContextMenus.web/index.ts +++ b/src/plugins/webContextMenus.web/index.ts @@ -152,10 +152,6 @@ export default definePlugin({ match: /!\i\.isPlatformEmbedded/, replace: "false" }, - { - match: /return\s*?\[.{0,100}?(?=\?\(0,\i\.jsxs?.{0,100}?id:"copy-image")/, - replace: "return [true" - }, { match: /(?<=#{intl::COPY_IMAGE_MENU_ITEM}\),)action:/, replace: "action:()=>$self.copyImage(arguments[0]),oldAction:"