From 8113ed3c8cbc8894607b7d4ed6d5bb770f1a345e Mon Sep 17 00:00:00 2001 From: Vendicated Date: Sat, 7 Jan 2023 03:19:28 +0100 Subject: [PATCH] Fix canary --- src/plugins/apiCommands.ts | 4 ++-- src/plugins/apiMessageAccessories.ts | 2 +- src/plugins/apiMessageDecorations.ts | 2 +- src/plugins/blurNsfw.ts | 2 +- src/plugins/callTimer.tsx | 2 +- src/plugins/ignoreActivities.tsx | 2 +- src/plugins/messageLinkEmbeds.tsx | 6 +++--- src/plugins/plainFolderIcon.ts | 2 +- src/plugins/settings.tsx | 4 ++-- src/plugins/viewIcons.tsx | 2 +- src/utils/modal.tsx | 12 ++++++------ src/webpack/common.tsx | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/plugins/apiCommands.ts b/src/plugins/apiCommands.ts index e92b904..2197b30 100644 --- a/src/plugins/apiCommands.ts +++ b/src/plugins/apiCommands.ts @@ -50,10 +50,10 @@ export default definePlugin({ }, // Show plugin name instead of "Built-In" { - find: "().source,children", + find: ".source,children", replacement: { // ...children: p?.name - match: /(?<=:(.{1,3})\.displayDescription\}.{0,200}\(\)\.source,children:)[^}]+/, + match: /(?<=:(.{1,3})\.displayDescription\}.{0,200}\.source,children:)[^}]+/, replace: "$1.plugin||($&)" } } diff --git a/src/plugins/apiMessageAccessories.ts b/src/plugins/apiMessageAccessories.ts index 0b30b58..11109be 100644 --- a/src/plugins/apiMessageAccessories.ts +++ b/src/plugins/apiMessageAccessories.ts @@ -27,7 +27,7 @@ export default definePlugin({ { find: "_messageAttachmentToEmbedMedia", replacement: { - match: /(\(\)\.container\)?,children:)(\[[^\]]+\])(}\)\};return)/, + match: /(.container\)?,children:)(\[[^\]]+\])(}\)\};return)/, replace: (_, pre, accessories, post) => `${pre}Vencord.Api.MessageAccessories._modifyAccessories(${accessories},this.props)${post}`, }, diff --git a/src/plugins/apiMessageDecorations.ts b/src/plugins/apiMessageDecorations.ts index 47f03f3..a3b2518 100644 --- a/src/plugins/apiMessageDecorations.ts +++ b/src/plugins/apiMessageDecorations.ts @@ -27,7 +27,7 @@ export default definePlugin({ { find: ".withMentionPrefix", replacement: { - match: /(\(\).roleDot.{10,50}{children:.{1,2})}\)/, + match: /(.roleDot.{10,50}{children:.{1,2})}\)/, replace: "$1.concat(Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0]))})" } } diff --git a/src/plugins/blurNsfw.ts b/src/plugins/blurNsfw.ts index 5521897..b87fba3 100644 --- a/src/plugins/blurNsfw.ts +++ b/src/plugins/blurNsfw.ts @@ -43,7 +43,7 @@ export default definePlugin({ patches: [ { - find: "().embedWrapper,embed", + find: ".embedWrapper,embed", replacement: [{ match: /(\.renderEmbed=.+?(.)=.\.props)(.+?\(\)\.embedWrapper)/g, replace: "$1,vcProps=$2$3+(vcProps.channel.nsfw?' vc-nsfw-img':'')" diff --git a/src/plugins/callTimer.tsx b/src/plugins/callTimer.tsx index 6a1d357..ff02256 100644 --- a/src/plugins/callTimer.tsx +++ b/src/plugins/callTimer.tsx @@ -74,7 +74,7 @@ export default definePlugin({ patches: [{ find: ".renderConnectionStatus=", replacement: { - match: /(?<=renderConnectionStatus=.+\(\)\.channel,children:)\w/, + match: /(?<=renderConnectionStatus=.+\.channel,children:)\w/, replace: "[$&, Vencord.Plugins.plugins.CallTimer.renderTimer(this.props.channel.id)]" } }], diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities.tsx index 981145c..a85e501 100644 --- a/src/plugins/ignoreActivities.tsx +++ b/src/plugins/ignoreActivities.tsx @@ -151,7 +151,7 @@ export default definePlugin({ }, { find: ".Messages.NEW,name", replacement: { - match: /\(\)\.badgeContainer.+?.\?\(0,.\.jsx\)\(.{1,2},{name:(?.)\.name}\):null/, + match: /.badgeContainer.+?.\?\(0,.\.jsx\)\(.{1,2},{name:(?.)\.name}\):null/, replace: "$&,Vencord.Plugins.plugins.IgnoreActivities.renderToggleActivityButton($)" } }, { diff --git a/src/plugins/messageLinkEmbeds.tsx b/src/plugins/messageLinkEmbeds.tsx index f57b5d0..bcd2fa4 100644 --- a/src/plugins/messageLinkEmbeds.tsx +++ b/src/plugins/messageLinkEmbeds.tsx @@ -44,7 +44,7 @@ let AutomodEmbed: React.ComponentType, Endpoints: Record; waitFor(["mle_AutomodEmbed"], m => (AutomodEmbed = m.mle_AutomodEmbed)); -waitFor(filters.byCode("().inlineMediaEmbed"), m => Embed = m); +waitFor(filters.byCode(".inlineMediaEmbed"), m => Embed = m); waitFor(m => m.type?.toString()?.includes('["message","compact","className",'), m => ChannelMessage = m); waitFor(["MESSAGE_CREATE_ATTACHMENT_UPLOAD"], _ => Endpoints = _); const SearchResultClasses = findByPropsLazy("message", "searchResult"); @@ -146,12 +146,12 @@ export default definePlugin({ dependencies: ["MessageAccessoriesAPI"], patches: [ { - find: "().embedCard", + find: ".embedCard", replacement: [{ 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})}\)}/, + 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};" }] diff --git a/src/plugins/plainFolderIcon.ts b/src/plugins/plainFolderIcon.ts index 5c01ea9..4c37e1e 100644 --- a/src/plugins/plainFolderIcon.ts +++ b/src/plugins/plainFolderIcon.ts @@ -24,7 +24,7 @@ export default definePlugin({ description: "Doesn't show the small guild icons in folders", authors: [Devs.botato], patches: [{ - find: "().expandedFolderIconWrapper", + find: ".expandedFolderIconWrapper", replacement: [{ match: /\(\w\|\|\w\)&&(\(.{0,40}\(.{1,3}\.animated)/, replace: "$1", diff --git a/src/plugins/settings.tsx b/src/plugins/settings.tsx index e5afbbc..183798a 100644 --- a/src/plugins/settings.tsx +++ b/src/plugins/settings.tsx @@ -32,10 +32,10 @@ export default definePlugin({ authors: [Devs.Ven, Devs.Megu], required: true, patches: [{ - find: "().versionHash", + find: ".versionHash", replacement: [ { - match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}\(\)\.versionHash,.+?\})\)," "/, + match: /\[\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^{}}]+\{.{0,20}.versionHash,.+?\})\)," "/, replace: (m, component, props) => { props = props.replace(/children:\[.+\]/, ""); return `${m},Vencord.Plugins.plugins.Settings.makeInfoElements(${component}, ${props})`; diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons.tsx index 0eb36bb..63f3554 100644 --- a/src/plugins/viewIcons.tsx +++ b/src/plugins/viewIcons.tsx @@ -63,7 +63,7 @@ export default new class ViewIcons implements PluginDef { replace: (_, src) => `{src:${src},onClick:()=>${OPEN_URL}${src}),avatarDecoration` } }, { - find: "().popoutNoBannerPremium", + find: ".popoutNoBannerPremium", replacement: { match: /style:.{0,10}\{\},(.{1,2})\)/, replace: (m, style) => diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx index 9a90460..73dd009 100644 --- a/src/utils/modal.tsx +++ b/src/utils/modal.tsx @@ -55,12 +55,12 @@ interface ModalRootProps { type RenderFunction = (props: ModalProps) => React.ReactNode; -export const Modals = mapMangledModuleLazy("().closeWithCircleBackground", { - ModalRoot: filters.byCode("().root"), - ModalHeader: filters.byCode("().header"), - ModalContent: filters.byCode("().content"), - ModalFooter: filters.byCode("().footerSeparator"), - ModalCloseButton: filters.byCode("().closeWithCircleBackground"), +export const Modals = mapMangledModuleLazy(".closeWithCircleBackground", { + ModalRoot: filters.byCode(".root"), + ModalHeader: filters.byCode(".header"), + ModalContent: filters.byCode(".content"), + ModalFooter: filters.byCode(".footerSeparator"), + ModalCloseButton: filters.byCode(".closeWithCircleBackground"), }); export const ModalRoot = (props: ModalRootProps) => ; diff --git a/src/webpack/common.tsx b/src/webpack/common.tsx index a732d6b..9024ff9 100644 --- a/src/webpack/common.tsx +++ b/src/webpack/common.tsx @@ -191,7 +191,7 @@ waitFor(m => m.Types?.INPUT_PLACEHOLDER, m => Forms.FormText = m); waitFor(m => { if (typeof m !== "function") return false; const s = m.toString(); - return s.length < 200 && s.includes("().divider"); + return s.length < 200 && s.includes(".divider"); }, m => Forms.FormDivider = m); // This is the same module but this is easier