bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'redirect-account-ids' into 'develop'

Browse source 
Redirect account URLs like `/@9v5bmXkCYkqU30gp9s` to their username, `/@alex@spinster.xyz`

See merge request soapbox-pub/soapbox-fe!454
This commit is contained in:
Alex Gleason 2021-03-29 20:29:06 +00:00
commit 9d45983bb6
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/soapbox/pages/profile_page.js
View file

@ -13,6 +13,7 @@ import ProfileMediaPanel from '../features/ui/components/profile_media_panel';
import { acctFull } from 'soapbox/utils/accounts';
import { getFeatures } from 'soapbox/utils/features';
import { makeGetAccount } from '../selectors';
import { Redirect } from 'react-router-dom';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const accounts = state.getIn(['accounts']);
@ -32,11 +33,20 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
//Children components fetch information
let realAccount;
if (!account) {
const maybeAccount = accounts.get(username);
if (maybeAccount) {
realAccount = maybeAccount;
}
}
return {
account: accountId ? getAccount(state, accountId) : account,
accountId,
accountUsername,
features: getFeatures(state.get('instance')),
realAccount,
};
};
@ -50,9 +60,13 @@ class ProfilePage extends ImmutablePureComponent {
};
render() {
const { children, accountId, account, accountUsername, features } = this.props;
const { children, accountId, account, accountUsername, features, realAccount } = this.props;
const bg = account ? account.getIn(['customizations', 'background']) : undefined;
if (realAccount) {
return <Redirect to={`/@${realAccount.get('acct')}`} />;
}
return (
<div className={bg && `page page--customization page--${bg}` || 'page'}>
{account && <Helmet>