hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix load more on account timelines (regression from #3311) (#3475) 

This prevents `next` state from being overridden on the loading *new* statuses.
signup-info-prompt
unarist 2017-05-31 22:30:26 +09:00 committed by Eugen Rochko
parent 0e12a8dab9
commit e49dc6a06e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/actions/accounts.js
View File

@ -107,7 +107,9 @@ export function fetchAccountTimeline(id, replace = false) {
let params = {}; let params = {};
let skipLoading = false; let skipLoading = false;
if (newestId !== null && !replace) { replace = replace || newestId === null;
if (!replace) {
params.since_id = newestId; params.since_id = newestId;
skipLoading = true; skipLoading = true;
} }
@ -131,7 +133,9 @@ export function fetchAccountMediaTimeline(id, replace = false) {
let params = { only_media: 'true', limit: 12 }; let params = { only_media: 'true', limit: 12 };
let skipLoading = false; let skipLoading = false;
if (newestId !== null && !replace) { replace = replace || newestId === null;
if (!replace) {
params.since_id = newestId; params.since_id = newestId;
skipLoading = true; skipLoading = true;
} }

4
app/javascript/mastodon/reducers/timelines.js
View File

@ -138,7 +138,7 @@ const normalizeAccountTimeline = (state, accountId, statuses, replace, next) =>
return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map return state.updateIn(['accounts_timelines', accountId], Immutable.Map(), map => map
.set('isLoading', false) .set('isLoading', false)
.set('loaded', true) .set('loaded', true)
.set('next', next) .update('next', null, v => replace ? next : v)
.update('items', Immutable.List(), list => (replace ? ids : ids.concat(list)))); .update('items', Immutable.List(), list => (replace ? ids : ids.concat(list))));
}; };
@ -152,7 +152,7 @@ const normalizeAccountMediaTimeline = (state, accountId, statuses, replace, next
return state.updateIn(['accounts_media_timelines', accountId], Immutable.Map(), map => map return state.updateIn(['accounts_media_timelines', accountId], Immutable.Map(), map => map
.set('isLoading', false) .set('isLoading', false)
.set('next', next) .update('next', null, v => replace ? next : v)
.update('items', Immutable.List(), list => (replace ? ids : ids.concat(list)))); .update('items', Immutable.List(), list => (replace ? ids : ids.concat(list))));
}; };