diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-28 14:10:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-28 14:10:30 +0200 |
commit | 00889b313176308018d66e54b5cb7dcc92da1587 (patch) | |
tree | 2123cb37613d91a9446d9030e6d43600eea6a7e8 /app/javascript/flavours/glitch/features/follow_recommendations | |
parent | 4b7e43602691193b5d2a8e7e0ed6044bc8ee9774 (diff) | |
parent | c4ccbbccabf2ed6a899e3ca46fa9c2f8bf72b269 (diff) |
Merge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/follow_recommendations')
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_recommendations/components/account.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_recommendations/index.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/follow_recommendations/components/account.js b/app/javascript/flavours/glitch/features/follow_recommendations/components/account.js index 046d03a9b..2c668da3e 100644 --- a/app/javascript/flavours/glitch/features/follow_recommendations/components/account.js +++ b/app/javascript/flavours/glitch/features/follow_recommendations/components/account.js @@ -66,7 +66,7 @@ class Account extends ImmutablePureComponent { return ( <div className='account follow-recommendations-account'> <div className='account__wrapper'> - <Permalink className='account__display-name account__display-name--with-note' title={account.get('acct')} href={account.get('url')} to={`/accounts/${account.get('id')}`}> + <Permalink className='account__display-name account__display-name--with-note' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}> <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div> <DisplayName account={account} /> diff --git a/app/javascript/flavours/glitch/features/follow_recommendations/index.js b/app/javascript/flavours/glitch/features/follow_recommendations/index.js index fee4d8757..d050e3cc7 100644 --- a/app/javascript/flavours/glitch/features/follow_recommendations/index.js +++ b/app/javascript/flavours/glitch/features/follow_recommendations/index.js @@ -68,7 +68,7 @@ class FollowRecommendations extends ImmutablePureComponent { } })); - router.history.push('/timelines/home'); + router.history.push('/home'); } render () { |