diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-01 11:11:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 11:11:35 +0100 |
| commit | 3e0ed36e8ede7f1994ab9c46c4cb86e613569440 (patch) | |
| tree | 20715fa4618d869d897a8ec833f20be14658f167 | |
| parent | 5ecbf4d4c044525af866244758ac7a9e5db3fc7f (diff) | |
Fix home timeline perpetually reloading when empty (#10130)
Regression from #6876
| -rw-r--r-- | app/javascript/mastodon/features/home_timeline/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/reducers/timelines.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js index 3ffa7a681..097f91c16 100644 --- a/app/javascript/mastodon/features/home_timeline/index.js +++ b/app/javascript/mastodon/features/home_timeline/index.js @@ -16,7 +16,7 @@ const messages = defineMessages({ const mapStateToProps = state => ({ hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0, - isPartial: state.getIn(['timelines', 'home', 'items', 0], null) === null, + isPartial: state.getIn(['timelines', 'home', 'isPartial']), }); export default @connect(mapStateToProps) diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js index 1f7ece812..38af9cd09 100644 --- a/app/javascript/mastodon/reducers/timelines.js +++ b/app/javascript/mastodon/reducers/timelines.js @@ -29,6 +29,8 @@ const initialTimeline = ImmutableMap({ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => { return state.update(timeline, initialTimeline, map => map.withMutations(mMap => { mMap.set('isLoading', false); + mMap.set('isPartial', isPartial); + if (!next && !isLoadingRecent) mMap.set('hasMore', false); if (!statuses.isEmpty()) { |