diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-13 16:44:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-13 16:44:16 +0200 |
commit | 48f7a587999740709f234e1ee004994de0059ab3 (patch) | |
tree | 5d19bdfa34d8d78aefd31835b15905eed62f9558 /app/javascript/mastodon/features/home_timeline | |
parent | 388d093beb2950553f3806a72e72afe77ecc23ac (diff) |
Do not try to guess why home timeline is empty in web UI (#5370)
* Do not try to guess why home timeline is empty in web UI * Fix style issue
Diffstat (limited to 'app/javascript/mastodon/features/home_timeline')
-rw-r--r-- | app/javascript/mastodon/features/home_timeline/index.js | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js index be1e2d78c..a4bc60fac 100644 --- a/app/javascript/mastodon/features/home_timeline/index.js +++ b/app/javascript/mastodon/features/home_timeline/index.js @@ -16,7 +16,6 @@ const messages = defineMessages({ const mapStateToProps = state => ({ hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0, - hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0, }); @connect(mapStateToProps) @@ -27,7 +26,6 @@ export default class HomeTimeline extends React.PureComponent { dispatch: PropTypes.func.isRequired, intl: PropTypes.object.isRequired, hasUnread: PropTypes.bool, - hasFollows: PropTypes.bool, columnId: PropTypes.string, multiColumn: PropTypes.bool, }; @@ -60,17 +58,9 @@ export default class HomeTimeline extends React.PureComponent { } render () { - const { intl, hasUnread, hasFollows, columnId, multiColumn } = this.props; + const { intl, hasUnread, columnId, multiColumn } = this.props; const pinned = !!columnId; - let emptyMessage; - - if (hasFollows) { - emptyMessage = <FormattedMessage id='empty_column.home.inactivity' defaultMessage='Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon.' />; - } else { - emptyMessage = <FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />; - } - return ( <Column ref={this.setRef}> <ColumnHeader @@ -91,7 +81,7 @@ export default class HomeTimeline extends React.PureComponent { scrollKey={`home_timeline-${columnId}`} loadMore={this.handleLoadMore} timelineId='home' - emptyMessage={emptyMessage} + emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty! Visit {public} or use search to get started and meet other users.' values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />} /> </Column> ); |