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

Merge remote-tracking branch 'parent/main' into upstream-20250328

Browse source
This commit is contained in:
KMY 2025-03-28 08:44:30 +09:00
commit 12ed20b6d5
257 changed files with 3505 additions and 2010 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,7 @@ import {
FollowingCounter,
StatusesCounter,
} from 'mastodon/components/counters';
import { FormattedDateWrapper } from 'mastodon/components/formatted_date';
import { getFeaturedHashtagBar } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';
@ -1020,7 +1021,7 @@ export const AccountHeader: React.FC<{
onClickCapture={handleLinkClick}
>
{account.id !== me && signedIn && (
<AccountNoteContainer account={account} />
<AccountNoteContainer accountId={accountId} />
)}
{account.note.length > 0 && account.note !== '<p></p>' && (
@ -1045,11 +1046,12 @@ export const AccountHeader: React.FC<{
/>
</dt>
<dd>
{intl.formatDate(account.created_at, {
year: 'numeric',
month: 'short',
day: '2-digit',
})}
<FormattedDateWrapper
value={account.created_at}
year='numeric'
month='short'
day='2-digit'
/>
</dd>
</dl>