diff --git a/src/equicordplugins/_api/headerBar.ts b/src/equicordplugins/_api/headerBar.ts index 1660a6082..8f7edc595 100644 --- a/src/equicordplugins/_api/headerBar.ts +++ b/src/equicordplugins/_api/headerBar.ts @@ -23,7 +23,7 @@ export default definePlugin({ { find: "Missing channel in Channel.renderHeaderToolbar", replacement: { - match: /(?<=renderHeaderToolbar",\(\)=>\{.{1,200}let (\i)=\[\];)/, + match: /(?<=renderHeaderToolbar"\);let (\i)=\[\];)/, replace: "Vencord.Api.HeaderBar._addChannelToolbarButtons($1);" } } diff --git a/src/equicordplugins/blockKeywords/index.ts b/src/equicordplugins/blockKeywords/index.ts index df585f679..3f7504373 100644 --- a/src/equicordplugins/blockKeywords/index.ts +++ b/src/equicordplugins/blockKeywords/index.ts @@ -73,10 +73,10 @@ export default definePlugin({ authors: [EquicordDevs.catcraft], patches: [ { - find: '"_channelMessages",{})', + find: "_channelMessages={}", predicate: () => settings.store.blockedWords !== "", replacement: { - match: /static commit\((.{1,2})\){/g, + match: /static commit\((\i)\)\{/g, replace: "$&$1=$self.blockMessagesWithKeywords($1);" } }, diff --git a/src/equicordplugins/channelTabs/index.tsx b/src/equicordplugins/channelTabs/index.tsx index 330adc80e..35e6888a3 100644 --- a/src/equicordplugins/channelTabs/index.tsx +++ b/src/equicordplugins/channelTabs/index.tsx @@ -61,12 +61,12 @@ export default definePlugin({ find: '"AppView"', replacement: [ { - match: /(\?void 0:(\i)\.channelId.{0,600})"div",{(?=className:\i\.\i)/, + match: /((\i\?.params)\?\.channelId.{0,600})"div",{(?=className:\i\.\i)/, replace: "$1$self.render,{currentChannel:$2,", predicate: () => settings.store.tabBarPosition === "top" }, { - match: /(\?void 0:(\i)\.channelId.{0,300})"div",{/, + match: /((\i\?.params)\?.channelId.{0,300})"div",{/, replace: "$1$self.render,{currentChannel:$2,", predicate: () => settings.store.tabBarPosition === "bottom" } @@ -74,9 +74,9 @@ export default definePlugin({ }, // intercept channel navigation to switch/create tabs { - find: '"transitionToGuild - Transitioning to "', + find: "`transitionToGuild - Transitioning to", replacement: { - match: /(\i\((\i),(\i),\i,\i\)\{)(.{0,25}"transitionToGuild)/, + match: /(\i\((\i),(\i),\i,\i\)\{)(.{0,25}`transitionToGuild)/, replace: "$1$self.handleNavigation($2,$3);$4" } }, @@ -106,7 +106,7 @@ export default definePlugin({ }, // prevent issues with the pins/inbox popouts being too tall { - find: "renderCloseButton()", + find: "#{intl::JUMP}),onClick:", replacement: { match: /\i&&\((\i).maxHeight.{0,5}\)/, replace: "$&;$1.maxHeight-=$self.containerHeight" diff --git a/src/equicordplugins/equicordHelper/index.tsx b/src/equicordplugins/equicordHelper/index.tsx index eea09f8f2..3f58e6c68 100644 --- a/src/equicordplugins/equicordHelper/index.tsx +++ b/src/equicordplugins/equicordHelper/index.tsx @@ -68,18 +68,18 @@ export default definePlugin({ find: "Unknown resolution:", replacement: [ { - match: /throw Error\("Unknown resolution: ".concat\((\i)\)\)/, + match: /throw Error\(`Unknown resolution: \$\{(\i)\}`\)/, replace: "return $1;" }, { - match: /throw Error\("Unknown frame rate: ".concat\((\i)\)\)/, + match: /throw Error\(`Unknown frame rate: \$\{(\i)\}`\)/, replace: "return $1;" } ] }, // When focused on voice channel or group chat voice call { - find: /\i\?\i.\i.SELF_VIDEO/, + find: ".STATUS_WARNING_BACKGROUND})})", predicate: () => settings.store.noMirroredCamera, replacement: { match: /mirror:\i/, @@ -115,7 +115,7 @@ export default definePlugin({ }, }, { - find: ".buttons.length)>=1", + find: ".USER_PROFILE_ACTIVITY_BUTTONS),", predicate: () => settings.store.showYourOwnActivityButtons && !isPluginEnabled(customRPC.name), replacement: { match: /.getId\(\)===\i.id/, diff --git a/src/equicordplugins/favouriteAnything/index.tsx b/src/equicordplugins/favouriteAnything/index.tsx index 6025a66fa..8780f309e 100644 --- a/src/equicordplugins/favouriteAnything/index.tsx +++ b/src/equicordplugins/favouriteAnything/index.tsx @@ -93,9 +93,9 @@ export default definePlugin({ }, // Add a proxyUrl prop alongside the src prop, which is used for video thumbnails. { - find: '"renderOverlayContent","renderLinkComponent"', + find: /disableArrowKeySeek:\i\}\)\}/, replacement: { - match: /src:\i(?=\})/, + match: /src:\i(?=,\.\.\.\i)/, replace: "$&,proxyUrl:this.props.src" } } diff --git a/src/equicordplugins/githubRepos/index.tsx b/src/equicordplugins/githubRepos/index.tsx index 5ec1aafc9..c621e4991 100644 --- a/src/equicordplugins/githubRepos/index.tsx +++ b/src/equicordplugins/githubRepos/index.tsx @@ -86,7 +86,7 @@ export default definePlugin({ patches: [ // User Popout { - find: ".hasAvatarForGuild(null==", + find: /onOpenUserProfileModal:\i\}\),\i/, replacement: { match: /userId:\i\.id,guild:\i.{0,15}\}\).{0,100}(?=\])/, replace: "$&,$self.ProfilePopoutComponent(arguments[0])" diff --git a/src/equicordplugins/messageColors/index.tsx b/src/equicordplugins/messageColors/index.tsx index 5d713e488..568718102 100644 --- a/src/equicordplugins/messageColors/index.tsx +++ b/src/equicordplugins/messageColors/index.tsx @@ -42,12 +42,9 @@ export default definePlugin({ // Changes text md rule regex, so it stops right before hsl( | rgb( // Without it discord will try to pass a string without those to color rule { - find: ".defaultRules.text)", - group: true, + find: ".defaultRules.text,match", replacement: { - // $)/) match: /\$\)\//, - // hsl(|rgb(|$& replace: requiredFirstCharacters.join("|") + "|$&" } }, diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx index addcd7c19..fbed60174 100644 --- a/src/equicordplugins/messageLoggerEnhanced/index.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx @@ -261,7 +261,7 @@ export default definePlugin({ ] }, { - find: "THREAD_STARTER_MESSAGE?null==", + find: ".PREMIUM_REFERRAL&&(", replacement: { match: /deleted:\i\.deleted, editHistory:\i\.editHistory,/, replace: "deleted:$self.getDeleted(...arguments), editHistory:$self.getEdited(...arguments)," diff --git a/src/equicordplugins/moreStickers/index.tsx b/src/equicordplugins/moreStickers/index.tsx index 7495a10df..19a9b104b 100644 --- a/src/equicordplugins/moreStickers/index.tsx +++ b/src/equicordplugins/moreStickers/index.tsx @@ -47,10 +47,10 @@ export default definePlugin({ }] }, { - find: ".gifts)", + find: ".GIFT_PROMOTION]).", replacement: [ { - match: /(?<=(,\(null==\(\i=\i\.stickers\)\?void 0.*?\i\.push\(\(.{0,100})\},"sticker"\)\))/, + match: /(?<=(,\i\.stickers\?\.button.{0,50}\i\.push\(\(.{0,100})\},"sticker"\)\))/, replace: "$1,stickersType:\"stickers+\"},\"stickers+\"))" }, ] diff --git a/src/equicordplugins/splitLargeMessages/index.ts b/src/equicordplugins/splitLargeMessages/index.ts index 0e52af7f4..58609b569 100644 --- a/src/equicordplugins/splitLargeMessages/index.ts +++ b/src/equicordplugins/splitLargeMessages/index.ts @@ -134,9 +134,9 @@ export default definePlugin({ }, { - find: '(this,"hideAutocomplete"', // disable file conversion + find: ".onHideAutocomplete?", // disable file conversion replacement: { - match: /if\(\i.length>\i\)/, + match: /(?<=getData\(\i\.type\);)if\(\i.length>\i\)/, replace: "if(false)", }, } diff --git a/src/equicordplugins/tidalEmbeds/index.tsx b/src/equicordplugins/tidalEmbeds/index.tsx index 7ca7d629a..1e9269859 100644 --- a/src/equicordplugins/tidalEmbeds/index.tsx +++ b/src/equicordplugins/tidalEmbeds/index.tsx @@ -14,7 +14,7 @@ export default definePlugin({ dependencies: ["MessageUpdaterAPI"], patches: [ { - find: "}renderEmbeds(", + find: "renderEmbeds(", replacement: { match: /(?<=renderEmbeds\(\i\){.+?embeds\.map\(\((\i),\i\)?=>{)/, replace: "$&if($self.isTidalEmbed($1))return null;" diff --git a/src/equicordplugins/urlHighlighter/index.tsx b/src/equicordplugins/urlHighlighter/index.tsx index 1073bcf48..6fbe9ba77 100644 --- a/src/equicordplugins/urlHighlighter/index.tsx +++ b/src/equicordplugins/urlHighlighter/index.tsx @@ -126,9 +126,9 @@ export default definePlugin({ patches: [ { - find: '"messageId","channelId"', + find: ".MASKED_LINK),", replacement: { - match: /,children:null!=\i\?\i:\i/, + match: /,children:\i\?\?\i/, replace: "$&,...$self.getProps(arguments[0])" } } diff --git a/src/plugins/noBlockedMessages/index.ts b/src/plugins/noBlockedMessages/index.ts index 25db5d832..3c50240fa 100644 --- a/src/plugins/noBlockedMessages/index.ts +++ b/src/plugins/noBlockedMessages/index.ts @@ -106,7 +106,7 @@ export default definePlugin({ ] })), { - find: '"forum-post-action-bar-"', + find: "`forum-post-action-bar-", replacement: [ { match: /(?<=\);)(let \i=null,\i=\[\],\i=(\i))/,