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

src/plugins/betterFolders/index.tsx

@@ -185,7 +185,7 @@ export default definePlugin({
                 {
                     // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                     predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
-                    match: /(?<=\.wrapper,children:\[)/,
+                    match: /(?<=\.isExpanded\),children:\[)/,
                     replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
                 },
                 {

src/plugins/consoleJanitor/index.ts

@@ -66,6 +66,13 @@ export default definePlugin({
     },
 
     patches: [
+        {
+            find: "https://github.com/highlightjs/highlight.js/issues/2277",
+            replacement: {
+                match: /(?<=&&\()console.log\(`Deprecated.+?`\),/,
+                replace: ""
+            }
+        },
         {
             find: 'react-spring: The "interpolate" function',
             replacement: {

src/plugins/typingTweaks/index.tsx

@@ -91,34 +91,31 @@ export default definePlugin({
     name: "TypingTweaks",
     description: "Show avatars and role colours in the typing indicator",
     authors: [Devs.zt],
+    settings,
+
     patches: [
+        {
+            find: "#{intl::THREE_USERS_TYPING}",
+            replacement: [
+                {
                     // Style the indicator and add function call to modify the children before rendering
-        {
+                    match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i(?<=guildId:(\i).+?)/,
-            find: "getCooldownTextStyle",
+                    replace: "$self.mutateChildren($2,$1,$&),style:$self.TYPING_TEXT_STYLE"
-            replacement: {
-                match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i/,
-                replace: "$self.mutateChildren(this.props, $1, $&), style: $self.TYPING_TEXT_STYLE"
-            }
                 },
+                {
                     // Changes the indicator to keep the user object when creating the list of typing users
-        {
+                    match: /\.map\((\i)=>\i\.\i\.getName\(\i,\i\.id,\1\)\)/,
-            find: "getCooldownTextStyle",
+                    replace: ""
-            replacement: {
-                match: /(?<=map\(\i=>)\i\.\i\.getName\(\i,this\.props\.channel\.id,(\i)\)/,
-                replace: "$1"
-            }
                 },
+                {
                     // Adds the alternative formatting for several users typing
-        {
+                    match: /(,{a:(\i),b:(\i),c:\i}\):\i\.length>3&&\(\i=)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
-            find: "getCooldownTextStyle",
+                    replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`,
-            replacement: {
-                match: /(,{a:(\i),b:(\i),c:\i}\):)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
-                replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
-            },
                     predicate: () => settings.store.alternativeFormatting
                 }
+            ]
+        }
     ],
-    settings,
 
     TYPING_TEXT_STYLE: {
         display: "grid",