Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix timeline pagination in the WebUI (#9516)

Browse source 
The `hasMore` property of timelines in redux store was set whenever an API
request returned only one page of results, *even* if the query only requested
newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to
false whenever fetching new toots in a timeline, which happens each time
an account's timeline or media gallery is visited.
This commit is contained in:
ThibG 2018-12-14 01:41:38 +01:00 • committed by Eugen Rochko
parent 6eece70fca
commit f20c0b8507
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/reducers/timelines.js
View file

@ -26,10 +26,10 @@ const initialTimeline = ImmutableMap({
items: ImmutableList(),
});
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial) => {
const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
mMap.set('isLoading', false);
if (!next) mMap.set('hasMore', false);
if (!next && !isLoadingRecent) mMap.set('hasMore', false);
if (!statuses.isEmpty()) {
mMap.update('items', ImmutableList(), oldIds => {
@ -126,7 +126,7 @@ export default function timelines(state = initialState, action) {
case TIMELINE_EXPAND_FAIL:
return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
case TIMELINE_EXPAND_SUCCESS:
return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial);
return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent);
case TIMELINE_UPDATE:
return updateTimeline(state, action.timeline, fromJS(action.status));
case TIMELINE_DELETE: