gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-06 01:41:08 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Ensure featured carousel respects tags (#34995)

Browse Source
This commit is contained in:
Echo 2025-06-10 15:28:41 +02:00 committed by GitHub
parent 7a7e0ba4cd
commit c543e823ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/features/account_timeline/index.jsx
View File

@ -135,7 +135,7 @@ class AccountTimeline extends ImmutablePureComponent {
}; };
render () { render () {
const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props; const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl, params: { tagged } } = this.props;
if (isLoading && statusIds.isEmpty()) { if (isLoading && statusIds.isEmpty()) {
return ( return (
@ -172,8 +172,8 @@ class AccountTimeline extends ImmutablePureComponent {
<StatusList <StatusList
prepend={ prepend={
<> <>
<AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={this.props.params.tagged} /> <AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={tagged} />
{!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} />} {!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} tagged={tagged} />}
</> </>
} }
alwaysPrepend alwaysPrepend