Merge branch 'main' of https://github.com/Vendicated/Vencord

Loukious · Nov 4, 2024 · 036e9f7 · 036e9f7
2 parents afd3bbc + 5216bcc
commit 036e9f7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
@@ -57,7 +57,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "Messages.ACTIVITY_SETTINGS",
+            find: ".SEARCH_NO_RESULTS&&0===",
             replacement: [
                 {
                     match: /(?<=section:(.{0,50})\.DIVIDER\}\))([,;])(?=.{0,200}(\i)\.push.{0,100}label:(\i)\.header)/,
@@ -148,13 +148,17 @@ export default definePlugin({
 
         if (!header) return;
 
-        const names = {
-            top: i18n.Messages.USER_SETTINGS,
-            aboveNitro: i18n.Messages.BILLING_SETTINGS,
-            belowNitro: i18n.Messages.APP_SETTINGS,
-            aboveActivity: i18n.Messages.ACTIVITY_SETTINGS
-        };
-        return header === names[settingsLocation];
+        try {
+            const names = {
+                top: i18n.Messages.USER_SETTINGS,
+                aboveNitro: i18n.Messages.BILLING_SETTINGS,
+                belowNitro: i18n.Messages.APP_SETTINGS,
+                aboveActivity: i18n.Messages.ACTIVITY_SETTINGS
+            };
+            return header === names[settingsLocation];
+        } catch {
+            return firstChild === "PREMIUM";
+        }
     },
 
     patchedSettings: new WeakSet(),

diff --git a/src/plugins/showHiddenChannels/index.tsx b/src/plugins/showHiddenChannels/index.tsx
@@ -103,7 +103,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Do not show confirmation to join a voice channel when already connected to another if clicking on a hidden voice channel
-                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return)/,
+                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return\()/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {

diff --git a/src/plugins/themeAttributes/index.ts b/src/plugins/themeAttributes/index.ts
@@ -55,6 +55,8 @@ export default definePlugin({
     ],
 
     getAvatarStyles(src: string) {
+        if (src.startsWith("data:")) return {};
+
         return Object.fromEntries(
             [128, 256, 512, 1024, 2048, 4096].map(size => [
                 `--avatar-url-${size}`,