From 5936e74e7f4f037e380237f58f58054aa3dd5ccf Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 19 Jun 2024 04:43:21 +0200
Subject: [PATCH] Fix ImplicitRelationships

---
 src/plugins/implicitRelationships/index.ts | 14 ++++----------
 src/webpack/common/types/utils.d.ts        |  1 +
 src/webpack/common/utils.ts                |  3 ++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 4faad2a9..7fefb39b 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -19,17 +19,11 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByPropsLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
+import { findStoreLazy } from "@webpack";
+import { ChannelStore, Constants, FluxDispatcher, GuildStore, RelationshipStore, SnowflakeUtils, UserStore } from "@webpack/common";
 import { Settings } from "Vencord";
 
 const UserAffinitiesStore = findStoreLazy("UserAffinitiesStore");
-const { FriendsSections } = findByPropsLazy("FriendsSections");
-
-interface UserAffinity {
-    user_id: string;
-    affinity: number;
-}
 
 export default definePlugin({
     name: "ImplicitRelationships",
@@ -70,7 +64,7 @@ export default definePlugin({
         },
         // Piggyback relationship fetch
         {
-            find: ".fetchRelationships()",
+            find: '"FriendsStore',
             replacement: {
                 match: /(\i\.\i)\.fetchRelationships\(\)/,
                 // This relationship fetch is actually completely useless, but whatevs
@@ -182,6 +176,6 @@ export default definePlugin({
     },
 
     start() {
-        FriendsSections.IMPLICIT = "IMPLICIT";
+        Constants.FriendsSections.IMPLICIT = "IMPLICIT";
     }
 });
diff --git a/src/webpack/common/types/utils.d.ts b/src/webpack/common/types/utils.d.ts
index 166a25fe..1cd2bf69 100644
--- a/src/webpack/common/types/utils.d.ts
+++ b/src/webpack/common/types/utils.d.ts
@@ -219,4 +219,5 @@ export interface IconUtils {
 export interface Constants {
     Endpoints: Record<string, any>;
     UserFlags: Record<string, number>;
+    FriendsSections: Record<string, string>;
 }
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index dd78dc4e..bb634455 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -40,7 +40,8 @@ waitFor(["dispatchToLastSubscribed"], m => ComponentDispatch = m);
 
 export const Constants: t.Constants = mapMangledModuleLazy('ME:"/users/@me"', {
     Endpoints: filters.byProps("USER", "ME"),
-    UserFlags: filters.byProps("STAFF", "SPAMMER")
+    UserFlags: filters.byProps("STAFF", "SPAMMER"),
+    FriendsSections: m => m.PENDING === "PENDING" && m.ADD_FRIEND
 });
 
 export const RestAPI: t.RestAPI = findLazy(m => typeof m === "object" && m.del && m.put);