gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge commit 'a324edabdf' into upstream-20250416

Browse source
This commit is contained in:
KMY 2025-04-24 07:27:26 +09:00
commit 94eb912030
71 changed files with 513 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/features/account_timeline/components/account_header.tsx
View file

@ -567,9 +567,7 @@ export const AccountHeader: React.FC<{
arr.push({
text: intl.formatMessage(
account.getIn(['relationship', 'endorsed'])
? messages.unendorse
: messages.endorse,
relationship.endorsed ? messages.unendorse : messages.endorse,
),
action: handleEndorseToggle,
});
@ -842,7 +840,7 @@ export const AccountHeader: React.FC<{
badges.push(<GroupBadge key='group-badge' />);
}
account.get('roles', []).forEach((role) => {
account.roles.forEach((role) => {
badges.push(
<Badge
key={`role-badge-${role.get('id')}`}