Merge remote-tracking branch 'upstream/main'

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.10.8",
+    "version": "1.10.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

src/plugins/_core/noTrack.ts

@@ -59,6 +59,14 @@ export default definePlugin({
                     replace: "$&return;"
                 }
             ]
+        },
+        {
+            find: ".BetterDiscord||null!=",
+            replacement: {
+                // Make hasClientMods return false
+                match: /(?=let \i=window;)/,
+                replace: "return false;"
+            }
         }
     ],
 

src/plugins/appleMusic.desktop/native.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { canonicalizeMatch } from "@utils/patches";
 import { execFile } from "child_process";
 import { promisify } from "util";
 
@@ -26,7 +27,7 @@ interface RemoteData {
 let cachedRemoteData: { id: string, data: RemoteData; } | { id: string, failures: number; } | null = null;
 
 const APPLE_MUSIC_BUNDLE_REGEX = /<script type="module" crossorigin src="([a-zA-Z0-9.\-/]+)"><\/script>/;
-const APPLE_MUSIC_TOKEN_REGEX = /\w+="([A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*)",\w+="x-apple-jingle-correlation-key"/;
+const APPLE_MUSIC_TOKEN_REGEX = canonicalizeMatch(/Promise.allSettled\(\i\)\}const \i="([A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*)"/);
 
 let cachedToken: string | undefined = undefined;
 

src/plugins/favEmojiFirst/index.ts

@@ -57,7 +57,7 @@ export default definePlugin({
                 {
                     // https://regex101.com/r/x2mobQ/1
                     // searchEmojis(...,maxCount: stuff) ... endEmojis = emojis.slice(0, maxCount - gifResults.length)
-                    match: /,maxCount:(\i)(.{1,500}\i)=(\i)\.slice\(0,(Math\.max\(\i,\i(?:-\i\.length){2})\)/,
+                    match: /,maxCount:(\i)(.{1,500}\i)=(\i)\.slice\(0,(Math\.max\(\i,\i(?:-\i\.length){2}\))\)/,
                     // ,maxCount:Infinity ... endEmojis = (emojis.sliceTo = n, emojis)
                     replace: ",maxCount:Infinity$2=($3.sliceTo = $4, $3)"
                 }

src/plugins/pinDms/index.tsx

@@ -71,7 +71,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Filter out pinned channels from the private channel list
-                    match: /(?<=\i,{channels:\i,)privateChannelIds:(\i)/,
+                    match: /(?<=channels:\i,)privateChannelIds:(\i)(?=,listRef:)/,
                     replace: "privateChannelIds:$1.filter(c=>!$self.isPinned(c))"
                 },
                 {
@@ -96,8 +96,8 @@ export default definePlugin({
 
                 // Fix Row Height
                 {
-                    match: /(?<="getRowHeight",.{1,100}return 1===)\i/,
+                    match: /(\.startsWith\("section-divider"\).+?return 1===)(\i)/,
-                    replace: "($&-$self.categoryLen())"
+                    replace: "$1($2-$self.categoryLen())"
                 },
                 {
                     match: /"getRowHeight",\((\i),(\i)\)=>{/,