tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Change timelines to add new items to pending items when scrolled down

Browse Source 
Port d256901f60 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
ThibG
2019-09-16 19:39:44 +02:00
committed by Thibaut Girka
parent 840c36f320
commit 8b00cf519e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/reducers/notifications.js
View File

@@ -50,12 +50,12 @@ const notificationToMap = (state, notification) => ImmutableMap({
});
const normalizeNotification = (state, notification, usePendingItems) => {
if (usePendingItems) {
const top = !shouldCountUnreadNotifications(state);
if (usePendingItems || !top || !state.get('pendingItems').isEmpty()) {
return state.update('pendingItems', list => list.unshift(notificationToMap(state, notification))).update('unread', unread => unread + 1);
}
const top = !shouldCountUnreadNotifications(state);
if (top) {
state = state.set('lastReadId', notification.id);
} else {
@@ -82,6 +82,8 @@ const expandNormalizedNotifications = (state, notifications, next, usePendingIte
return state.withMutations(mutable => {
if (!items.isEmpty()) {
usePendingItems = usePendingItems || !mutable.get('top') || !mutable.get('pendingItems').isEmpty();
mutable.update(usePendingItems ? 'pendingItems' : 'items', list => {
const lastIndex = 1 + list.findLastIndex(
item => item !== null && (compareId(item.get('id'), items.last().get('id')) > 0 || item.get('id') === items.last().get('id'))