Merge remote-tracking branch 'upstream/dev'

This commit is contained in:
thororen 2024-05-02 13:46:24 -04:00
commit a199cd25f6
11 changed files with 111 additions and 48 deletions

View file

@ -36,7 +36,7 @@ export interface ProfileBadge {
image?: string;
link?: string;
/** Action to perform when you click the badge */
onClick?(): void;
onClick?(event: React.MouseEvent<HTMLButtonElement, MouseEvent>, props: BadgeUserArgs): void;
/** Should the user display this badge? */
shouldShow?(userInfo: BadgeUserArgs): boolean;
/** Optional props (e.g. style) for the badge, ignored for component badges */
@ -89,9 +89,7 @@ export function _getBadges(args: BadgeUserArgs) {
export interface BadgeUserArgs {
user: User;
profile: Profile;
premiumSince: Date;
premiumGuildSince?: Date;
guildId: string;
}
interface ConnectedAccount {