Merge remote-tracking branch 'upstream/dev' into dev

src/plugins/anonymiseFileNames/index.tsx

@@ -79,18 +79,17 @@ export default definePlugin({
 
     patches: [
         {
-            find: 'type:"UPLOAD_START"',
-            replacement: {
-                match: /await \i\.uploadFiles\((\i),/,
-                replace: "$1.forEach($self.anonymise),$&"
-            },
-        },
-        {
-            find: "FirstThreadMessage,options",
-            replacement: {
-                match: /\i.uploadFilesSimple\((\i)\);/,
-                replace: "$&$1.forEach($self.anonymise);"
-            }
+            find: "async uploadFiles(",
+            replacement: [
+                {
+                    match: /async uploadFiles\((\i),\i\){/,
+                    replace: "$&$1.forEach($self.anonymise);"
+                },
+                {
+                    match: /async uploadFilesSimple\((\i)\){/,
+                    replace: "$&$1.forEach($self.anonymise);"
+                }
+            ],
         },
         {
             find: "#{intl::ATTACHMENT_UTILITIES_SPOILER}",

src/plugins/mutualGroupDMs/index.tsx

@@ -121,14 +121,9 @@ export default definePlugin({
                 },
                 // Make the gap between each item smaller so our tab can fit.
                 {
-                    match: /className:\i\.tabBar/,
-                    replace: '$& + " vc-mutual-gdms-modal-v2-tab-bar"'
+                    match: /type:"top",/,
+                    replace: '$&className:"vc-mutual-gdms-modal-v2-tab-bar",'
                 },
-                // Make the tab bar item text smaller so our tab can fit.
-                {
-                    match: /(\.tabBarItem.+?variant:)"heading-md\/normal"/,
-                    replace: '$1"heading-sm/normal"'
-                }
             ]
         },
         {

src/plugins/mutualGroupDMs/style.css

@@ -3,5 +3,5 @@
 }
 
 .vc-mutual-gdms-modal-v2-tab-bar {
-    gap: 12px;
+    --space-xl: 16px;
 }

src/plugins/showHiddenChannels/index.tsx

@@ -530,6 +530,7 @@ export default definePlugin({
 
             if (channel.channelId != null) channel = ChannelStore.getChannel(channel.channelId);
             if (channel == null || channel.isDM() || channel.isGroupDM() || channel.isMultiUserDM()) return false;
+            if (["browse", "customize", "guide"].includes(channel.id)) return false;
 
             return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || checkConnect && !PermissionStore.can(PermissionsBits.CONNECT, channel);
         } catch (e) {

src/plugins/webContextMenus.web/index.ts

@@ -132,10 +132,16 @@ export default definePlugin({
 
         {
             find: "Copy image not supported",
-            replacement: {
-                match: /(?<=canSaveImage\((\i,\i)?\)\{.{0,150})!\i\.isPlatformEmbedded/g,
-                replace: "false"
-            }
+            replacement: [
+                {
+                    match: /(?<=(?:canSaveImage|canCopyImage)\(.{0,120}?)!\i\.isPlatformEmbedded/g,
+                    replace: "false"
+                },
+                {
+                    match: /canCopyImage\(.+?(?=return"function"==typeof \i\.clipboard\.copyImage)/,
+                    replace: "$&return true;"
+                }
+            ]
         },
         // Add back Copy & Save Image
         {
@@ -147,7 +153,7 @@ export default definePlugin({
                     replace: "false"
                 },
                 {
-                    match: /return\s*?\[.{0,50}?\)(?=\?.{0,100}?id:"copy-image")/,
+                    match: /return\s*?\[.{0,50}?(?=\?\(0,\i\.jsxs?.{0,100}?id:"copy-image")/,
                     replace: "return [true"
                 },
                 {

src/utils/constants.ts

@@ -606,6 +606,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "samsam",
         id: 836452332387565589n,
     },
+    Cootshk: {
+        name: "Cootshk",
+        id: 921605971577548820n
+    },
 } satisfies Record<string, Dev>);
 
 export const EquicordDevs = Object.freeze({