diff --git a/src/plugins/memberCount/index.tsx b/src/plugins/memberCount/index.tsx index f507d2b0d..83c4f85ef 100644 --- a/src/plugins/memberCount/index.tsx +++ b/src/plugins/memberCount/index.tsx @@ -71,7 +71,7 @@ export default definePlugin({ replacement: [ { match: /children:\[(\i\.useMemo[^}]+"aria-multiselectable")(?<=className:(\i),.+?)/, - replace: "children:[$1?.includes('members')?$self.render():null,$2", + replace: "children:[$2?.includes('members')?$self.render():null,$1", }, ], predicate: () => settings.store.memberList diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx index cbdf737d3..00d57e3a7 100644 --- a/src/plugins/mutualGroupDMs/index.tsx +++ b/src/plugins/mutualGroupDMs/index.tsx @@ -119,7 +119,7 @@ export default definePlugin({ replace: "$&$self.pushSection($1,arguments[0].user);" }, { - match: /className:\i\.\i,children:(?=.{0,100}?component:.*?section:(\i))/, + match: /children:(?=.{0,100}?component:.+?section:(\i))/, replace: "$&$1==='MUTUAL_GDMS'?$self.renderMutualGDMs(arguments[0]):" }, // Make the gap between each item smaller so our tab can fit. @@ -137,7 +137,7 @@ export default definePlugin({ replace: "$&||$self.getMutualGroupDms(arguments[0].user.id).length>0" }, { - match: /\.openUserProfileModal.+?\)}\)}\)(?<=,(\i)&&(\i)&&(\(0,\i\.jsxs?\)\(\i\.\i,{className:(\i)\.\i\}\)).{0,50}"MUTUAL_FRIENDS".+?)/, + match: /\.openUserProfileModal.+?\)}\)}\)(?<=,(\i)&&(\i)&&(\(0,\i\.jsxs?\)\(\i\.\i,{className:(\i)\.\i}\)).{0,50}?"MUTUAL_FRIENDS".+?)/, replace: (m, hasMutualGuilds, hasMutualFriends, Divider, classes) => "" + `${m},$self.renderDMPageList({user:arguments[0].user,hasDivider:${hasMutualGuilds}||${hasMutualFriends},Divider:${Divider},listStyle:${classes}.list})` } diff --git a/src/plugins/pictureInPicture/index.tsx b/src/plugins/pictureInPicture/index.tsx index d5bf3fee5..2fd44f979 100644 --- a/src/plugins/pictureInPicture/index.tsx +++ b/src/plugins/pictureInPicture/index.tsx @@ -30,7 +30,7 @@ export default definePlugin({ { find: '["VIDEO","CLIP","AUDIO"]', replacement: { - match: /("div",{className:.+?children:)(\i.slice\(\i\))(?<=showDownload:(\i).+?isVisualMediaType:(\i).+?)/, + match: /(\[\i>0&&\i\.length>0.+?children:)(\i.slice\(\i\))(?<=showDownload:(\i).+?isVisualMediaType:(\i).+?)/, replace: (_, rest, origChildren, showDownload, isVisualMediaType) => `${rest}[${showDownload}&&${isVisualMediaType}&&$self.PictureInPictureButton(),...${origChildren}]` } } diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx index cf59e5455..e5c6d5159 100644 --- a/src/plugins/pinDms/index.tsx +++ b/src/plugins/pinDms/index.tsx @@ -72,7 +72,7 @@ export default definePlugin({ patches: [ { - find: '"no-private-channels"', + find: '"private-channels-".concat(', replacement: [ { // Filter out pinned channels from the private channel list @@ -95,8 +95,8 @@ export default definePlugin({ replace: "$&if($self.isCategoryIndex($1.section))return $self.renderCategory($1);" }, { - match: /(?<=span",{)className:\i\.\i,(?=children:\i.)/, - replace: "...$self.makeSpanProps(),$&" + match: /"renderSection".+?"span",{/, + replace: "$&...$self.makeSpanProps()," }, // Fix Row Height diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 24c837913..96442cffa 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -155,7 +155,7 @@ export default definePlugin({ { find: ".SEND_FAILED,", replacement: { - match: /(?<=\i\.\i\]:(\i)\.isUnsupported\}\),)(?=children:\[)/, + match: /(?<=\]:(\i)\.isUnsupported.+?,)(?=children:\[)/, replace: "style:$self.useMessageColorsStyle($1)," }, predicate: () => settings.store.colorChatMessages