Merge branch 'immediate-finds' into immediate-finds-modules-proxy

package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.8.8",
+    "version": "1.8.9",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {

src/debug/runReporter.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { SYM_LAZY_COMPONENT_INNER } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
 import { SYM_PROXY_INNER_GET, SYM_PROXY_INNER_VALUE } from "@utils/proxyInner";
 import * as Webpack from "@webpack";
@@ -81,8 +82,8 @@ async function runReporter() {
                                 result = findResult[SYM_PROXY_INNER_VALUE];
                             }
 
-                            if (findResult.$$vencordInner != null) {
+                            if (findResult[SYM_LAZY_COMPONENT_INNER] != null) {
-                                result = findResult.$$vencordInner();
+                                result = findResult[SYM_LAZY_COMPONENT_INNER]();
                             }
                         }
 

src/plugins/experiments/index.tsx

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { definePluginSettings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { ErrorCard } from "@components/ErrorCard";
 import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
 import { findByProps } from "@webpack";
 import { Forms, React } from "@webpack/common";
 
@@ -29,6 +30,15 @@ import hideBugReport from "./hideBugReport.css?managed";
 
 const KbdStyles = findByProps("key", "removeBuildOverride");
 
+const settings = definePluginSettings({
+    toolbarDevMenu: {
+        type: OptionType.BOOLEAN,
+        description: "Change the Help (?) toolbar button (top right in chat) to Discord's developer menu",
+        default: false,
+        restartNeeded: true
+    }
+});
+
 export default definePlugin({
     name: "Experiments",
     description: "Enable Access to Experiments & other dev-only features in Discord!",
@@ -40,6 +50,8 @@ export default definePlugin({
         Devs.Nuckyz
     ],
 
+    settings,
+
     patches: [
         {
             find: "Object.defineProperties(this,{isDeveloper",
@@ -68,6 +80,16 @@ export default definePlugin({
             replacement: {
                 match: /\i\.isStaff\(\)/,
                 replace: "true"
+            },
+            predicate: () => settings.store.toolbarDevMenu
+        },
+
+        // makes the Favourites Server experiment allow favouriting DMs and threads
+        {
+            find: "useCanFavoriteChannel",
+            replacement: {
+                match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
+                replace: "true",
             }
         }
     ],

src/plugins/fakeNitro/index.tsx

@@ -337,7 +337,7 @@ export default definePlugin({
                 {
                     // Call our function to decide whether the embed should be ignored or not
                     predicate: () => settings.store.transformEmojis || settings.store.transformStickers,
-                    match: /(renderEmbeds\((\i)\){)(.+?embeds\.map\((\i)=>{)/,
+                    match: /(renderEmbeds\((\i)\){)(.+?embeds\.map\(\((\i),\i\)?=>{)/,
                     replace: (_, rest1, message, rest2, embed) => `${rest1}const fakeNitroMessage=${message};${rest2}if($self.shouldIgnoreEmbed(${embed},fakeNitroMessage))return null;`
                 },
                 {

src/plugins/messageLinkEmbeds/index.tsx

@@ -280,6 +280,8 @@ function getChannelLabelAndIconUrl(channel: Channel) {
 }
 
 function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps): JSX.Element | null {
+    const compact = TextAndImagesSettingsStores.MessageDisplayCompact.useSetting();
+
     const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
 
     const [channelLabel, iconUrl] = getChannelLabelAndIconUrl(channel);
@@ -304,6 +306,7 @@ function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps):
                         message={message}
                         channel={channel}
                         subscribeToComponentDispatch={false}
+                        compact={compact}
                     />
                 </div>
             )}

src/plugins/messageLogger/index.tsx

@@ -302,7 +302,7 @@ export default definePlugin({
                     replace: "$1" +
                         ".update($3,m =>" +
                         "   (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
-                        "   $2.message.content !== m.editHistory?.[0]?.content && $2.message.content !== m.content ?" +
+                        "   $2.message.edited_timestamp && $2.message.content !== m.content ?" +
                         "       m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
                         "       m" +
                         ")" +

src/plugins/moreUserTags/index.tsx

@@ -19,6 +19,7 @@
 import { definePluginSettings } from "@api/Settings";
 import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
+import { LazyComponentType } from "@utils/lazyReact";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByProps, findComponentByCode } from "@webpack";
@@ -56,7 +57,7 @@ const PermissionUtil = findByProps("computePermissions", "canEveryoneRole") as {
     computePermissions({ ...args }): bigint;
 };
 
-const Tag = findComponentByCode(".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP_OFFICIAL,") as React.ComponentType<{ type?: number, className?: string, useRemSizes?: boolean; }> & { Types: Record<string, number>; };
+const Tag = findComponentByCode(".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP_OFFICIAL,") as LazyComponentType<{ type?: number, className?: string, useRemSizes?: boolean; }> & { Types: Record<string, number>; };
 
 const isWebhook = (message: Message, user: User) => !!message?.webhookId && user.isNonUserBot();
 

src/plugins/pinDms/components/CreateCategoryModal.tsx

@@ -6,7 +6,7 @@
 
 import { classNameFactory } from "@api/Styles";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModalLazy } from "@utils/modal";
-import { extractAndLoadChunksLazy, findComponentByCode } from "@webpack";
+import { extractAndLoadChunksLazy, findComponentByCode, findExportedComponent } from "@webpack";
 import { Button, Forms, Text, TextInput, Toasts, useEffect, useState } from "@webpack/common";
 
 import { DEFAULT_COLOR, SWATCHES } from "../constants";
@@ -31,7 +31,7 @@ interface ColorPickerWithSwatchesProps {
 }
 
 const ColorPicker = findComponentByCode<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
-const ColorPickerWithSwatches = findComponentByCode<ColorPickerWithSwatchesProps>("presets,", "customColor:");
+const ColorPickerWithSwatches = findExportedComponent<ColorPickerWithSwatchesProps>("ColorPicker", "CustomColorPicker");
 
 export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}Promise\.all\((\[\i\.\i\(".+?"\).+?\])\).then\(\i\.bind\(\i,"(.+?)"\)\).{0,50}"UserSettings"/);
 

src/plugins/resurrectHome/README.md

@@ -1,5 +0,0 @@
-# ResurrectHome
-
-Brings back the phased out [Server Home](https://support.discord.com/hc/en-us/articles/6156116949911-Server-Home-Beta) feature!
-
-![](https://github.com/Vendicated/Vencord/assets/61953774/98d5d667-bbb9-48b8-872d-c9b3980f6506)

src/plugins/resurrectHome/index.tsx

@@ -1,195 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 Vendicated and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { findGroupChildrenByChildId } from "@api/ContextMenu";
-import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findByProps } from "@webpack";
-import { Button, Menu, Tooltip, useEffect, useState } from "@webpack/common";
-
-const ChannelRowClasses = findByProps("modeConnected", "modeLocked", "icon");
-
-let currentShouldViewServerHome = false;
-const shouldViewServerHomeStates = new Set<React.Dispatch<React.SetStateAction<boolean>>>();
-
-function ViewServerHomeButton() {
-    return (
-        <Tooltip text="View Server Home">
-            {tooltipProps => (
-                <Button
-                    {...tooltipProps}
-                    look={Button.Looks.BLANK}
-                    size={Button.Sizes.NONE}
-                    innerClassName={ChannelRowClasses.icon}
-                    onClick={e => {
-                        e.preventDefault();
-
-                        currentShouldViewServerHome = true;
-                        for (const setState of shouldViewServerHomeStates) {
-                            setState(true);
-                        }
-                    }}
-
-                >
-                    <svg width="20" height="20" viewBox="0 0 24 24">
-                        <path fill="currentColor" d="m2.4 8.4 8.38-6.46a2 2 0 0 1 2.44 0l8.39 6.45a2 2 0 0 1-.79 3.54l-.32.07-.82 8.2a2 2 0 0 1-1.99 1.8H16a1 1 0 0 1-1-1v-5a3 3 0 0 0-6 0v5a1 1 0 0 1-1 1H6.31a2 2 0 0 1-1.99-1.8L3.5 12l-.32-.07a2 2 0 0 1-.79-3.54Z" />
-                    </svg>
-                </Button>
-            )}
-        </Tooltip>
-    );
-}
-
-function useForceServerHome() {
-    const { forceServerHome } = settings.use(["forceServerHome"]);
-    const [shouldViewServerHome, setShouldViewServerHome] = useState(currentShouldViewServerHome);
-
-    useEffect(() => {
-        shouldViewServerHomeStates.add(setShouldViewServerHome);
-
-        return () => {
-            shouldViewServerHomeStates.delete(setShouldViewServerHome);
-        };
-    }, []);
-
-    return shouldViewServerHome || forceServerHome;
-}
-
-function useDisableViewServerHome() {
-    useEffect(() => () => {
-        currentShouldViewServerHome = false;
-        for (const setState of shouldViewServerHomeStates) {
-            setState(false);
-        }
-    }, []);
-}
-
-const settings = definePluginSettings({
-    forceServerHome: {
-        type: OptionType.BOOLEAN,
-        description: "Force the Server Guide to be the Server Home tab when it is enabled.",
-        default: false
-    }
-});
-
-export default definePlugin({
-    name: "ResurrectHome",
-    description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking a server.",
-    authors: [Devs.Dolfies, Devs.Nuckyz],
-    settings,
-
-    patches: [
-        // Force home deprecation override
-        {
-            find: "GuildFeatures.GUILD_HOME_DEPRECATION_OVERRIDE",
-            all: true,
-            replacement: [
-                {
-                    match: /\i\.hasFeature\(\i\.GuildFeatures\.GUILD_HOME_DEPRECATION_OVERRIDE\)/g,
-                    replace: "true"
-                }
-            ],
-        },
-        // Disable feedback prompts
-        {
-            find: "GuildHomeFeedbackExperiment.definition.id",
-            replacement: [
-                {
-                    match: /return{showFeedback:.+?,setOnDismissedFeedback:(\i)}/,
-                    replace: "return{showFeedback:false,setOnDismissedFeedback:$1}"
-                }
-            ]
-        },
-        // This feature was never finished, so the patch is disabled
-
-        // Enable guild feed render mode selector
-        // {
-        //     find: "2022-01_home_feed_toggle",
-        //     replacement: [
-        //         {
-        //             match: /showSelector:!1/,
-        //             replace: "showSelector:true"
-        //         }
-        //     ]
-        // },
-
-        // Fix focusMessage clearing previously cached messages and causing a loop when fetching messages around home messages
-        {
-            find: '"MessageActionCreators"',
-            replacement: {
-                match: /focusMessage\(\i\){.+?(?=focus:{messageId:(\i)})/,
-                replace: "$&after:$1,"
-            }
-        },
-        // Force Server Home instead of Server Guide
-        {
-            find: "61eef9_2",
-            replacement: {
-                match: /getMutableGuildChannelsForGuild\(\i\);return\(0,\i\.useStateFromStores\).+?\]\)(?=}function)/,
-                replace: m => `${m}&&!$self.useForceServerHome()`
-            }
-        },
-        // Add View Server Home Button to Server Guide
-        {
-            find: "487e85_1",
-            replacement: {
-                match: /(?<=text:(\i)\?\i\.\i\.Messages\.SERVER_GUIDE:\i\.\i\.Messages\.GUILD_HOME,)/,
-                replace: "trailing:$self.ViewServerHomeButton({serverGuide:$1}),"
-            }
-        },
-        // Disable view Server Home override when the Server Home is unmouted
-        {
-            find: "69386d_5",
-            replacement: {
-                match: /location:"69386d_5".+?;/,
-                replace: "$&$self.useDisableViewServerHome();"
-            }
-        }
-    ],
-
-    ViewServerHomeButton: ErrorBoundary.wrap(({ serverGuide }: { serverGuide?: boolean; }) => {
-        if (serverGuide !== true) return null;
-
-        return <ViewServerHomeButton />;
-    }),
-
-    useForceServerHome,
-    useDisableViewServerHome,
-
-    contextMenus: {
-        "guild-context"(children, props) {
-            const { forceServerHome } = settings.use(["forceServerHome"]);
-
-            if (!props?.guild) return;
-
-            const group = findGroupChildrenByChildId("hide-muted-channels", children);
-
-            group?.unshift(
-                <Menu.MenuCheckboxItem
-                    key="force-server-home"
-                    id="force-server-home"
-                    label="Force Server Home"
-                    checked={forceServerHome}
-                    action={() => settings.store.forceServerHome = !forceServerHome}
-                />
-            );
-        }
-    }
-});

src/plugins/showConnections/index.tsx

@@ -210,9 +210,9 @@ export default definePlugin({
             }
         },
         {
-            find: "autoFocusNote:!0})",
+            find: ".UserProfileTypes.BITE_SIZE,onOpenProfile",
             replacement: {
-                match: /{autoFocusNote:!1}\)}\)(?<=user:(\i),bio:null==(\i)\?.+?)/,
+                match: /currentUser:\i,guild:\i,onOpenProfile:.+?}\)(?=])(?<=user:(\i),bio:null==(\i)\?.+?)/,
                 replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, simplified: true })"
             }
         }

src/plugins/showHiddenChannels/index.tsx

@@ -73,9 +73,8 @@ export default definePlugin({
             find: '"placeholder-channel-id"',
             replacement: [
                 // Remove the special logic for channels we don't have access to
-                // FIXME Remove variable matcher from threadsIds when it hits stable
                 {
-                    match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:(?:\[\]|\i)}}/,
+                    match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:\[\]}}/,
                     replace: ""
                 },
                 // Do not check for unreads when selecting the render level if the channel is hidden

src/plugins/viewIcons/index.tsx

@@ -184,7 +184,7 @@ export default definePlugin({
 
     patches: [
         // Profiles Modal pfp
-        ...["User Profile Modal - Context Menu", ".UserProfileTypes.FULL_SIZE,hasProfileEffect:"].map(find => ({
+        ...[".UserProfileTypes.MODAL,hasProfileEffect", ".UserProfileTypes.FULL_SIZE,hasProfileEffect:"].map(find => ({
             find,
             replacement: {
                 match: /\{src:(\i)(?=,avatarDecoration)/,

src/utils/constants.ts

@@ -37,7 +37,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         id: 0n,
     },
     Ven: {
-        name: "Vendicated",
+        name: "Vee",
         id: 343383572805058560n
     },
     Arjix: {
@@ -326,7 +326,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         id: 305288513941667851n
     },
     ImLvna: {
-        name: "Luna <3",
+        name: "lillith <3",
         id: 799319081723232267n
     },
     rad: {

src/utils/lazyReact.tsx

@@ -6,6 +6,10 @@
 
 import { makeLazy } from "./lazy";
 
+export type LazyComponentType<T extends object = {}> = React.ComponentType<T> & Record<PropertyKey, any>;
+
+export const SYM_LAZY_COMPONENT_INNER = Symbol.for("vencord.lazyComponent.inner");
+
 /**
  * A lazy component. The factory method is called on first render.
  *
@@ -13,10 +17,10 @@ import { makeLazy } from "./lazy";
  * @param attempts How many times to try to get the component before giving up
  * @returns Result of factory function
  */
-export function LazyComponent<T extends object = any>(factory: () => React.ComponentType<T>, attempts = 5) {
+export function LazyComponent<T extends object = {}>(factory: () => LazyComponentType<T>, attempts = 5) {
     const get = makeLazy(factory, attempts, { isIndirect: true });
 
-    let InnerComponent = null as React.ComponentType<T> | null;
+    let InnerComponent = null as LazyComponentType<T> | null;
 
     let lazyFailedLogged = false;
     const LazyComponent = (props: T) => {
@@ -39,5 +43,7 @@ export function LazyComponent<T extends object = any>(factory: () => React.Compo
         return InnerComponent && <InnerComponent {...props} />;
     };
 
-    return LazyComponent as React.ComponentType<T>;
+    LazyComponent[SYM_LAZY_COMPONENT_INNER] = () => InnerComponent;
+
+    return LazyComponent as LazyComponentType<T>;
 }

src/webpack/common/types/menu.d.ts

@@ -18,7 +18,7 @@
 
 import type { ComponentType, CSSProperties, MouseEvent, PropsWithChildren, ReactNode, UIEvent } from "react";
 
-type RC<C> = ComponentType<PropsWithChildren<C & Record<string, any>>>;
+type RC<C> = ComponentType<PropsWithChildren<C & Record<PropertyKey, any>>>;
 
 export interface Menu {
     Menu: RC<{

src/webpack/webpack.tsx

@@ -5,7 +5,7 @@
  */
 
 import { makeLazy, proxyLazy } from "@utils/lazy";
-import { LazyComponent } from "@utils/lazyReact";
+import { LazyComponent, LazyComponentType, SYM_LAZY_COMPONENT_INNER } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
 import { canonicalizeMatch } from "@utils/patches";
 import { ProxyInner, proxyInner, SYM_PROXY_INNER_VALUE } from "@utils/proxyInner";
@@ -204,13 +204,13 @@ export function find<T = AnyObject>(filter: FilterFn, callback: (module: ModuleE
  * @param parse A function that takes the found component as its first argument and returns a component. Useful if you want to wrap the found component in something. Defaults to the original component
  * @returns The component if found, or a noop component
  */
-export function findComponent<T extends object = any>(filter: FilterFn, parse: (component: ModuleExports) => React.ComponentType<T> = m => m, { isIndirect = false }: { isIndirect?: boolean; } = {}) {
+export function findComponent<T extends object = {}>(filter: FilterFn, parse: (component: ModuleExports) => LazyComponentType<T> = m => m, { isIndirect = false }: { isIndirect?: boolean; } = {}) {
     if (typeof filter !== "function")
         throw new Error("Invalid filter. Expected a function got " + typeof filter);
     if (typeof parse !== "function")
         throw new Error("Invalid component parse. Expected a function got " + typeof parse);
 
-    let InnerComponent = null as React.ComponentType<T> | null;
+    let InnerComponent = null as LazyComponentType<T> | null;
 
     let findFailedLogged = false;
     const WrapperComponent = (props: T) => {
@@ -222,23 +222,21 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
         return InnerComponent && <InnerComponent {...props} />;
     };
 
+    WrapperComponent[SYM_LAZY_COMPONENT_INNER] = () => InnerComponent;
+
     waitFor(filter, (v: any) => {
         const parsedComponent = parse(v);
         InnerComponent = parsedComponent;
         Object.assign(WrapperComponent, parsedComponent);
     }, { isIndirect: true });
 
-    if (IS_REPORTER) {
+    if (IS_REPORTER && !isIndirect) {
-        WrapperComponent.$$vencordInner = () => InnerComponent;
-
-        if (!isIndirect) {
         webpackSearchHistory.push(["findComponent", [WrapperComponent, filter]]);
     }
-    }
 
     if (InnerComponent !== null) return InnerComponent;
 
-    return WrapperComponent as React.ComponentType<T>;
+    return WrapperComponent as LazyComponentType<T>;
 }
 
 /**
@@ -251,13 +249,13 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
  * @param parse A function that takes the found component as its first argument and returns a component. Useful if you want to wrap the found component in something. Defaults to the original component
  * @returns The component if found, or a noop component
  */
-export function findExportedComponent<T extends object = any>(...props: string[] | [...string[], (component: ModuleExports) => React.ComponentType<T>]) {
+export function findExportedComponent<T extends object = {}>(...props: string[] | [...string[], (component: ModuleExports) => LazyComponentType<T>]) {
-    const parse = (typeof props.at(-1) === "function" ? props.pop() : m => m) as (component: ModuleExports) => React.ComponentType<T>;
+    const parse = (typeof props.at(-1) === "function" ? props.pop() : m => m) as (component: ModuleExports) => LazyComponentType<T>;
     const newProps = props as string[];
 
     const filter = filters.byProps(...newProps);
 
-    let InnerComponent = null as React.ComponentType<T> | null;
+    let InnerComponent = null as LazyComponentType<T> | null;
 
     let findFailedLogged = false;
     const WrapperComponent = (props: T) => {
@@ -269,6 +267,7 @@ export function findExportedComponent<T extends object = any>(...props: string[]
         return InnerComponent && <InnerComponent {...props} />;
     };
 
+    WrapperComponent[SYM_LAZY_COMPONENT_INNER] = () => InnerComponent;
 
     waitFor(filter, (v: any) => {
         const parsedComponent = parse(v[newProps[0]]);
@@ -277,13 +276,12 @@ export function findExportedComponent<T extends object = any>(...props: string[]
     }, { isIndirect: true });
 
     if (IS_REPORTER) {
-        WrapperComponent.$$vencordInner = () => InnerComponent;
         webpackSearchHistory.push(["findExportedComponent", [WrapperComponent, ...newProps]]);
     }
 
     if (InnerComponent !== null) return InnerComponent;
 
-    return WrapperComponent as React.ComponentType<T>;
+    return WrapperComponent as LazyComponentType<T>;
 }
 
 /**
@@ -296,8 +294,8 @@ export function findExportedComponent<T extends object = any>(...props: string[]
  * @param parse A function that takes the found component as its first argument and returns a component. Useful if you want to wrap the found component in something. Defaults to the original component
  * @returns The component if found, or a noop component
  */
-export function findComponentByCode<T extends object = any>(...code: string[] | [...string[], (component: ModuleExports) => React.ComponentType<T>]) {
+export function findComponentByCode<T extends object = {}>(...code: string[] | [...string[], (component: ModuleExports) => LazyComponentType<T>]) {
-    const parse = (typeof code.at(-1) === "function" ? code.pop() : m => m) as (component: ModuleExports) => React.ComponentType<T>;
+    const parse = (typeof code.at(-1) === "function" ? code.pop() : m => m) as (component: ModuleExports) => LazyComponentType<T>;
     const newCode = code as string[];
 
     const ComponentResult = findComponent<T>(filters.componentByCode(...newCode), parse, { isIndirect: true });
@@ -526,7 +524,7 @@ export function webpackDependantLazy<T = AnyObject>(factory: () => T, attempts?:
  * @param attempts How many times to try to get the component before giving up
  * @returns Result of factory function
  */
-export function webpackDependantLazyComponent<T extends object = any>(factory: () => any, attempts?: number) {
+export function webpackDependantLazyComponent<T extends object = {}>(factory: () => any, attempts?: number) {
     if (IS_REPORTER) webpackSearchHistory.push(["webpackDependantLazyComponent", [factory]]);
 
     return LazyComponent<T>(factory, attempts);