Merge branch 'main' into MAS-351-featured-tab

app/javascript/mastodon/components/navigation_portal.tsx

@@ -10,6 +10,7 @@ export const NavigationPortal: React.FC = () => (
   <div className='navigation-panel__portal'>
     <Switch>
       <Route path='/@:acct' exact component={AccountNavigation} />
+      <Route path='/@:acct/posts' exact component={AccountNavigation} />
       <Route
         path='/@:acct/tagged/:tagged?'
         exact

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -1032,6 +1032,9 @@ export const AccountHeader: React.FC<{
       {!(hideTabs || hidden) && (
         <div className='account__section-headline'>
           <NavLink exact to={`/@${account.acct}`}>
+            <FormattedMessage id='account.featured' defaultMessage='Featured' />
+          </NavLink>
+          <NavLink exact to={`/@${account.acct}/posts`}>
             <FormattedMessage id='account.posts' defaultMessage='Posts' />
           </NavLink>
           <NavLink exact to={`/@${account.acct}/with_replies`}>

app/javascript/mastodon/features/ui/index.jsx

@@ -236,6 +236,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path={['/publish', '/statuses/new']} component={Compose} content={children} />
 
             <WrappedRoute path={['/@:acct', '/accounts/:id']} exact component={AccountTimeline} content={children} />
+            <WrappedRoute path={['/@:acct/posts', '/accounts:id/posts']} component={AccountTimeline} content={children} />
             <WrappedRoute path='/@:acct/tagged/:tagged?' exact component={AccountTimeline} content={children} />
             <WrappedRoute path={['/@:acct/with_replies', '/accounts/:id/with_replies']} component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
             <WrappedRoute path={['/accounts/:id/followers', '/users/:acct/followers', '/@:acct/followers']} component={Followers} content={children} />