mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
62bafa20a1
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commitbd02ec6daa
. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit9745de883b
. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup frombd02ec6daa
* Refactor by adding `without_blocking` scope
100 lines
3.8 KiB
JavaScript
100 lines
3.8 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import { fetchAccount } from '../../actions/accounts';
|
|
import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines';
|
|
import StatusList from '../../components/status_list';
|
|
import LoadingIndicator from '../../components/loading_indicator';
|
|
import Column from '../ui/components/column';
|
|
import HeaderContainer from './containers/header_container';
|
|
import ColumnBackButton from '../../components/column_back_button';
|
|
import { List as ImmutableList } from 'immutable';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
import { FormattedMessage } from 'react-intl';
|
|
import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';
|
|
|
|
const mapStateToProps = (state, { params: { accountId }, withReplies = false }) => {
|
|
const path = withReplies ? `${accountId}:with_replies` : accountId;
|
|
|
|
return {
|
|
statusIds: state.getIn(['timelines', `account:${path}`, 'items'], ImmutableList()),
|
|
featuredStatusIds: withReplies ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], ImmutableList()),
|
|
isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']),
|
|
hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']),
|
|
};
|
|
};
|
|
|
|
export default @connect(mapStateToProps)
|
|
class AccountTimeline extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
params: PropTypes.object.isRequired,
|
|
dispatch: PropTypes.func.isRequired,
|
|
shouldUpdateScroll: PropTypes.func,
|
|
statusIds: ImmutablePropTypes.list,
|
|
featuredStatusIds: ImmutablePropTypes.list,
|
|
isLoading: PropTypes.bool,
|
|
hasMore: PropTypes.bool,
|
|
withReplies: PropTypes.bool,
|
|
};
|
|
|
|
componentWillMount () {
|
|
const { params: { accountId }, withReplies } = this.props;
|
|
|
|
this.props.dispatch(fetchAccount(accountId));
|
|
this.props.dispatch(fetchAccountIdentityProofs(accountId));
|
|
if (!withReplies) {
|
|
this.props.dispatch(expandAccountFeaturedTimeline(accountId));
|
|
}
|
|
this.props.dispatch(expandAccountTimeline(accountId, { withReplies }));
|
|
}
|
|
|
|
componentWillReceiveProps (nextProps) {
|
|
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));
|
|
if (!nextProps.withReplies) {
|
|
this.props.dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
|
|
}
|
|
this.props.dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
|
|
}
|
|
}
|
|
|
|
handleLoadMore = maxId => {
|
|
this.props.dispatch(expandAccountTimeline(this.props.params.accountId, { maxId, withReplies: this.props.withReplies }));
|
|
}
|
|
|
|
render () {
|
|
const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore } = this.props;
|
|
|
|
if (!statusIds && isLoading) {
|
|
return (
|
|
<Column>
|
|
<LoadingIndicator />
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Column>
|
|
<ColumnBackButton />
|
|
|
|
<StatusList
|
|
prepend={<HeaderContainer accountId={this.props.params.accountId} />}
|
|
alwaysPrepend
|
|
scrollKey='account_timeline'
|
|
statusIds={statusIds}
|
|
featuredStatusIds={featuredStatusIds}
|
|
isLoading={isLoading}
|
|
hasMore={hasMore}
|
|
onLoadMore={this.handleLoadMore}
|
|
shouldUpdateScroll={shouldUpdateScroll}
|
|
emptyMessage={<FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />}
|
|
/>
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
}
|