Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
thororen1234 2025-01-31 14:48:15 -05:00
commit 4058737d87

View file

@ -8,6 +8,7 @@ import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import definePlugin from "@utils/types"; import definePlugin from "@utils/types";
import { findComponentByCodeLazy } from "@webpack"; import { findComponentByCodeLazy } from "@webpack";
import { UserStore, useStateFromStores } from "@webpack/common";
import { ReactNode } from "react"; import { ReactNode } from "react";
const UserMentionComponent = findComponentByCodeLazy(".USER_MENTION)"); const UserMentionComponent = findComponentByCodeLazy(".USER_MENTION)");
@ -34,14 +35,19 @@ export default definePlugin({
} }
], ],
UserMentionComponent: ErrorBoundary.wrap((props: UserMentionComponentProps) => ( UserMentionComponent: ErrorBoundary.wrap((props: UserMentionComponentProps) => {
<UserMentionComponent const user = useStateFromStores([UserStore], () => UserStore.getUser(props.id));
if (user == null) {
return props.originalComponent();
}
return <UserMentionComponent
// This seems to be constant // This seems to be constant
className="mention" className="mention"
userId={props.id} userId={props.id}
channelId={props.channelId} channelId={props.channelId}
/> />;
), { }, {
fallback: ({ wrappedProps: { originalComponent } }) => originalComponent() fallback: ({ wrappedProps: { originalComponent } }) => originalComponent()
}) })
}); });