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

verticalsync · Jul 25, 2024 · 7643f25 · 7643f25
2 parents f445680 + bc80185
commit 7643f25
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/plugins/clientTheme/index.tsx b/src/plugins/clientTheme/index.tsx
@@ -30,7 +30,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
@@ -171,7 +171,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
@@ -189,7 +189,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
@@ -610,6 +610,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         name: "Fafa",
         id: 428188716641812481n,
     },
+    Joona: {
+        name: "Joona",
+        id: 297410829589020673n,
+    },
 } satisfies Record<string, Dev>);
 
 export const SuncordDevs = /* #__PURE__*/ Object.freeze({