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

ProfilePage: clean up unused/legacy code

Browse source
This commit is contained in:
Alex Gleason 2022-08-09 19:17:11 -05:00
parent 9541bedc05
commit 1bd2814aec
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/soapbox/pages/profile_page.tsx
View file

@ -19,9 +19,6 @@ import { getAcct, isLocal } from 'soapbox/utils/accounts';
import { Column, Layout, Tabs } from '../components/ui'; import { Column, Layout, Tabs } from '../components/ui';
import HeaderContainer from '../features/account_timeline/containers/header_container'; import HeaderContainer from '../features/account_timeline/containers/header_container';
import { makeGetAccount } from '../selectors';
const getAccount = makeGetAccount();
interface IProfilePage { interface IProfilePage {
params?: { params?: {
@ -34,43 +31,12 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
const history = useHistory(); const history = useHistory();
const username = params?.username || ''; const username = params?.username || '';
const { accountId, account, realAccount } = useAppSelector(state => { const account = useAppSelector(state => username ? findAccountByUsername(state, username) : undefined);
const { accounts } = state;
const accountFetchError = (((state.accounts.getIn([-1, 'username']) || '') as string).toLowerCase() === username.toLowerCase());
let accountId: string | -1 | null = -1;
let account = null;
if (accountFetchError) {
accountId = null;
} else {
account = findAccountByUsername(state, username);
accountId = account ? account.id : -1;
}
let realAccount;
if (!account) {
const maybeAccount = accounts.get(username);
if (maybeAccount) {
realAccount = maybeAccount;
}
}
return {
account: typeof accountId === 'string' ? getAccount(state, accountId) : account,
accountId,
realAccount,
};
});
const me = useAppSelector(state => state.me); const me = useAppSelector(state => state.me);
const features = useFeatures(); const features = useFeatures();
const { displayFqn } = useSoapboxConfig(); const { displayFqn } = useSoapboxConfig();
// Redirect from a user ID
if (realAccount) {
return <Redirect to={`/@${realAccount.acct}`} />;
}
// Fix case of username // Fix case of username
if (account && account.acct !== username) { if (account && account.acct !== username) {
return <Redirect to={`/@${account.acct}`} />; return <Redirect to={`/@${account.acct}`} />;
@ -125,7 +91,7 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
<Column label={account ? `@${getAcct(account, displayFqn)}` : ''} withHeader={false}> <Column label={account ? `@${getAcct(account, displayFqn)}` : ''} withHeader={false}>
<div className='space-y-4'> <div className='space-y-4'>
{/* @ts-ignore */} {/* @ts-ignore */}
<HeaderContainer accountId={accountId} username={username} /> <HeaderContainer accountId={account?.id} username={username} />
<BundleContainer fetchComponent={ProfileInfoPanel}> <BundleContainer fetchComponent={ProfileInfoPanel}>
{Component => <Component username={username} account={account} />} {Component => <Component username={username} account={account} />}