diff options
Diffstat (limited to 'app/javascript/mastodon/features/account_gallery/index.js')
-rw-r--r-- | app/javascript/mastodon/features/account_gallery/index.js | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js index a15419ac7..fcbee3c89 100644 --- a/app/javascript/mastodon/features/account_gallery/index.js +++ b/app/javascript/mastodon/features/account_gallery/index.js @@ -2,11 +2,8 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; -import { - fetchAccount, - fetchAccountMediaTimeline, - expandAccountMediaTimeline, -} from '../../actions/accounts'; +import { fetchAccount } from '../../actions/accounts'; +import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from '../../actions/timelines'; import LoadingIndicator from '../../components/loading_indicator'; import Column from '../ui/components/column'; import ColumnBackButton from '../../components/column_back_button'; @@ -21,8 +18,8 @@ import LoadMore from '../../components/load_more'; const mapStateToProps = (state, props) => ({ medias: getAccountGallery(state, Number(props.params.accountId)), - isLoading: state.getIn(['timelines', 'accounts_media_timelines', Number(props.params.accountId), 'isLoading']), - hasMore: !!state.getIn(['timelines', 'accounts_media_timelines', Number(props.params.accountId), 'next']), + isLoading: state.getIn(['timelines', `account:${Number(props.params.accountId)}:media`, 'isLoading']), + hasMore: !!state.getIn(['timelines', `account:${Number(props.params.accountId)}:media`, 'next']), autoPlayGif: state.getIn(['meta', 'auto_play_gif']), }); @@ -39,13 +36,13 @@ class AccountGallery extends ImmutablePureComponent { componentDidMount () { this.props.dispatch(fetchAccount(Number(this.props.params.accountId))); - this.props.dispatch(fetchAccountMediaTimeline(Number(this.props.params.accountId))); + this.props.dispatch(refreshAccountMediaTimeline(Number(this.props.params.accountId))); } componentWillReceiveProps (nextProps) { if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) { this.props.dispatch(fetchAccount(Number(nextProps.params.accountId))); - this.props.dispatch(fetchAccountMediaTimeline(Number(this.props.params.accountId))); + this.props.dispatch(refreshAccountMediaTimeline(Number(this.props.params.accountId))); } } |