Fix plugins broken by latest Discord update (#3237)

src/plugins/_api/dynamicImageModalApi.ts

@@ -16,8 +16,8 @@ export default definePlugin({
         {
             find: "SCALE_DOWN:",
             replacement: {
-                match: /!\(null==(\i)\|\|0===\i\|\|null==(\i)\|\|0===\i\)/,
+                match: /(?<="IMAGE"===\i\?)\i(?=\?)/,
-                replace: (_, width, height) => `!((null == ${width} || 0 === ${width}) && (null == ${height} || 0 === ${height}))`
+                replace: "true"
             }
         }
     ]

src/plugins/betterUploadButton/index.ts

@@ -26,10 +26,18 @@ export default definePlugin({
     patches: [
         {
             find: '"ChannelAttachButton"',
-            replacement: {
+            replacement: [
-                match: /\.attachButtonInner,"aria-label":.{0,50},onDoubleClick:(.+?:void 0),.{0,30}?\.\.\.(\i),/,
+                {
-                replace: "$&onClick:$1,onContextMenu:$2.onClick,",
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-            },
+                    match: /\.attachButtonInner,"aria-label":.{0,50},onDoubleClick:(.+?:void 0),.{0,30}?\.\.\.(\i),/,
+                    replace: "$&onClick:$1,onContextMenu:$2.onClick,",
+                    noWarn: true
+                },
+                {
+                    match: /\.attachButtonInner,"aria-label":.{0,50},onDoubleClick:(.+?:void 0),.{0,100}\},(\i)\).{0,100}children:\i/,
+                    replace: "$&,onClick:$1,onContextMenu:$2.onClick,",
+                },
+            ]
         },
     ],
 });

src/plugins/decor/index.tsx

