Merge branch 'dev' into discord-types

Vendicated · Jul 26, 2024 · f27bc4e · f27bc4e
2 parents 41cd19a + 5e9a9fe
commit f27bc4e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.9.5",
+    "version": "1.9.6",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
@@ -32,7 +32,7 @@ function onPickColor(color: number) {
     updateColorVars(hexColor);
 }
 
-const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE",settings:{useSystemTheme:"system"===');
+const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE', '"system"===');
 
 function setTheme(theme: string) {
     saveClientTheme({ theme });

diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
@@ -172,7 +172,7 @@ export default definePlugin({
             find: ".handleImageLoad)",
             replacement: [
                 {
-                    match: /placeholderVersion:\i,/,
+                    match: /placeholderVersion:\i,(?=.{0,50}children:)/,
                     replace: "...$self.makeProps(this),$&"
                 },
 

diff --git a/src/plugins/spotifyControls/index.tsx b/src/plugins/spotifyControls/index.tsx
@@ -48,7 +48,7 @@ export default definePlugin({
     },
     patches: [
         {
-            find: '"AccountConnected"',
+            find: "this.isCopiedStreakGodlike",
             replacement: {
                 // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
                 match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/,

diff --git a/src/plugins/viewIcons/index.tsx b/src/plugins/viewIcons/index.tsx
@@ -190,7 +190,8 @@ export default definePlugin({
             replacement: {
                 match: /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/,
                 replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
-            }
+            },
+            all: true
         },
         // Old Profiles Modal pfp
         {

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -533,7 +533,11 @@ export const Devs = /* #__PURE__*/ Object.freeze({
     Antti: {
         name: "Antti",
         id: 312974985876471810n
-    }
+    },
+    Joona: {
+        name: "Joona",
+        id: 297410829589020673n
+    },
 } satisfies Record<string, Dev>);
 
 // iife so #__PURE__ works correctly