From 65d39dcf21ecbcb1d45fefd38eee55965668de4b Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 25 Oct 2023 14:56:43 +0100
Subject: [PATCH] ShowConnections, NoProfileThemes: Fix (#1854)

---
 src/plugins/noProfileThemes/index.ts  | 10 +++++-----
 src/plugins/showConnections/index.tsx | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/noProfileThemes/index.ts b/src/plugins/noProfileThemes/index.ts
index 97d195e3..c31f4283 100644
--- a/src/plugins/noProfileThemes/index.ts
+++ b/src/plugins/noProfileThemes/index.ts
@@ -34,19 +34,19 @@ export default definePlugin({
             }
         },
         {
-            find: "().avatarPositionPremiumNoBanner,default:",
+            find: ".avatarPositionPremiumNoBanner,default:",
             replacement: {
                 // premiumUserWithoutBanner: foo().avatarPositionPremiumNoBanner, default: foo().avatarPositionNormal
-                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\(\)\.(\i))/,
+                match: /\.avatarPositionPremiumNoBanner(?=,default:\i\.(\i))/,
                 // premiumUserWithoutBanner: foo().avatarPositionNormal...
                 replace: ".$1"
             }
         },
         {
-            find: ".hasThemeColors=function(){",
+            find: "hasThemeColors(){",
             replacement: {
-                match: /(?<=key:"canUsePremiumProfileCustomization",get:function\(\){return)/,
-                replace: " false;"
+                match: /get canUsePremiumProfileCustomization\(\){return /,
+                replace: "$&false &&"
             }
         }
     ]
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 1f6ef34e..948bdb83 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -32,7 +32,7 @@ import { User } from "discord-types/general";
 
 import { VerifiedIcon } from "./VerifiedIcon";
 
-const Section = LazyComponent(() => findByCode("().lastSection"));
+const Section = LazyComponent(() => findByCode(".lastSection]:"));
 const ThemeStore = findStoreLazy("ThemeStore");
 const platforms: { get(type: string): ConnectionPlatform; } = findByPropsLazy("isSupported", "getByUrl");
 const getTheme: (user: User, displayProfile: any) => any = findByCodeLazy(',"--profile-gradient-primary-color"');
@@ -74,12 +74,12 @@ interface ConnectionPlatform {
     icon: { lightSVG: string, darkSVG: string; };
 }
 
-const profilePopoutComponent = ErrorBoundary.wrap(e =>
-    <ConnectionsComponent id={e.user.id} theme={getTheme(e.user, e.displayProfile).profileTheme} />
+const profilePopoutComponent = ErrorBoundary.wrap(({ user, displayProfile }: { user: User, displayProfile; }) =>
+    <ConnectionsComponent id={user.id} theme={getTheme(user, displayProfile).profileTheme} />
 );
 
-const profilePanelComponent = ErrorBoundary.wrap(e =>
-    <ConnectionsComponent id={e.channel.recipients[0]} theme={ThemeStore.theme} />
+const profilePanelComponent = ErrorBoundary.wrap(({ id }: { id: string; }) =>
+    <ConnectionsComponent id={id} theme={ThemeStore.theme} />
 );
 
 function ConnectionsComponent({ id, theme }: { id: string, theme: string; }) {
@@ -175,18 +175,18 @@ export default definePlugin({
     authors: [Devs.TheKodeToad],
     patches: [
         {
-            find: ".Messages.BOT_PROFILE_SLASH_COMMANDS",
+            find: "{isUsingGuildBio:null!==(",
             replacement: {
-                match: /,theme:\i\}\)(?=,.{0,100}setNote:)/,
-                replace: "$&,$self.profilePopoutComponent(arguments[0])"
+                match: /,theme:\i\}\)(?=,.{0,150}setNote:)/,
+                replace: "$&,$self.profilePopoutComponent({ user: arguments[0].user, displayProfile: arguments[0].displayProfile })"
             }
         },
         {
             find: "\"Profile Panel: user cannot be undefined\"",
             replacement: {
                 // createElement(Divider, {}), createElement(NoteComponent)
-                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:/,
-                replace: "$self.profilePanelComponent(arguments[0]),$&"
+                match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,
+                replace: "$self.profilePanelComponent({ id: $1.recipients[0] }),$&"
             }
         }
     ],