From 00c968473e83e4ee83cdec1f134e67d24bbf4b5a Mon Sep 17 00:00:00 2001
From: sadan4 <117494111+sadan4@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:35:40 -0500
Subject: [PATCH 1/5] FavoriteEmojiFirst: Fix sorting emojis (#3074)

---
 src/plugins/favEmojiFirst/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/favEmojiFirst/index.ts b/src/plugins/favEmojiFirst/index.ts
index aa43a528..ebb89f7e 100644
--- a/src/plugins/favEmojiFirst/index.ts
+++ b/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)"
                 }

From 5f1c5fa370467b2f853df66a015ec904ad002397 Mon Sep 17 00:00:00 2001
From: Lumap <lumap@duck.com>
Date: Thu, 12 Dec 2024 23:40:44 +0100
Subject: [PATCH 2/5] AppleMusicRichPresence: Fix token fetching Regex (#3071)

---
 src/plugins/appleMusic.desktop/native.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/appleMusic.desktop/native.ts b/src/plugins/appleMusic.desktop/native.ts
index 7d69a85a..5a547997 100644
--- a/src/plugins/appleMusic.desktop/native.ts
+++ b/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;
 

From 40a8cf1a85510f2b4c302e84a52946f7d63fe86e Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:46:48 -0300
Subject: [PATCH 3/5] PinDMs: Fix duplicate channels

---
 src/plugins/pinDms/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/pinDms/index.tsx b/src/plugins/pinDms/index.tsx
index 620a615a..3246c441 100644
--- a/src/plugins/pinDms/index.tsx
+++ b/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/,
-                    replace: "($&-$self.categoryLen())"
+                    match: /(\.startsWith\("section-divider"\).+?return 1===)(\i)/,
+                    replace: "$1($2-$self.categoryLen())"
                 },
                 {
                     match: /"getRowHeight",\((\i),(\i)\)=>{/,

From 0a0bd6a7135ae1175d3e6721da58a431305cece5 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:36:16 -0300
Subject: [PATCH 4/5] NoTrack: Make hasClientMods return false

---
 src/plugins/_core/noTrack.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/plugins/_core/noTrack.ts b/src/plugins/_core/noTrack.ts
index 802e1c95..d552037f 100644
--- a/src/plugins/_core/noTrack.ts
+++ b/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;"
+            }
         }
     ],
 

From fc731bc6c8ed7784540edbe2c4ad7dfb28bbd188 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 14 Dec 2024 02:37:15 -0300
Subject: [PATCH 5/5] Bump to 1.10.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 967c0ccc..9ede8636 100644
--- a/package.json
+++ b/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": {