@@ -50,12 +50,24 @@ export default definePlugin({
             find: ".decorationGridItem,",
             replacement: [
                 {
-                    match: /(?<==)\i=>{let{children.{20,100}decorationGridItem/,
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-                    replace: "$self.DecorationGridItem=$&"
+                    match: /(?<==)\i=>{let{children.{20,200}decorationGridItem/,
+                    replace: "$self.DecorationGridItem=$&",
+                    noWarn: true
                 },
                 {
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
                     match: /(?<==)\i=>{let{user:\i,avatarDecoration/,
-                    replace: "$self.DecorationGridDecoration=$&"
+                    replace: "$self.DecorationGridDecoration=$&",
+                    noWarn: true
+                },
+                {
+                    match: /(?<==)\i=>{var{children.{20,200}decorationGridItem/,
+                    replace: "$self.DecorationGridItem=$&",
+                },
+                {
+                    match: /(?<==)\i=>{var{user:\i,avatarDecoration/,
+                    replace: "$self.DecorationGridDecoration=$&",
                 },
                 // Remove NEW label from decor avatar decorations
                 {

src/plugins/implicitRelationships/index.ts

@@ -34,7 +34,7 @@ export default definePlugin({
         {
             find: "#{intl::FRIENDS_ALL_HEADER}",
             replacement: {
-                match: /toString\(\)\}\);case (\i\.\i)\.BLOCKED/,
+                match: /toString\(\)\}\);case (\i\.\i)\.PENDING/,
                 replace: 'toString()});case $1.IMPLICIT:return "Implicit — "+arguments[1];case $1.BLOCKED'
             },
         },
@@ -50,7 +50,7 @@ export default definePlugin({
         {
             find: "#{intl::FRIENDS_SECTION_ONLINE}",
             replacement: {
-                match: /,{id:(\i\.\i)\.BLOCKED,show:.+?className:(\i\.item)/,
+                match: /,{id:(\i\.\i)\.PENDING,show:.+?className:(\i\.item)/,
                 replace: (rest, relationShipTypes, className) => `,{id:${relationShipTypes}.IMPLICIT,show:true,className:${className},content:"Implicit"}${rest}`
             }
         },
@@ -58,7 +58,7 @@ export default definePlugin({
         {
             find: '"FriendsStore"',
             replacement: {
-                match: /(?<=case (\i\.\i)\.BLOCKED:return (\i)\.type===\i\.\i\.BLOCKED)/,
+                match: /(?<=case (\i\.\i)\.SUGGESTIONS:return \d+===(\i)\.type)/,
                 replace: ";case $1.IMPLICIT:return $2.type===5"
             },
         },

src/plugins/memberCount/index.tsx

@@ -65,10 +65,18 @@ export default definePlugin({
     patches: [
         {
             find: "{isSidebarVisible:",
-            replacement: {
+            replacement: [
-                match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
+                {
-                replace: ":[$1?.startsWith('members')?$self.render():null,$2"
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-            },
+                    match: /(?<=let\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
+                    replace: ":[$1?.startsWith('members')?$self.render():null,$2",
+                    noWarn: true
+                },
+                {
+                    match: /(?<=var\{className:(\i),.+?children):\[(\i\.useMemo[^}]+"aria-multiselectable")/,
+                    replace: ":[$1?.startsWith('members')?$self.render():null,$2",
+                },
+            ],
             predicate: () => settings.store.memberList
         },
         {

src/plugins/roleColorEverywhere/index.tsx

@@ -84,8 +84,14 @@ export default definePlugin({
             find: ".USER_MENTION)",
             replacement: [
                 {
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
                     match: /onContextMenu:\i,color:\i,\.\.\.\i(?=,children:)(?<=user:(\i),channel:(\i).{0,500}?)/,
-                    replace: "$&,color:$self.getColorInt($1?.id,$2?.id)"
+                    replace: "$&,color:$self.getColorInt($1?.id,$2?.id)",
+                    noWarn: true
+                },
+                {
+                    match: /(?<=onContextMenu:\i,color:)\i(?=\},\i\),\{children)(?<=user:(\i),channel:(\i).{0,500}?)/,
+                    replace: "$self.getColorInt($1?.id,$2?.id)",
                 }
             ],
             predicate: () => settings.store.chatMentions

src/plugins/showHiddenChannels/index.tsx

@@ -204,7 +204,7 @@ export default definePlugin({
                 {
                     // Hide unreads
                     predicate: () => settings.store.hideUnreads === true,
-                    match: /{channel:(\i),name:\i,.+?unread:(\i).+?;/,
+                    match: /\.subtitle,.+?;(?=return\(0,\i\.jsxs?\))(?<={channel:(\i),name:\i,.+?unread:(\i).+?)/,
                     replace: (m, channel, unread) => `${m}${unread}=$self.isHiddenChannel(${channel})?false:${unread};`
                 }
             ]
@@ -485,7 +485,7 @@ export default definePlugin({
             }
         },
         {
-            find: '="NowPlayingViewStore",',
+            find: '"NowPlayingViewStore"',
             replacement: {
                 // Make active now voice states on hidden channels
                 match: /(getVoiceStateForUser.{0,150}?)&&\i\.\i\.canWithPartialContext.{0,20}VIEW_CHANNEL.+?}\)(?=\?)/,

src/plugins/startupTimings/index.tsx

@@ -27,12 +27,22 @@ export default definePlugin({
     authors: [Devs.Megu],
     patches: [{
         find: "#{intl::ACTIVITY_SETTINGS}",
-        replacement: {
+        replacement: [
-            match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\)}\))/,
+            {
-            replace: (_, commaOrSemi, settings, elements) => "" +
+                // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-                `${commaOrSemi}${settings}?.[0]==="CHANGELOG"` +
+                match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\)}\))/,
-                `&&${elements}.push({section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage})`
+                replace: (_, commaOrSemi, settings, elements) => "" +
-        }
+                    `${commaOrSemi}${settings}?.[0]==="CHANGELOG"` +
+                    `&&${elements}.push({section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage})`,
+                noWarn: true
+            },
+            {
+                match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+\)\)\}\))(?=\)\})/,
+                replace: (_, commaOrSemi, settings, elements) => "" +
+                    `${commaOrSemi}${settings}?.[0]==="CHANGELOG"` +
+                    `&&${elements}.push({section:"StartupTimings",label:"Startup Timings",element:$self.StartupTimingPage})`,
+            },
+        ]
     }],
     StartupTimingPage
 });

src/plugins/userMessagesPronouns/index.ts

@@ -41,11 +41,20 @@ export default definePlugin({
         },
         {
             find: '="SYSTEM_TAG"',
-            replacement: {
+            replacement: [
-                // Add next to username (compact mode)
+                {
-                match: /className:\i\(\)\(\i\.className(?:,\i\.clickable)?,\i\)}\),(?=\i)/g,
+                    // Add next to username (compact mode)
-                replace: "$&$self.CompactPronounsChatComponentWrapper(arguments[0]),"
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-            }
+                    match: /className:\i\(\)\(\i\.className(?:,\i\.clickable)?,\i\)}\),(?=\i)/g,
+                    replace: "$&$self.CompactPronounsChatComponentWrapper(arguments[0]),",
+                    noWarn: true
+                },
+                {
+                    // Add next to username (compact mode)
+                    match: /className:\i\(\)\(\i\.className(?:,\i\.clickable)?,\i\)}\)\),(?=\i)/g,
+                    replace: "$&$self.CompactPronounsChatComponentWrapper(arguments[0]),",
+                },
+            ]
         }
     ],
 

src/plugins/viewIcons/index.tsx

@@ -193,10 +193,18 @@ export default definePlugin({
         // Avatar component used in User DMs "User Profile" popup in the right and Profiles Modal pfp
         {
             find: ".overlay:void 0,status:",
-            replacement: {
+            replacement: [
-                match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
+                {
-                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openAvatar($1)},"
+                    // FIXME(Bundler spread transform related): Remove old compatiblity once enough time has passed, if they don't revert
-            },
+                    match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
+                    replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openAvatar($1)},",
+                    noWarn: true
+                },
+                {
+                    match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",.{0,100}className:\i,/,
+                    replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openAvatar($1)},",
+                }
+            ],
             all: true
         },
         // Banners

src/utils/lazy.ts

@@ -20,9 +20,9 @@ export function makeLazy<T>(factory: () => T, attempts = 5): () => T {
     let tries = 0;
     let cache: T;
     return () => {
-        if (!cache && attempts > tries++) {
+        if (cache === undefined && attempts > tries++) {
             cache = factory();
-            if (!cache && attempts === tries)
+            if (cache === undefined && attempts === tries)
                 console.error("Lazy factory failed:", factory);
         }
         return cache;

src/webpack/common/components.ts

@@ -41,7 +41,7 @@ export const Switch = waitForComponent<t.Switch>("Switch", filters.componentByCo
 
 const Tooltips = mapMangledModuleLazy(".tooltipTop,bottom:", {
     Tooltip: filters.componentByCode("this.renderTooltip()]"),
-    TooltipContainer: filters.componentByCode('="div",')
+    TooltipContainer: filters.componentByCode('="div"')
 }) as {
     Tooltip: t.Tooltip,
     TooltipContainer: t.TooltipContainer;