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

src/plugins/consoleJanitor/index.ts

@@ -158,13 +158,6 @@ export default definePlugin({
                 replace: ""
             }
         },
-        {
-            find: "[DEPRECATED] `context` will be removed in a future version. Instead use `import { createStore, useStore } from 'zustand'`. See: https://github.com/pmndrs/zustand/discussions/1180.",
-            replacement: {
-                match: /console\.warn\("\[DEPRECATED\] `context` will be removed in a future version\. Instead use `import { createStore, useStore } from 'zustand'`\. See: https:\/\/github\.com\/pmndrs\/zustand\/discussions\/1180\."\);/,
-                replace: ""
-            }
-        },
         // Patches discords generic logger function
         {
             find: "Σ:",

src/plugins/noMosaic/index.ts

@@ -20,7 +20,7 @@ const settings = definePluginSettings({
 export default definePlugin({
     name: "NoMosaic",
     authors: [Devs.AutumnVN],
-    description: "Removes Discord new image mosaic",
+    description: "Removes Discord image mosaic",
     tags: ["image", "mosaic", "media"],
 
     settings,
@@ -29,8 +29,8 @@ export default definePlugin({
         {
             find: '=>"IMAGE"===',
             replacement: {
-                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i;/,
+                match: /=>"IMAGE"===\i\|\|"VIDEO"===\i(?:\|\|("VISUAL_PLACEHOLDER"===\i))?;/,
-                replace: "=>false;"
+                replace: (_, visualPlaceholderPred) => visualPlaceholderPred != null ? `=>${visualPlaceholderPred};` : "=>false;"
             }
         },
         {

src/plugins/viewIcons/index.tsx

@@ -209,10 +209,11 @@ export default definePlugin({
         },
         // Group DMs top small & large icon
         {
-            find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
+            find: '["aria-hidden"],"aria-label":',
             replacement: {
                 match: /null==\i\.icon\?.+?src:(\(0,\i\.\i\).+?\))(?=[,}])/,
-                replace: (m, iconUrl) => `${m},onClick:()=>$self.openAvatar(${iconUrl})`
+                // We have to check that icon is not an unread GDM in the server bar
+                replace: (m, iconUrl) => `${m},onClick:()=>arguments[0]?.size!=="SIZE_48"&&$self.openAvatar(${iconUrl})`
             }
         },
         // User DMs top small icon