mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix Patron badge in profile info panel

environments/review-accounts-h-uli5de/deployments/3523
Alex Gleason 2023-06-21 17:13:29 -05:00
rodzic 3a369f21fa
commit 88692b7020
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
1 zmienionych plików z 6 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/soapbox/features/ui/components/profile-info-panel.tsx
Wyświetl plik

@ -3,6 +3,7 @@
import React from 'react'; import React from 'react';
import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
import { usePatronUser } from 'soapbox/api/hooks';
import Badge from 'soapbox/components/badge'; import Badge from 'soapbox/components/badge';
import Markup from 'soapbox/components/markup'; import Markup from 'soapbox/components/markup';
import { Icon, HStack, Stack, Text } from 'soapbox/components/ui'; import { Icon, HStack, Stack, Text } from 'soapbox/components/ui';
@ -35,7 +36,7 @@ const messages = defineMessages({
}); });
interface IProfileInfoPanel { interface IProfileInfoPanel {
account: Account account?: Account
/** Username from URL params, in case the account isn't found. */ /** Username from URL params, in case the account isn't found. */
username: string username: string
} }
@ -44,6 +45,7 @@ interface IProfileInfoPanel {
const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) => { const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) => {
const intl = useIntl(); const intl = useIntl();
const { displayFqn } = useSoapboxConfig(); const { displayFqn } = useSoapboxConfig();
const { patronUser } = usePatronUser(account?.url);
const getStaffBadge = (): React.ReactNode => { const getStaffBadge = (): React.ReactNode => {
if (account?.admin) { if (account?.admin) {
@ -56,7 +58,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
}; };
const getCustomBadges = (): React.ReactNode[] => { const getCustomBadges = (): React.ReactNode[] => {
const badges = getAccountBadges(account); const badges = account ? getAccountBadges(account) : [];
return badges.map(badge => ( return badges.map(badge => (
<Badge <Badge
@ -70,7 +72,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
const getBadges = (): React.ReactNode[] => { const getBadges = (): React.ReactNode[] => {
const custom = getCustomBadges(); const custom = getCustomBadges();
const staffBadge = getStaffBadge(); const staffBadge = getStaffBadge();
const isPatron = account.getIn(['patron', 'is_patron']) === true; const isPatron = patronUser?.is_patron === true;
const badges = []; const badges = [];
@ -86,7 +88,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
}; };
const renderBirthday = (): React.ReactNode => { const renderBirthday = (): React.ReactNode => {
const birthday = account.pleroma?.birthday; const birthday = account?.pleroma?.birthday;
if (!birthday) return null; if (!birthday) return null;
const formattedBirthday = intl.formatDate(birthday, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' }); const formattedBirthday = intl.formatDate(birthday, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' });