Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix “load more” adding older toots/notifications to pending items (#11883)

Browse source
This commit is contained in:
ThibG 2019-09-18 11:27:10 +02:00 • committed by Eugen Rochko
parent 0e6390753d
commit 577706987d
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ const normalizeNotification = (state, notification, usePendingItems) => {
});
};
const expandNormalizedNotifications = (state, notifications, next, usePendingItems) => {
const expandNormalizedNotifications = (state, notifications, next, isLoadingRecent, usePendingItems) => {
let items = ImmutableList();
notifications.forEach((n, i) => {
@ -63,7 +63,7 @@ const expandNormalizedNotifications = (state, notifications, next, usePendingIte
return state.withMutations(mutable => {
if (!items.isEmpty()) {
usePendingItems = usePendingItems || !mutable.get('top') || !mutable.get('pendingItems').isEmpty();
usePendingItems = isLoadingRecent && (usePendingItems || !mutable.get('top') || !mutable.get('pendingItems').isEmpty());
mutable.update(usePendingItems ? 'pendingItems' : 'items', list => {
const lastIndex = 1 + list.findLastIndex(
@ -119,7 +119,7 @@ export default function notifications(state = initialState, action) {
case NOTIFICATIONS_UPDATE:
return normalizeNotification(state, action.notification, action.usePendingItems);
case NOTIFICATIONS_EXPAND_SUCCESS:
return expandNormalizedNotifications(state, action.notifications, action.next, action.usePendingItems);
return expandNormalizedNotifications(state, action.notifications, action.next, action.isLoadingRecent, action.usePendingItems);
case ACCOUNT_BLOCK_SUCCESS:
return filterNotifications(state, [action.relationship.id]);
case ACCOUNT_MUTE_SUCCESS: