export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
export const ACCOUNT_FETCH_FAIL = 'ACCOUNT_FETCH_FAIL';
+export const ACCOUNT_LOOKUP_REQUEST = 'ACCOUNT_LOOKUP_REQUEST';
+export const ACCOUNT_LOOKUP_SUCCESS = 'ACCOUNT_LOOKUP_SUCCESS';
+export const ACCOUNT_LOOKUP_FAIL = 'ACCOUNT_LOOKUP_FAIL';
+
export const ACCOUNT_FOLLOW_REQUEST = 'ACCOUNT_FOLLOW_REQUEST';
export const ACCOUNT_FOLLOW_SUCCESS = 'ACCOUNT_FOLLOW_SUCCESS';
export const ACCOUNT_FOLLOW_FAIL = 'ACCOUNT_FOLLOW_FAIL';
};
};
+export const lookupAccount = acct => (dispatch, getState) => {
+ dispatch(lookupAccountRequest(acct));
+
+ api(getState).get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
+ dispatch(fetchRelationships([response.data.id]));
+ dispatch(importFetchedAccount(response.data));
+ dispatch(lookupAccountSuccess());
+ }).catch(error => {
+ dispatch(lookupAccountFail(acct, error));
+ });
+};
+
+export const lookupAccountRequest = (acct) => ({
+ type: ACCOUNT_LOOKUP_REQUEST,
+ acct,
+});
+
+export const lookupAccountSuccess = () => ({
+ type: ACCOUNT_LOOKUP_SUCCESS,
+});
+
+export const lookupAccountFail = (acct, error) => ({
+ type: ACCOUNT_LOOKUP_FAIL,
+ acct,
+ error,
+ skipAlert: true,
+});
+
export function fetchAccountRequest(id) {
return {
type: ACCOUNT_FETCH_REQUEST,
export const ensureComposeIsVisible = (getState, routerHistory) => {
if (!getState().getIn(['compose', 'mounted']) && window.innerWidth < COMPOSE_PANEL_BREAKPOINT) {
- routerHistory.push('/statuses/new');
+ routerHistory.push('/publish');
}
};
'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
},
}).then(function (response) {
- if (routerHistory && routerHistory.location.pathname === '/statuses/new'
+ if (routerHistory
+ && routerHistory.location.pathname === '/publish'
&& window.history.state
&& !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) {
routerHistory.goBack();
<Permalink
className='account small'
href={account.get('url')}
- to={`/accounts/${account.get('id')}`}
+ to={`/@${account.get('acct')}`}
>
<div className='account__avatar-wrapper'>
<Avatar
) : (
<div className='account'>
<div className='account__wrapper'>
- <Permalink key={account.get('id')} className='account__display-name' href={account.get('url')} to={`/accounts/${account.get('id')}`}>
+ <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
<div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
{mute_expires_at}
<DisplayName account={account} />
<a
href={account.get('url')}
target='_blank'
- onClick={(e) => this.props.onAccountClick(account.get('id'), e)}
+ onClick={(e) => this.props.onAccountClick(account.get('acct'), e)}
title={`@${account.get('acct')}`}
key={account.get('id')}
>
<a
href={a.get('url')}
target='_blank'
- onClick={(e) => onAccountClick(a.get('id'), e)}
+ onClick={(e) => onAccountClick(a.get('acct'), e)}
title={`@${a.get('acct')}`}
rel='noopener noreferrer'
>
}
suffix = (
- <a href={account.get('url')} target='_blank' onClick={(e) => onAccountClick(account.get('id'), e)} rel='noopener noreferrer'>
+ <a href={account.get('url')} target='_blank' onClick={(e) => onAccountClick(account.get('acct'), e)} rel='noopener noreferrer'>
<span className='display-name__account'>@{acct}</span>
</a>
);
<div className='trends__item__name'>
<Permalink
href={hashtag.get('url')}
- to={`/timelines/tag/${hashtag.get('name')}`}
+ to={`/tags/${hashtag.get('name')}`}
>
#<span>{hashtag.get('name')}</span>
</Permalink>
return;
} else {
if (destination === undefined) {
- destination = `/statuses/${
+ destination = `/@${
+ status.getIn(['reblog', 'account', 'acct'], status.getIn(['account', 'acct']))
+ }/${
status.getIn(['reblog', 'id'], status.get('id'))
}`;
}
this.setState({ showMedia: !this.state.showMedia });
}
- handleAccountClick = (e) => {
- if (this.context.router && e.button === 0) {
- const id = e.currentTarget.getAttribute('data-id');
- e.preventDefault();
- let state = {...this.context.router.history.location.state};
- state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${id}`, state);
- }
- }
-
handleExpandedToggle = () => {
if (this.props.status.get('spoiler_text')) {
this.setExpansion(!this.state.isExpanded);
handleHotkeyOpen = () => {
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/statuses/${this.props.status.get('id')}`, state);
+ this.context.router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`, state);
}
handleHotkeyOpenProfile = () => {
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`, state);
}
handleHotkeyMoveUp = e => {
handleOpen = () => {
let state = {...this.context.router.history.location.state};
if (state.mastodonModalKey) {
- this.context.router.history.replace(`/statuses/${this.props.status.get('id')}`, { mastodonBackSteps: (state.mastodonBackSteps || 0) + 1 });
+ this.context.router.history.replace(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}`, { mastodonBackSteps: (state.mastodonBackSteps || 0) + 1 });
} else {
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/statuses/${this.props.status.get('id')}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}`, state);
}
}
onMentionClick = (mention, e) => {
if (this.props.parseClick) {
- this.props.parseClick(e, `/accounts/${mention.get('id')}`);
+ this.props.parseClick(e, `/@${mention.get('acct')}`);
}
}
hashtag = hashtag.replace(/^#/, '');
if (this.props.parseClick) {
- this.props.parseClick(e, `/timelines/tag/${hashtag}`);
+ this.props.parseClick(e, `/tags/${hashtag}`);
}
}
const mentionLinks = status.get('mentions').map(item => (
<Permalink
- to={`/accounts/${item.get('id')}`}
+ to={`/@${item.get('acct')}`}
href={item.get('url')}
key={item.get('id')}
className='mention'
};
// Handles clicks on account name/image
- handleClick = (id, e) => {
+ handleClick = (acct, e) => {
const { parseClick } = this.props;
- parseClick(e, `/accounts/${id}`);
+ parseClick(e, `/@${acct}`);
}
handleAccountClick = (e) => {
const { status } = this.props;
- this.handleClick(status.getIn(['account', 'id']), e);
+ this.handleClick(status.getIn(['account', 'acct']), e);
}
// Rendering.
handleClick = (e) => {
const { account, parseClick } = this.props;
- parseClick(e, `/accounts/${account.get('id')}`);
+ parseClick(e, `/${account.get('acct')}`);
}
Message = () => {
// load custom emojis
store.dispatch(fetchCustomEmojis());
+const createIdentityContext = state => ({
+ signedIn: !!state.meta.me,
+ accountId: state.meta.me,
+ accessToken: state.meta.access_token,
+});
+
export default class Mastodon extends React.PureComponent {
static propTypes = {
locale: PropTypes.string.isRequired,
};
+ static childContextTypes = {
+ identity: PropTypes.shape({
+ signedIn: PropTypes.bool.isRequired,
+ accountId: PropTypes.string,
+ accessToken: PropTypes.string,
+ }).isRequired,
+ };
+
+ identity = createIdentityContext(initialState);
+
+ getChildContext() {
+ return {
+ identity: this.identity,
+ };
+ }
+
componentDidMount() {
- this.disconnect = store.dispatch(connectUserStream());
+ if (this.identity.signedIn) {
+ this.disconnect = store.dispatch(connectUserStream());
+ }
}
componentWillUnmount () {
<div className='account__action-bar'>
<div className='account__action-bar-links'>
- <NavLink isActive={this.isStatusesPageActive} activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
+ <NavLink isActive={this.isStatusesPageActive} activeClassName='active' className='account__action-bar__tab' to={`/@${account.get('acct')}`}>
<FormattedMessage id='account.posts' defaultMessage='Posts' />
<strong><FormattedNumber value={account.get('statuses_count')} /></strong>
</NavLink>
- <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
+ <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/@${account.get('acct')}/following`}>
<FormattedMessage id='account.follows' defaultMessage='Follows' />
<strong><FormattedNumber value={account.get('following_count')} /></strong>
</NavLink>
- <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
+ <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/@${account.get('acct')}/followers`}>
<FormattedMessage id='account.followers' defaultMessage='Followers' />
<strong>{ account.get('followers_count') < 0 ? '-' : <FormattedNumber value={account.get('followers_count')} /> }</strong>
</NavLink>
import MissingIndicator from 'flavours/glitch/components/missing_indicator';
import { openModal } from 'flavours/glitch/actions/modal';
-const mapStateToProps = (state, props) => ({
- isAccount: !!state.getIn(['accounts', props.params.accountId]),
- attachments: getAccountGallery(state, props.params.accountId),
- isLoading: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'isLoading']),
- hasMore: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'hasMore']),
- suspended: state.getIn(['accounts', props.params.accountId, 'suspended'], false),
-});
+const mapStateToProps = (state, { params: { acct } }) => {
+ const accountId = state.getIn(['accounts_map', acct]);
+
+ if (!accountId) {
+ return {
+ isLoading: true,
+ };
+ }
+
+ return {
+ accountId,
+ isAccount: !!state.getIn(['accounts', accountId]),
+ attachments: getAccountGallery(state, accountId),
+ isLoading: state.getIn(['timelines', `account:${accountId}:media`, 'isLoading']),
+ hasMore: state.getIn(['timelines', `account:${accountId}:media`, 'hasMore']),
+ suspended: state.getIn(['accounts', accountId, 'suspended'], false),
+ };
+};
class LoadMoreMedia extends ImmutablePureComponent {
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
- params: PropTypes.object.isRequired,
+ params: PropTypes.shape({
+ acct: PropTypes.string.isRequired,
+ }).isRequired,
+ accountId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
attachments: ImmutablePropTypes.list.isRequired,
isLoading: PropTypes.bool,
width: 323,
};
+ _load () {
+ const { accountId, dispatch } = this.props;
+
+ dispatch(expandAccountMediaTimeline(accountId));
+ }
+
componentDidMount () {
- this.props.dispatch(fetchAccount(this.props.params.accountId));
- this.props.dispatch(expandAccountMediaTimeline(this.props.params.accountId));
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (accountId) {
+ this._load();
+ } else {
+ dispatch(lookupAccount(acct));
+ }
}
- componentWillReceiveProps (nextProps) {
- if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
- this.props.dispatch(fetchAccount(nextProps.params.accountId));
- this.props.dispatch(expandAccountMediaTimeline(this.props.params.accountId));
+ componentDidUpdate (prevProps) {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (prevProps.accountId !== accountId && accountId) {
+ this._load();
+ } else if (prevProps.params.acct !== acct) {
+ dispatch(lookupAccount(acct));
}
}
}
handleLoadMore = maxId => {
- this.props.dispatch(expandAccountMediaTimeline(this.props.params.accountId, { maxId }));
+ this.props.dispatch(expandAccountMediaTimeline(this.props.accountId, { maxId }));
};
handleLoadOlder = e => {
<ScrollContainer scrollKey='account_gallery'>
<div className='scrollable scrollable--flex' onScroll={this.handleScroll}>
- <HeaderContainer accountId={this.props.params.accountId} />
+ <HeaderContainer accountId={this.props.accountId} />
{suspended ? (
<div className='empty-column-indicator'>
{!hideTabs && (
<div className='account__section-headline'>
- <NavLink exact to={`/accounts/${account.get('id')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
- <NavLink exact to={`/accounts/${account.get('id')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots with replies' /></NavLink>
- <NavLink exact to={`/accounts/${account.get('id')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
+ <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Toots' /></NavLink>
+ <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Toots with replies' /></NavLink>
+ <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
</div>
)}
</div>
e.preventDefault();
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.to.get('id')}`, state);
+ this.context.router.history.push(`/@${this.props.to.get('acct')}`, state);
}
e.stopPropagation();
import { connect } from 'react-redux';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
-import { fetchAccount } from 'flavours/glitch/actions/accounts';
+import { lookupAccount, fetchAccount } from 'flavours/glitch/actions/accounts';
import { expandAccountFeaturedTimeline, expandAccountTimeline } from 'flavours/glitch/actions/timelines';
import StatusList from '../../components/status_list';
import LoadingIndicator from '../../components/loading_indicator';
const emptyList = ImmutableList();
-const mapStateToProps = (state, { params: { accountId }, withReplies = false }) => {
+const mapStateToProps = (state, { params: { acct }, withReplies = false }) => {
+ const accountId = state.getIn(['accounts_map', acct]);
+
+ if (!accountId) {
+ return {
+ isLoading: true,
+ };
+ }
+
const path = withReplies ? `${accountId}:with_replies` : accountId;
return {
+ accountId,
remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
remoteUrl: state.getIn(['accounts', accountId, 'url']),
isAccount: !!state.getIn(['accounts', accountId]),
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
- params: PropTypes.object.isRequired,
+ params: PropTypes.shape({
+ acct: PropTypes.string.isRequired,
+ }).isRequired,
+ accountId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
statusIds: ImmutablePropTypes.list,
featuredStatusIds: ImmutablePropTypes.list,
multiColumn: PropTypes.bool,
};
- componentWillMount () {
- const { params: { accountId }, withReplies } = this.props;
+ _load () {
+ const { accountId, withReplies, dispatch } = this.props;
- this.props.dispatch(fetchAccount(accountId));
- this.props.dispatch(fetchAccountIdentityProofs(accountId));
+ dispatch(fetchAccount(accountId));
+ dispatch(fetchAccountIdentityProofs(accountId));
if (!withReplies) {
- this.props.dispatch(expandAccountFeaturedTimeline(accountId));
+ dispatch(expandAccountFeaturedTimeline(accountId));
+ }
+ dispatch(expandAccountTimeline(accountId, { withReplies }));
+ }
+
+ componentDidMount () {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (accountId) {
+ this._load();
+ } else {
+ dispatch(lookupAccount(acct));
+ }
+ }
+
+ componentDidUpdate (prevProps) {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (prevProps.accountId !== accountId && accountId) {
+ this._load();
+ } else if (prevProps.params.acct !== acct) {
+ dispatch(lookupAccount(acct));
}
- this.props.dispatch(expandAccountTimeline(accountId, { withReplies }));
}
componentWillReceiveProps (nextProps) {
+ const { dispatch } = this.props;
+
if ((nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) || nextProps.withReplies !== this.props.withReplies) {
- this.props.dispatch(fetchAccount(nextProps.params.accountId));
- this.props.dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
+ dispatch(fetchAccount(nextProps.params.accountId));
+ dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
if (!nextProps.withReplies) {
- this.props.dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
+ dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
}
- this.props.dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
+ dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
}
}
}
handleLoadMore = maxId => {
- this.props.dispatch(expandAccountTimeline(this.props.params.accountId, { maxId, withReplies: this.props.withReplies }));
+ this.props.dispatch(expandAccountTimeline(this.props.accountId, { maxId, withReplies: this.props.withReplies }));
}
setRef = c => {
<ProfileColumnHeader onClick={this.handleHeaderClick} multiColumn={multiColumn} />
<StatusList
- prepend={<HeaderContainer accountId={this.props.params.accountId} />}
+ prepend={<HeaderContainer accountId={this.props.accountId} />}
alwaysPrepend
append={remoteMessage}
scrollKey='account_timeline'
<Link
aria-label={intl.formatMessage(messages.home_timeline)}
title={intl.formatMessage(messages.home_timeline)}
- to='/timelines/home'
+ to='/home'
><Icon id='home' /></Link>
))}
{renderForColumn('NOTIFICATIONS', (
<Link
aria-label={intl.formatMessage(messages.community)}
title={intl.formatMessage(messages.community)}
- to='/timelines/public/local'
+ to='/public/local'
><Icon id='users' /></Link>
))}
{renderForColumn('PUBLIC', (
<Link
aria-label={intl.formatMessage(messages.public)}
title={intl.formatMessage(messages.public)}
- to='/timelines/public'
+ to='/public'
><Icon id='globe' /></Link>
))}
<a
render () {
return (
<div className='drawer--account'>
- <Permalink className='avatar' href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`}>
+ <Permalink className='avatar' href={this.props.account.get('url')} to={`/@${this.props.account.get('acct')}`}>
<span style={{ display: 'none' }}>{this.props.account.get('acct')}</span>
<Avatar account={this.props.account} size={48} />
</Permalink>
<div className='navigation-bar__profile'>
- <Permalink className='acct' href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`}>
+ <Permalink className='acct' href={this.props.account.get('url')} to={`/@${this.props.account.get('acct')}`}>
<strong>@{this.props.account.get('acct')}</strong>
</Permalink>
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
- const names = accounts.map(a => <Permalink to={`/accounts/${a.get('id')}`} href={a.get('url')} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Permalink>).reduce((prev, cur) => [prev, ', ', cur]);
+ const names = accounts.map(a => <Permalink to={`/@${a.get('acct')}`} href={a.get('url')} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Permalink>).reduce((prev, cur) => [prev, ', ', cur]);
const handlers = {
reply: this.handleReply,
<Permalink
className='directory__card__bar__name'
href={account.get('url')}
- to={`/accounts/${account.get('id')}`}
+ to={`/@${account.get('acct')}`}
>
<Avatar account={account} size={48} />
<DisplayName account={account} />
return (
<div className='account-authorize__wrapper'>
<div className='account-authorize'>
- <Permalink href={account.get('url')} to={`/accounts/${account.get('id')}`} className='detailed-status__display-name'>
+ <Permalink href={account.get('url')} to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
<div className='account-authorize__avatar'><Avatar account={account} size={48} /></div>
<DisplayName account={account} />
</Permalink>
import { debounce } from 'lodash';
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
import {
- fetchAccount,
+ lookupAccount,
fetchFollowers,
expandFollowers,
} from 'flavours/glitch/actions/accounts';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import TimelineHint from 'flavours/glitch/components/timeline_hint';
-const mapStateToProps = (state, props) => ({
- remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
- remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
- isAccount: !!state.getIn(['accounts', props.params.accountId]),
- accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
- hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']),
- isLoading: state.getIn(['user_lists', 'followers', props.params.accountId, 'isLoading'], true),
-});
+const mapStateToProps = (state, { params: { acct } }) => {
+ const accountId = state.getIn(['accounts_map', acct]);
+
+ if (!accountId) {
+ return {
+ isLoading: true,
+ };
+ }
+
+ return {
+ accountId,
+ remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
+ remoteUrl: state.getIn(['accounts', accountId, 'url']),
+ isAccount: !!state.getIn(['accounts', accountId]),
+ accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
+ hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
+ isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true),
+ };
+};
const RemoteHint = ({ url }) => (
<TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.followers' defaultMessage='Followers' />} />
class Followers extends ImmutablePureComponent {
static propTypes = {
- params: PropTypes.object.isRequired,
+ params: PropTypes.shape({
+ acct: PropTypes.string.isRequired,
+ }).isRequired,
+ accountId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.list,
hasMore: PropTypes.bool,
multiColumn: PropTypes.bool,
};
- componentWillMount () {
- if (!this.props.accountIds) {
- this.props.dispatch(fetchAccount(this.props.params.accountId));
- this.props.dispatch(fetchFollowers(this.props.params.accountId));
- }
+ _load () {
+ const { accountId, dispatch } = this.props;
+
+ dispatch(fetchFollowers(accountId));
}
- componentWillReceiveProps (nextProps) {
- if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
- this.props.dispatch(fetchAccount(nextProps.params.accountId));
- this.props.dispatch(fetchFollowers(nextProps.params.accountId));
+ componentDidMount () {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (accountId) {
+ this._load();
+ } else {
+ dispatch(lookupAccount(acct));
}
}
- handleHeaderClick = () => {
- this.column.scrollTop();
+ componentDidUpdate (prevProps) {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (prevProps.accountId !== accountId && accountId) {
+ this._load();
+ } else if (prevProps.params.acct !== acct) {
+ dispatch(lookupAccount(acct));
+ }
}
handleLoadMore = debounce(() => {
- this.props.dispatch(expandFollowers(this.props.params.accountId));
+ this.props.dispatch(expandFollowers(this.props.accountId));
}, 300, { leading: true });
setRef = c => {
this.column = c;
}
+ handleHeaderClick = () => {
+ this.column.scrollTop();
+ }
+
render () {
const { accountIds, hasMore, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
hasMore={hasMore}
isLoading={isLoading}
onLoadMore={this.handleLoadMore}
- prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
+ prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
alwaysPrepend
append={remoteMessage}
emptyMessage={emptyMessage}
import { debounce } from 'lodash';
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
import {
- fetchAccount,
+ lookupAccount,
fetchFollowing,
expandFollowing,
} from 'flavours/glitch/actions/accounts';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import TimelineHint from 'flavours/glitch/components/timeline_hint';
-const mapStateToProps = (state, props) => ({
- remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
- remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
- isAccount: !!state.getIn(['accounts', props.params.accountId]),
- accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
- hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
- isLoading: state.getIn(['user_lists', 'following', props.params.accountId, 'isLoading'], true),
-});
+const mapStateToProps = (state, { params: { acct } }) => {
+ const accountId = state.getIn(['accounts_map', acct]);
+
+ if (!accountId) {
+ return {
+ isLoading: true,
+ };
+ }
+
+ return {
+ accountId,
+ remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
+ remoteUrl: state.getIn(['accounts', accountId, 'url']),
+ isAccount: !!state.getIn(['accounts', accountId]),
+ accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
+ hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
+ isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true),
+ };
+};
const RemoteHint = ({ url }) => (
<TimelineHint url={url} resource={<FormattedMessage id='timeline_hint.resources.follows' defaultMessage='Follows' />} />
class Following extends ImmutablePureComponent {
static propTypes = {
- params: PropTypes.object.isRequired,
+ params: PropTypes.shape({
+ acct: PropTypes.string.isRequired,
+ }).isRequired,
+ accountId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
accountIds: ImmutablePropTypes.list,
hasMore: PropTypes.bool,
multiColumn: PropTypes.bool,
};
- componentWillMount () {
- if (!this.props.accountIds) {
- this.props.dispatch(fetchAccount(this.props.params.accountId));
- this.props.dispatch(fetchFollowing(this.props.params.accountId));
- }
+ _load () {
+ const { accountId, dispatch } = this.props;
+
+ dispatch(fetchFollowing(accountId));
}
- componentWillReceiveProps (nextProps) {
- if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
- this.props.dispatch(fetchAccount(nextProps.params.accountId));
- this.props.dispatch(fetchFollowing(nextProps.params.accountId));
+ componentDidMount () {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (accountId) {
+ this._load();
+ } else {
+ dispatch(lookupAccount(acct));
}
}
- handleHeaderClick = () => {
- this.column.scrollTop();
+ componentDidUpdate (prevProps) {
+ const { params: { acct }, accountId, dispatch } = this.props;
+
+ if (prevProps.accountId !== accountId && accountId) {
+ this._load();
+ } else if (prevProps.params.acct !== acct) {
+ dispatch(lookupAccount(acct));
+ }
}
handleLoadMore = debounce(() => {
- this.props.dispatch(expandFollowing(this.props.params.accountId));
+ this.props.dispatch(expandFollowing(this.props.accountId));
}, 300, { leading: true });
setRef = c => {
this.column = c;
}
+ handleHeaderClick = () => {
+ this.column.scrollTop();
+ }
+
render () {
const { accountIds, hasMore, isAccount, multiColumn, isLoading, remote, remoteUrl } = this.props;
hasMore={hasMore}
isLoading={isLoading}
onLoadMore={this.handleLoadMore}
- prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
+ prepend={<HeaderContainer accountId={this.props.accountId} hideTabs />}
alwaysPrepend
append={remoteMessage}
emptyMessage={emptyMessage}
onMentionClick = (mention, e) => {
if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
e.preventDefault();
- this.context.router.history.push(`/accounts/${mention.get('id')}`);
+ this.context.router.history.push(`/@${mention.get('acct')}`);
}
}
if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
e.preventDefault();
- this.context.router.history.push(`/timelines/tag/${hashtag}`);
+ this.context.router.history.push(`/tags/${hashtag}`);
}
}
onStatusClick = (status, e) => {
if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
e.preventDefault();
- this.context.router.history.push(`/statuses/${status.get('id')}`);
+ this.context.router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
}
}
const { fetchFollowRequests, multiColumn } = this.props;
if (!multiColumn && window.innerWidth >= NAVIGATION_PANEL_BREAKPOINT) {
- this.context.router.history.replace('/timelines/home');
+ this.context.router.history.replace('/home');
return;
}
if (multiColumn) {
if (!columns.find(item => item.get('id') === 'HOME')) {
- navItems.push(<ColumnLink key='0' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/timelines/home' />);
+ navItems.push(<ColumnLink key='0' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/home' />);
}
if (!columns.find(item => item.get('id') === 'NOTIFICATIONS')) {
}
if (!columns.find(item => item.get('id') === 'COMMUNITY')) {
- navItems.push(<ColumnLink key='2' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />);
+ navItems.push(<ColumnLink key='2' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/public/local' />);
}
if (!columns.find(item => item.get('id') === 'PUBLIC')) {
- navItems.push(<ColumnLink key='3' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />);
+ navItems.push(<ColumnLink key='3' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/public' />);
}
}
if (!multiColumn || !columns.find(item => item.get('id') === 'DIRECT')) {
- navItems.push(<ColumnLink key='4' icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />);
+ navItems.push(<ColumnLink key='4' icon='envelope' text={intl.formatMessage(messages.direct)} to='/conversations' />);
}
if (!multiColumn || !columns.find(item => item.get('id') === 'BOOKMARKS')) {
<div key='9'>
<ColumnLink key='10' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
{lists.filter(list => !columns.find(item => item.get('id') === 'LIST' && item.getIn(['params', 'id']) === list.get('id'))).map(list =>
- <ColumnLink key={(11 + Number(list.get('id'))).toString()} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
+ <ColumnLink key={(11 + Number(list.get('id'))).toString()} to={`/lists/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
)}
</div>,
]);
bindToDocument={!multiColumn}
>
{lists.map(list =>
- <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />,
+ <ColumnLink key={list.get('id')} to={`/lists/${list.get('id')}`} icon='list-ul' text={list.get('title')} />,
)}
</ScrollableList>
</Column>
handleOpenProfile = () => {
const { notification } = this.props;
- this.context.router.history.push(`/accounts/${notification.getIn(['account', 'id'])}`);
+ this.context.router.history.push(`/@${notification.getIn(['account', 'acct'])}`);
}
handleMention = e => {
className='notification__display-name'
href={account.get('url')}
title={account.get('acct')}
- to={`/accounts/${account.get('id')}`}
+ to={`/@${account.get('acct')}`}
dangerouslySetInnerHTML={{ __html: displayName }}
/></bdi>
);
handleOpenProfile = () => {
const { notification } = this.props;
- this.context.router.history.push(`/accounts/${notification.getIn(['account', 'id'])}`);
+ this.context.router.history.push(`/@${notification.getIn(['account', 'acct'])}`);
}
handleMention = e => {
className='notification__display-name'
href={account.get('url')}
title={account.get('acct')}
- to={`/accounts/${account.get('id')}`}
+ to={`/@${account.get('acct')}`}
dangerouslySetInnerHTML={{ __html: displayName }}
/></bdi>
);
<div className='account'>
<div className='account__wrapper'>
- <Permalink key={account.get('id')} className='account__display-name' title={account.get('acct')} href={account.get('url')} to={`/accounts/${account.get('id')}`}>
+ <Permalink key={account.get('id')} className='account__display-name' 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} />
</Permalink>
onClose();
}
- router.history.push(`/statuses/${status.get('id')}`);
+ router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
}
render () {
return (
<div className='picture-in-picture__header'>
- <Link to={`/statuses/${statusId}`} className='picture-in-picture__header__account'>
+ <Link to={`/@${account.get('acct')}/${statusId}`} className='picture-in-picture__header__account'>
<Avatar account={account} size={36} />
<DisplayName account={account} />
</Link>
e.preventDefault();
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`, state);
}
e.stopPropagation();
reblogLink = (
<React.Fragment>
<React.Fragment> · </React.Fragment>
- <Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'>
+ <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
<Icon id={reblogIcon} />
<span className='detailed-status__reblogs'>
<AnimatedNumber value={status.get('reblogs_count')} />
if (this.context.router) {
favouriteLink = (
- <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
+ <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
<Icon id='star' />
<span className='detailed-status__favorites'>
<AnimatedNumber value={status.get('favourites_count')} />
handleHotkeyOpenProfile = () => {
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`, state);
}
handleMoveUp = id => {
this.props.onClose();
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`, state);
}
}
const columnIndex = getIndex(this.context.router.history.location.pathname);
if (singleColumn) {
- const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
+ const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/publish' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><Icon id='pencil' /></Link>;
const content = columnIndex !== -1 ? (
<ReactSwipeableViews key='content' hysteresis={0.2} threshold={15} index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }} disabled={!swipeToChangeColumns}>
this.props.onClose();
let state = {...this.context.router.history.location.state};
state.mastodonBackSteps = (state.mastodonBackSteps || 0) + 1;
- this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`, state);
+ this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`, state);
}
}
<hr />
{lists.map(list => (
- <NavLink key={list.get('id')} className='column-link column-link--transparent' strict to={`/timelines/list/${list.get('id')}`}><Icon className='column-link__icon' id='list-ul' fixedWidth />{list.get('title')}</NavLink>
+ <NavLink key={list.get('id')} className='column-link column-link--transparent' strict to={`/lists/${list.get('id')}`}><Icon className='column-link__icon' id='list-ul' fixedWidth />{list.get('title')}</NavLink>
))}
</div>
);
}));
};
- handleStatusClick = e => {
- if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
- e.preventDefault();
- this.context.router.history.push(`/statuses/${this.props.statusId}`);
- }
-
- this._sendBackgroundColor();
- }
-
componentDidUpdate (prevProps, prevState) {
if (prevState.index !== this.state.index) {
this._sendBackgroundColor();
const NavigationPanel = ({ onOpenSettings }) => (
<div className='navigation-panel'>
- <NavLink className='column-link column-link--transparent' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon className='column-link__icon' id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
+ <NavLink className='column-link column-link--transparent' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon className='column-link__icon' id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon className='column-link__icon' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
<FollowRequestsNavLink />
- <NavLink className='column-link column-link--transparent' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
- <NavLink className='column-link column-link--transparent' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
- <NavLink className='column-link column-link--transparent' to='/timelines/direct'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
+ <NavLink className='column-link column-link--transparent' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon className='column-link__icon' id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
+ <NavLink className='column-link column-link--transparent' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon className='column-link__icon' id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
+ <NavLink className='column-link column-link--transparent' to='/conversations'><Icon className='column-link__icon' id='envelope' fixedWidth /><FormattedMessage id='navigation_bar.direct' defaultMessage='Direct messages' /></NavLink>
<NavLink className='column-link column-link--transparent' to='/bookmarks'><Icon className='column-link__icon' id='bookmark' fixedWidth /><FormattedMessage id='navigation_bar.bookmarks' defaultMessage='Bookmarks' /></NavLink>
{profile_directory && <NavLink className='column-link column-link--transparent' to='/directory'><Icon className='column-link__icon' id='address-book-o' fixedWidth /><FormattedMessage id='getting_started.directory' defaultMessage='Profile directory' /></NavLink>}
<NavLink className='column-link column-link--transparent' to='/lists'><Icon className='column-link__icon' id='list-ul' fixedWidth /><FormattedMessage id='navigation_bar.lists' defaultMessage='Lists' /></NavLink>
</div>
</div>
- <p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.' values={{ illustration: <Permalink to='/timelines/tag/illustration' href='/tags/illustration'>#illustration</Permalink>, introductions: <Permalink to='/timelines/tag/introductions' href='/tags/introductions'>#introductions</Permalink> }} /></p>
+ <p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.' values={{ illustration: <Permalink to='/tag/illustration' href='/tags/illustration'>#illustration</Permalink>, introductions: <Permalink to='/tag/introductions' href='/tags/introductions'>#introductions</Permalink> }} /></p>
<p><FormattedMessage id='onboarding.page_three.profile' defaultMessage='Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.' /></p>
</div>
);
if (admin) {
adminSection = (
<p>
- <FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} />
+ <FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/@${admin.get('acct')}`}>@{admin.get('acct')}</Permalink> }} />
<br />
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{ domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }} />
</p>
import NotificationsCounterIcon from './notifications_counter_icon';
export const links = [
- <NavLink className='tabs-bar__link' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
+ <NavLink className='tabs-bar__link' to='/home' data-preview-title-id='column.home' data-preview-icon='home' ><Icon id='home' fixedWidth /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
<NavLink className='tabs-bar__link' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><NotificationsCounterIcon /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
- <NavLink className='tabs-bar__link' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
- <NavLink className='tabs-bar__link' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
+ <NavLink className='tabs-bar__link' to='/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><Icon id='users' fixedWidth /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
+ <NavLink className='tabs-bar__link' exact to='/public' data-preview-title-id='column.public' data-preview-icon='globe' ><Icon id='globe' fixedWidth /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
<NavLink className='tabs-bar__link optional' to='/search' data-preview-title-id='tabs_bar.search' data-preview-icon='bell' ><Icon id='search' fixedWidth /><FormattedMessage id='tabs_bar.search' defaultMessage='Search' /></NavLink>,
<NavLink className='tabs-bar__link' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='bars' ><Icon id='bars' fixedWidth /></NavLink>,
];
hicolorPrivacyIcons: state.getIn(['local_settings', 'hicolor_privacy_icons']),
moved: state.getIn(['accounts', me, 'moved']) && state.getIn(['accounts', state.getIn(['accounts', me, 'moved'])]),
firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
+ username: state.getIn(['accounts', me, 'username']),
});
const keyMap = {
render () {
const { children, navbarUnder } = this.props;
const singleColumn = this.state.mobile;
- const redirect = singleColumn ? <Redirect from='/' to='/timelines/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
+ const redirect = singleColumn ? <Redirect from='/' to='/home' exact /> : <Redirect from='/' to='/getting-started' exact />;
return (
<ColumnsAreaContainer ref={this.setRef} singleColumn={singleColumn} navbarUnder={navbarUnder}>
{redirect}
<WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
<WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
- <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
- <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
- <WrappedRoute path='/timelines/public/local' exact component={CommunityTimeline} content={children} />
- <WrappedRoute path='/timelines/direct' component={DirectTimeline} content={children} />
- <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
- <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
+ <WrappedRoute path='/home' component={HomeTimeline} content={children} />
+ <WrappedRoute path='/public' exact component={PublicTimeline} content={children} />
+ <WrappedRoute path='/public/local' exact component={CommunityTimeline} content={children} />
+ <WrappedRoute path='/conversations' component={DirectTimeline} content={children} />
+ <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
+ <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
<WrappedRoute path='/notifications' component={Notifications} content={children} />
<WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
+
<WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
<WrappedRoute path='/start' component={FollowRecommendations} content={children} />
<WrappedRoute path='/search' component={Search} content={children} />
<WrappedRoute path='/directory' component={Directory} content={children} />
+ <WrappedRoute path='/publish' component={Compose} content={children} />
- <WrappedRoute path='/statuses/new' component={Compose} content={children} />
- <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
- <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
- <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />
-
- <WrappedRoute path='/accounts/:accountId' exact component={AccountTimeline} content={children} />
- <WrappedRoute path='/accounts/:accountId/with_replies' component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
- <WrappedRoute path='/accounts/:accountId/followers' component={Followers} content={children} />
- <WrappedRoute path='/accounts/:accountId/following' component={Following} content={children} />
- <WrappedRoute path='/accounts/:accountId/media' component={AccountGallery} content={children} />
+ <WrappedRoute path='/@:acct' exact component={AccountTimeline} content={children} />
+ <WrappedRoute path='/@:acct/with_replies' component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
+ <WrappedRoute path='/@:acct/followers' component={Followers} content={children} />
+ <WrappedRoute path='/@:acct/following' component={Following} content={children} />
+ <WrappedRoute path='/@:acct/media' component={AccountGallery} content={children} />
+ <WrappedRoute path='/@:acct/:statusId' exact component={Status} content={children} />
+ <WrappedRoute path='/@:acct/:statusId/reblogs' component={Reblogs} content={children} />
+ <WrappedRoute path='/@:acct/:statusId/favourites' component={Favourites} content={children} />
<WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
<WrappedRoute path='/blocks' component={Blocks} content={children} />
showFaviconBadge: PropTypes.bool,
moved: PropTypes.map,
firstLaunch: PropTypes.bool,
+ username: PropTypes.string,
};
state = {
}
handleHotkeyGoToHome = () => {
- this.props.history.push('/timelines/home');
+ this.props.history.push('/home');
}
handleHotkeyGoToNotifications = () => {
}
handleHotkeyGoToLocal = () => {
- this.props.history.push('/timelines/public/local');
+ this.props.history.push('/public/local');
}
handleHotkeyGoToFederated = () => {
- this.props.history.push('/timelines/public');
+ this.props.history.push('/public');
}
handleHotkeyGoToDirect = () => {
- this.props.history.push('/timelines/direct');
+ this.props.history.push('/conversations');
}
handleHotkeyGoToStart = () => {
}
handleHotkeyGoToProfile = () => {
- this.props.history.push(`/accounts/${me}`);
+ this.props.history.push(`/@${this.props.username}`);
}
handleHotkeyGoToBlocked = () => {
id='moved_to_warning'
defaultMessage='This account is marked as moved to {moved_to_link}, and may thus not accept new follows.'
values={{ moved_to_link: (
- <PermaLink href={moved.get('url')} to={`/accounts/${moved.get('id')}`}>
+ <PermaLink href={moved.get('url')} to={`/@${moved.get('acct')}`}>
@{moved.get('acct')}
</PermaLink>
)}}
--- /dev/null
+import { ACCOUNT_IMPORT, ACCOUNTS_IMPORT } from '../actions/importer';
+import { Map as ImmutableMap } from 'immutable';
+
+const initialState = ImmutableMap();
+
+export default function accountsMap(state = initialState, action) {
+ switch(action.type) {
+ case ACCOUNT_IMPORT:
+ return state.set(action.account.acct, action.account.id);
+ case ACCOUNTS_IMPORT:
+ return state.withMutations(map => action.accounts.forEach(account => map.set(account.acct, account.id)));
+ default:
+ return state;
+ }
+};
import markers from './markers';
import account_notes from './account_notes';
import picture_in_picture from './picture_in_picture';
+import accounts_map from './accounts_map';
const reducers = {
announcements,
status_lists,
accounts,
accounts_counters,
+ accounts_map,
statuses,
relationships,
settings,
return LinkHeader.parse(value);
};
-let csrfHeader = {};
+const csrfHeader = {};
-function setCSRFHeader() {
+const setCSRFHeader = () => {
const csrfToken = document.querySelector('meta[name=csrf-token]');
+
if (csrfToken) {
csrfHeader['X-CSRF-Token'] = csrfToken.content;
}
-}
+};
ready(setCSRFHeader);
+const authorizationHeaderFromState = getState => {
+ const accessToken = getState && getState().getIn(['meta', 'access_token'], '');
+
+ if (!accessToken) {
+ return {};
+ }
+
+ return {
+ 'Authorization': `Bearer ${accessToken}`,
+ };
+};
+
export default getState => axios.create({
- headers: Object.assign(csrfHeader, getState ? {
- 'Authorization': `Bearer ${getState().getIn(['meta', 'access_token'], '')}`,
- } : {}),
+ headers: {
+ ...csrfHeader,
+ ...authorizationHeaderFromState(getState),
+ },
transformResponse: [function (data) {
try {
cat aescling's git repositories / mastodon.git / commitdiff