kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Merge branch 'redirect-account-ids' into 'develop'
Redirect account URLs like `/@9v5bmXkCYkqU30gp9s` to their username, `/@alex@spinster.xyz` See merge request soapbox-pub/soapbox-fe!454merge-requests/455/merge
commit
9d45983bb6
|
@ -13,6 +13,7 @@ import ProfileMediaPanel from '../features/ui/components/profile_media_panel';
|
||||||
import { acctFull } from 'soapbox/utils/accounts';
|
import { acctFull } from 'soapbox/utils/accounts';
|
||||||
import { getFeatures } from 'soapbox/utils/features';
|
import { getFeatures } from 'soapbox/utils/features';
|
||||||
import { makeGetAccount } from '../selectors';
|
import { makeGetAccount } from '../selectors';
|
||||||
|
import { Redirect } from 'react-router-dom';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
|
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
|
||||||
const accounts = state.getIn(['accounts']);
|
const accounts = state.getIn(['accounts']);
|
||||||
|
@ -32,11 +33,20 @@ const mapStateToProps = (state, { params: { username }, withReplies = false }) =
|
||||||
|
|
||||||
//Children components fetch information
|
//Children components fetch information
|
||||||
|
|
||||||
|
let realAccount;
|
||||||
|
if (!account) {
|
||||||
|
const maybeAccount = accounts.get(username);
|
||||||
|
if (maybeAccount) {
|
||||||
|
realAccount = maybeAccount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
account: accountId ? getAccount(state, accountId) : account,
|
account: accountId ? getAccount(state, accountId) : account,
|
||||||
accountId,
|
accountId,
|
||||||
accountUsername,
|
accountUsername,
|
||||||
features: getFeatures(state.get('instance')),
|
features: getFeatures(state.get('instance')),
|
||||||
|
realAccount,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -50,9 +60,13 @@ class ProfilePage extends ImmutablePureComponent {
|
||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
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;
|
const bg = account ? account.getIn(['customizations', 'background']) : undefined;
|
||||||
|
|
||||||
|
if (realAccount) {
|
||||||
|
return <Redirect to={`/@${realAccount.get('acct')}`} />;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={bg && `page page--customization page--${bg}` || 'page'}>
|
<div className={bg && `page page--customization page--${bg}` || 'page'}>
|
||||||
{account && <Helmet>
|
{account && <Helmet>
|
||||||
|
|
Ładowanie…
Reference in New Issue