From 0bebc85b0dc08c9345210499dc9d24dd14c64ac0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 20 Apr 2024 11:50:28 +0200
Subject: [PATCH] fix FriendsSince on canary

---
 src/plugins/friendsSince/index.tsx | 16 +++++++++++++---
 src/webpack/webpack.ts             |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index dd37137a4..69d8e739d 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -7,12 +7,22 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
+import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
-import { findByPropsLazy } from "@webpack";
+import { filters, find, findByPropsLazy, handleModuleNotFound } from "@webpack";
 import { React, RelationshipStore } from "@webpack/common";
 
 const { Heading, Text } = findByPropsLazy("Heading", "Text");
-const container = findByPropsLazy("memberSinceContainer");
+// Workaround for module differing on stable & canary
+// FIXME: remove once merged into stable
+const getMemberSinceContainer = makeLazy(() => {
+    for (const name of ["memberSinceWrapper", "memberSinceContainer"]) {
+        const mod = find(filters.byProps(name), { isIndirect: true });
+        if (mod) return mod[name];
+    }
+    handleModuleNotFound("findByProps", "memberSinceWrapper/memberSinceContainer");
+    return "";
+});
 const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
 const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
 const locale = findByPropsLazy("getLocale");
@@ -49,7 +59,7 @@ export default definePlugin({
                     Friends Since
                 </Heading>
 
-                <div className={container.memberSinceContainer}>
+                <div className={getMemberSinceContainer()}>
                     {!!getCurrentChannel()?.guild_id && (
                         <svg
                             aria-hidden="true"
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 10c7d7ee1..564da4813 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -92,7 +92,7 @@ if (IS_DEV && IS_DISCORD_DESKTOP) {
     }, 0);
 }
 
-function handleModuleNotFound(method: string, ...filter: unknown[]) {
+export function handleModuleNotFound(method: string, ...filter: unknown[]) {
     const err = new Error(`webpack.${method} found no module`);
     logger.error(err, "Filter:", filter);