Merge branch 'main' into main

src/plugins/ctrlEnterSend/index.ts

@@ -39,6 +39,15 @@ export default definePlugin({
         }
     }),
     patches: [
+        // Only one of the two patches will be at effect; Discord often updates to switch between them.
+        // See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
+        {
+            find: ".ENTER&&(!",
+            replacement: {
+                match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
+                replace: "$self.shouldSubmit($1, $2)"
+            }
+        },
         {
             find: "!this.hasOpenCodeBlock()",
             replacement: {

src/plugins/experiments/index.tsx

@@ -88,8 +88,8 @@ export default definePlugin({
         {
             find: "useCanFavoriteChannel",
             replacement: {
-                match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
+                match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
-                replace: "true",
+                replace: "false",
             }
         }
     ],

src/plugins/friendsSince/index.tsx

@@ -17,7 +17,7 @@ const container = findByPropsLazy("memberSince");
 const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
 const locale = findByPropsLazy("getLocale");
 const lastSection = findByPropsLazy("lastSection");
-const section = findLazy((m: any) => m.section !== void 0 && Object.values(m).length === 1);
+const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
 
 export default definePlugin({
     name: "FriendsSince",

src/plugins/moreUserTags/index.tsx

@@ -256,6 +256,7 @@ export default definePlugin({
         // in profiles
         {
             find: ",overrideDiscriminator:",
+            group: true,
             replacement: [
                 {
                     // prevent channel id from getting ghosted
@@ -263,7 +264,7 @@ export default definePlugin({
                     match: /user:\i,nick:\i,/,
                     replace: "$&moreTags_channelId,"
                 }, {
-                    match: /,botType:(\i\((\i)\)),/g,
+                    match: /,botType:(\i),(?<=user:(\i).+?)/g,
                     replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
                 }
             ]

src/plugins/viewIcons/index.tsx

@@ -183,14 +183,24 @@ export default definePlugin({
     },
 
     patches: [
-        // Profiles Modal pfp
+        // Avatar component used in User DMs "User Profile" popup in the right and Profiles Modal pfp
-        ...[".MODAL,hasProfileEffect", ".FULL_SIZE,hasProfileEffect:"].map(find => ({
+        {
-            find,
+            find: ".overlay:void 0,status:",
+            replacement: [
+                ...[/"PRESS_VIEW_PROFILE".+?(?=children:)(?<=avatarSrc:(\i).+?)/, /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/].map(match => ({
+                    match,
+                    replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
+                }))
+            ]
+        },
+        // Old Profiles Modal pfp
+        {
+            find: ".MODAL,hasProfileEffect",
             replacement: {
                 match: /\{src:(\i)(?=,avatarDecoration)/,
                 replace: "{src:$1,onClick:()=>$self.openImage($1)"
             }
-        })),
+        },
         // Banners
         ...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
             find,
@@ -202,7 +212,7 @@ export default definePlugin({
                     'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
             }
         })),
-        // User DMs "User Profile" popup in the right
+        // Old User DMs "User Profile" popup in the right
         {
             find: ".avatarPositionPanel",
             replacement: {
@@ -210,14 +220,6 @@ export default definePlugin({
                 replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
             }
         },
-        {
-            find: ".canUsePremiumProfileCustomization,{avatarSrc:",
-            replacement: {
-                match: /\.avatar,\i\.clickable\),onClick:\i,(?<=avatarSrc:(\i).+?)/,
-                replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
-
-            }
-        },
         // Group DMs top small & large icon
         {
             find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,