diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx index 501c0a4b4..f5c35f122 100644 --- a/src/equicordplugins/betterActivities/index.tsx +++ b/src/equicordplugins/betterActivities/index.tsx @@ -27,7 +27,7 @@ export default definePlugin({ patches: [ { // Patch activity icons - find: '"StackedActivityStatus"', + find: '"ActivityStatus"),', replacement: [ { match: /(?<=className:\i,children:\[).*?(?=\i\(\),\i&&)/g, diff --git a/src/equicordplugins/customUserColors/index.tsx b/src/equicordplugins/customUserColors/index.tsx index f13221363..5244197e3 100644 --- a/src/equicordplugins/customUserColors/index.tsx +++ b/src/equicordplugins/customUserColors/index.tsx @@ -26,7 +26,7 @@ export let colors: Record = {}; })(); // needed for color picker to be available without opening settings (ty pindms!!) -const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}(\i\.\i\("?.+?"?\).*?).then\(\i\.bind\(\i,"?(.+?)"?\)\).{0,50}"UserSettings"/); +const requireSettingsMenu = extractAndLoadChunksLazy(['"AppSkeleton"'], /createPromise:.{0,20}(\i\.\i\("?.+?"?\).*?).then\(\i\.bind\(\i,"?(.+?)"?\)\).{0,50}\}\),(?=.{0,15}createPromise.*?\}\),)/); const ColorIcon = () => { return ( }; diff --git a/src/plugins/_api/commands.ts b/src/plugins/_api/commands.ts index 2af65b6f9..3a86a3cb9 100644 --- a/src/plugins/_api/commands.ts +++ b/src/plugins/_api/commands.ts @@ -52,11 +52,6 @@ export default definePlugin({ { find: "#{intl::COMMANDS_OPTIONAL_COUNT}", replacement: [ - { - // ...children: p?.name - match: /(?<=:(\i)\.displayDescription\}.{0,200}children:).{0,50}\.name(?=\}\))/, - replace: "$1.plugin||($&)" - }, { match: /children:(?=\i\?\?\i\?\.name)(?<=command:(\i),.+?)/, replace: "children:$1.plugin??" diff --git a/src/plugins/betterGifPicker/index.ts b/src/plugins/betterGifPicker/index.ts index 101e70c57..cb2675886 100644 --- a/src/plugins/betterGifPicker/index.ts +++ b/src/plugins/betterGifPicker/index.ts @@ -27,10 +27,6 @@ export default definePlugin({ { find: "renderHeaderContent(){", replacement: [ - { - match: /(?<="state",{resultType:)null/, - replace: '"Favorites"' - }, { match: /(?<=state={resultType:)null/, replace: '"Favorites"' diff --git a/src/plugins/consoleJanitor/index.tsx b/src/plugins/consoleJanitor/index.tsx index c0a52193b..bb2731552 100644 --- a/src/plugins/consoleJanitor/index.tsx +++ b/src/plugins/consoleJanitor/index.tsx @@ -149,10 +149,6 @@ export default definePlugin({ { find: "is not a valid locale.", replacement: [ - { - match: /\i\.error(?=\(""\.concat\(\i," is not a valid locale."\)\))/, - replace: "$self.Noop" - }, { match: /\i\.error(?=\(`\$\{\i\} is not a valid locale.`)/, replace: "$self.Noop" @@ -169,10 +165,6 @@ export default definePlugin({ { find: "RPCServer:WSS", replacement: [ - { - match: /\i\.error\("Error: "\.concat\((\i)\.message/, - replace: '!$1.message.includes("EADDRINUSE")&&$&' - }, { match: /\i\.error\(`Error: \$\{(\i)\.message\}/, replace: '!$1.message.includes("EADDRINUSE")&&$&' @@ -196,10 +188,6 @@ export default definePlugin({ { find: "failed to send analytics events", replacement: [ - { - match: /console\.error\("\[analytics\] failed to send analytics events query: "\.concat\(\i\)\)/, - replace: "" - }, { match: /console\.error\(`\[analytics\] failed to send analytics events query: \$\{\i\}`\)/, replace: "" diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx index 77cccc6ba..5d77ff09c 100644 --- a/src/plugins/decor/index.tsx +++ b/src/plugins/decor/index.tsx @@ -103,10 +103,6 @@ export default definePlugin({ ].map(find => ({ find, replacement: [ - { - match: /(?<=userValue.{0,25}void 0:)((\i)\.avatarDecoration)/, - replace: "$self.useUserDecorAvatarDecoration($2)??$1" - }, { match: /(?<=userValue:)((\i)(?:.{0,10})?\.avatarDecoration)/, replace: "$self.useUserDecorAvatarDecoration($2)??$1" diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx index cf5b8dae4..e80e1b433 100644 --- a/src/plugins/experiments/index.tsx +++ b/src/plugins/experiments/index.tsx @@ -131,7 +131,7 @@ export default definePlugin({ }, { // Expands the experiment regex to allow negative numbers as well as text in the last segment of the URL. - find: "?\"dev://experiment/\".concat", + find: '"^dev://experiment/', replacement: { match: /(\[0-9\]\+)/, replace: "[a-zA-Z0-9-]+" @@ -140,11 +140,6 @@ export default definePlugin({ { find: ".EXPERIMENT_TREATMENT&&null", replacement: [ - { - // Uses the label instead of the value for the button text in the experiment embed. - match: /"Clear Treatment ".concat\((\i).value\):"Apply Treatment ".concat\(\i.value\)/, - replace: '"Clear Treatment: ".concat($1.label):"Apply Treatment: ".concat($1.label)' - }, { // Allow linking experiments by their label instead of their value. match: /(?<=find\(\i=>)((\i).value===\i)/, diff --git a/src/plugins/mentionAvatars/index.tsx b/src/plugins/mentionAvatars/index.tsx index 658b6ec28..829f49e8e 100644 --- a/src/plugins/mentionAvatars/index.tsx +++ b/src/plugins/mentionAvatars/index.tsx @@ -53,10 +53,6 @@ export default definePlugin({ // HEY THOR UPDATE SHOW ME YOUR NAME IF THIS SHIT CHANGES TY :) find: ".USER_MENTION)", replacement: [ - { - match: /children:"@"\.concat\((null!=\i\?\i:\i)\)(?<=\.useName\((\i)\).+?)/, - replace: "children:$self.renderUsername({username:$1,user:$2,showMeYourNameMention:typeof showMeYourNameMention!=='undefined'?showMeYourNameMention:undefined})" - }, { match: /children:`@\$\{(\i\?\?\i)\}`(?<=\.useName\((\i)\).+?)/, replace: "children:$self.renderUsername({username:$1,user:$2,showMeYourNameMention:typeof showMeYourNameMention!=='undefined'?showMeYourNameMention:undefined})" @@ -72,9 +68,9 @@ export default definePlugin({ }, { // show avatar in the chat input box - find: '.hasUniqueUsername()?null:"#"', + find: ".hasUniqueUsername()?null:`#", replacement: { - match: /(?<=,(\i)\).{0,55})"@"\.concat\((\i)\)/, + match: /(?<=,(\i)\).{0,55})`@\$\{(\i)\}`/, replace: "$self.renderInputMention($2,$1)" } }], diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx index 6ef86c425..43a270a5b 100644 --- a/src/plugins/showHiddenChannels/index.tsx +++ b/src/plugins/showHiddenChannels/index.tsx @@ -352,13 +352,6 @@ export default definePlugin({ match: /\i>0(?=&&!\i&&!\i)/, replace: m => `($self.isHiddenChannel(typeof shcChannel!=="undefined"?shcChannel:void 0,true)?true:${m})` }, - { - // Show only the plus text without overflowed children amount - // if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen - match: /(?<=`\+\$\{)\i(?=\})/, - replace: overflowTextAmount => "" + - `$self.isHiddenChannel(typeof shcChannel!=="undefined"?shcChannel:void 0,true)&&(${overflowTextAmount}-1)<=0?"":${overflowTextAmount}` - }, { // Show only the plus text without overflowed children amount // if the overflow amount is <= 0 and the component is used inside the HiddenChannelLockScreen diff --git a/src/plugins/textReplace/index.tsx b/src/plugins/textReplace/index.tsx index e22bcf1c8..be50bd63f 100644 --- a/src/plugins/textReplace/index.tsx +++ b/src/plugins/textReplace/index.tsx @@ -266,7 +266,7 @@ export default definePlugin({ { find: "!1,hideSimpleEmbedContent", replacement: { - match: /(let{toAST:.{0,125}?)\(null!=\i\?\i:\i\).content/, + match: /(let{toAST:.{0,125}?)\(\i\?\?\i\).content/, replace: "const textReplaceContent=$self.modifyIncomingMessage(arguments[2]?.contentMessage??arguments[1]);$1textReplaceContent" } }, diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts index be34e7a5a..e71dec0ad 100644 --- a/src/plugins/themeAttributes/index.ts +++ b/src/plugins/themeAttributes/index.ts @@ -40,10 +40,6 @@ export default definePlugin({ { find: "#{intl::LABEL_WITH_ONLINE_STATUS}", replacement: [ - { - match: /src:null!=\i\?(\i).{1,50}"aria-hidden":!0/, - replace: "$&,style:$self.getAvatarStyles($1)" - }, { match: /src:(\i)\?\?void 0.{1,50}"aria-hidden":!0/, replace: "$&,style:$self.getAvatarStyles($1)" diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx index 892c6147a..b71e93bfd 100644 --- a/src/plugins/typingTweaks/index.tsx +++ b/src/plugins/typingTweaks/index.tsx @@ -150,7 +150,7 @@ export default definePlugin({ ] }, { - find: "\"handleDismissInviteEducation\"", + find: "this.handleDismissInviteEducation", predicate: () => settings.store.amITyping, replacement: { match: /\i\.default\.getCurrentUser\(\)/, diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx index e6d008f5f..ee678ed2d 100644 --- a/src/plugins/viewIcons/index.tsx +++ b/src/plugins/viewIcons/index.tsx @@ -206,10 +206,6 @@ export default definePlugin({ { find: 'backgroundColor:"COMPLETE"', replacement: [ - { - match: /(overflow:"visible",.{0,125}?!1\),)style:{(?=.+?backgroundImage:null!=(\i)\?"url\("\.concat\(\2,)/, - replace: (_, rest, bannerSrc) => `${rest}onClick:()=>${bannerSrc}!=null&&$self.openBanner(${bannerSrc}),style:{cursor:${bannerSrc}!=null?"pointer":void 0,` - }, { match: /(overflow:"visible",.{0,125}?!1\),)style:{(?=.+?backgroundImage:null!=(\i)\?`url\(\$\{\2\}\))/, replace: (_, rest, bannerSrc) => `${rest}onClick:()=>${bannerSrc}!=null&&$self.openBanner(${bannerSrc}),style:{cursor:${bannerSrc}!=null?"pointer":void 0,` diff --git a/src/plugins/webScreenShareFixes.web/index.ts b/src/plugins/webScreenShareFixes.web/index.ts index 8eb2e6269..e7fbc178e 100644 --- a/src/plugins/webScreenShareFixes.web/index.ts +++ b/src/plugins/webScreenShareFixes.web/index.ts @@ -17,10 +17,6 @@ export default definePlugin({ { find: "x-google-max-bitrate", replacement: [ - { - match: /"x-google-max-bitrate=".concat\(\i\)/, - replace: '"x-google-max-bitrate=".concat("80_000")' - }, { match: /`x-google-max-bitrate=\$\{\i\}`/, replace: '"x-google-max-bitrate=80_000"' @@ -29,10 +25,6 @@ export default definePlugin({ match: ";level-asymmetry-allowed=1", replace: ";b=AS:800000;level-asymmetry-allowed=1" }, - { - match: /;usedtx=".concat\((\i)\?"0":"1"\)/, - replace: '$&.concat($1?";stereo=1;sprop-stereo=1":"")' - }, { match: /;usedtx=\$\{(\i)\?"0":"1"\}/, replace: '$&${$1?";stereo=1;sprop-stereo=1":""}'