mirror of
https://github.com/Vendicated/Vencord.git
synced 2025-01-26 01:06:24 +00:00
AccountPanelServerProfile: Fix buttons unusable and request spam
This commit is contained in:
parent
9bb983d40c
commit
9e9d71d014
2 changed files with 8 additions and 8 deletions
|
@ -16,7 +16,7 @@ import { User } from "discord-types/general";
|
|||
interface UserProfileProps {
|
||||
popoutProps: Record<string, any>;
|
||||
currentUser: User;
|
||||
OriginalPopout: () => React.ReactNode;
|
||||
originalRenderPopout: () => React.ReactNode;
|
||||
}
|
||||
|
||||
const UserProfile = findComponentByCodeLazy("UserProfilePopoutWrapper: user cannot be undefined");
|
||||
|
@ -78,7 +78,7 @@ export default definePlugin({
|
|||
},
|
||||
{
|
||||
match: /(\.AVATAR,children:.+?renderPopout:(\i)=>){(.+?)}(?=,position)(?<=currentUser:(\i).+?)/,
|
||||
replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},OriginalPopout:()=>{${originalPopout}}})`
|
||||
replace: (_, rest, popoutProps, originalPopout, currentUser) => `${rest}$self.UserProfile({popoutProps:${popoutProps},currentUser:${currentUser},originalRenderPopout:()=>{${originalPopout}}})`
|
||||
},
|
||||
{
|
||||
match: /\.AVATAR,children:.+?(?=renderPopout:)/,
|
||||
|
@ -112,17 +112,17 @@ export default definePlugin({
|
|||
openAlternatePopout = false;
|
||||
},
|
||||
|
||||
UserProfile: ErrorBoundary.wrap(({ popoutProps, currentUser, OriginalPopout }: UserProfileProps) => {
|
||||
UserProfile: ErrorBoundary.wrap(({ popoutProps, currentUser, originalRenderPopout }: UserProfileProps) => {
|
||||
if (
|
||||
(settings.store.prioritizeServerProfile && openAlternatePopout) ||
|
||||
(!settings.store.prioritizeServerProfile && !openAlternatePopout)
|
||||
) {
|
||||
return <OriginalPopout />;
|
||||
return originalRenderPopout();
|
||||
}
|
||||
|
||||
const currentChannel = getCurrentChannel();
|
||||
if (currentChannel?.getGuildId() == null) {
|
||||
return <OriginalPopout />;
|
||||
return originalRenderPopout();
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
|
@ -16,7 +16,7 @@ interface UserMentionComponentProps {
|
|||
id: string;
|
||||
channelId: string;
|
||||
guildId: string;
|
||||
OriginalComponent: () => ReactNode;
|
||||
originalComponent: () => ReactNode;
|
||||
}
|
||||
|
||||
export default definePlugin({
|
||||
|
@ -29,7 +29,7 @@ export default definePlugin({
|
|||
find: ':"text":',
|
||||
replacement: {
|
||||
match: /(hidePersonalInformation\).+?)(if\(null!=\i\){.+?return \i)(?=})/,
|
||||
replace: "$1return $self.UserMentionComponent({...arguments[0],OriginalComponent:()=>{$2}});"
|
||||
replace: "$1return $self.UserMentionComponent({...arguments[0],originalComponent:()=>{$2}});"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
@ -42,6 +42,6 @@ export default definePlugin({
|
|||
channelId={props.channelId}
|
||||
/>
|
||||
), {
|
||||
fallback: ({ wrappedProps: { OriginalComponent } }) => <OriginalComponent />
|
||||
fallback: ({ wrappedProps: { originalComponent } }) => originalComponent()
|
||||
})
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue